DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code linting

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-08-09 08:44:14 -04:00
parent f5148d2ae6
commit 40533ad989
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/ingress/annotations/authreq/main.go
View file

@ -86,12 +86,7 @@ func (e1 *Config) Equal(e2 *Config) bool {
return false return false
} }
match = sets.StringElementsMatch(e1.AuthCacheDuration, e2.AuthCacheDuration) return sets.StringElementsMatch(e1.AuthCacheDuration, e2.AuthCacheDuration)
if !match {
return false
}
return true
} }
var ( var (

4
internal/ingress/annotations/authreq/main_test.go
View file

@ -168,7 +168,7 @@ func TestHeaderAnnotations(t *testing.T) {
i, err := NewParser(&resolver.Mock{}).Parse(ing) i, err := NewParser(&resolver.Mock{}).Parse(ing)
if test.expErr { if test.expErr {
if err == nil { if err == nil {
t.Errorf("%v: expected error but retuned nil", err.Error()) t.Error("expected error but retuned nil")
} }
continue continue
} }
@ -216,7 +216,7 @@ func TestCacheDurationAnnotations(t *testing.T) {
i, err := NewParser(&resolver.Mock{}).Parse(ing) i, err := NewParser(&resolver.Mock{}).Parse(ing)
if test.expErr { if test.expErr {
if err == nil { if err == nil {
t.Errorf("%v: expected error but retuned nil", err.Error()) t.Errorf("expected error but retuned nil")
} }
continue continue
} }

4
internal/k8s/main.go
View file

@ -122,13 +122,13 @@ func NetworkingIngressAvailable(client clientset.Interface) bool {
return false return false
} }
serverVersion, _ := client.Discovery().ServerVersion() serverVersion, err := client.Discovery().ServerVersion()
if err != nil { if err != nil {
klog.Errorf("unexpected error parsing Kubernetes version: %v", err) klog.Errorf("unexpected error parsing Kubernetes version: %v", err)
return false return false
} }
runningVersion, _ := version.ParseGeneric(serverVersion.String()) runningVersion, err := version.ParseGeneric(serverVersion.String())
if err != nil { if err != nil {
klog.Errorf("unexpected error parsing running Kubernetes version: %v", err) klog.Errorf("unexpected error parsing running Kubernetes version: %v", err)
return false return false