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

Apply fixes suggested by staticcheck

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-07-08 16:10:38 -04:00
parent 82c22e3969
commit 3d7a09347d
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
19 changed files with 26 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/dbg/main.go
View file

@ -133,7 +133,7 @@ func backendsAll() {
return
}
fmt.Println(string(prettyBuffer.Bytes()))
fmt.Println(prettyBuffer.String())
}
func backendsList() {
@ -228,7 +228,7 @@ func general() {
return
}
fmt.Println(string(prettyBuffer.Bytes()))
fmt.Println(prettyBuffer.String())
}
func readNginxConf() {

10
cmd/nginx/flags.go
View file

@ -202,19 +202,19 @@ Takes the form "<host>:port". If not provided, no admission controller is starte
// check port collisions
if !ing_net.IsPortAvailable(*httpPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --http-port", *httpPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --http-port", *httpPort)
}
if !ing_net.IsPortAvailable(*httpsPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --https-port", *httpsPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --https-port", *httpsPort)
}
if !ing_net.IsPortAvailable(*defServerPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --default-server-port", *defServerPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --default-server-port", *defServerPort)
}
if *enableSSLPassthrough && !ing_net.IsPortAvailable(*sslProxyPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --ssl-passthrough-proxy-port", *sslProxyPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --ssl-passthrough-proxy-port", *sslProxyPort)
}
if !*enableSSLChainCompletion {
@ -222,7 +222,7 @@ Takes the form "<host>:port". If not provided, no admission controller is starte
}
if *publishSvc != "" && *publishStatusAddress != "" {
return false, nil, fmt.Errorf("Flags --publish-service and --publish-status-address are mutually exclusive")
return false, nil, fmt.Errorf("flags --publish-service and --publish-status-address are mutually exclusive")
}
nginx.HealthPath = *defHealthzURL

2
cmd/nginx/main_test.go
View file

@ -88,8 +88,6 @@ func TestHandleSigterm(t *testing.T) {
if code != 1 {
t.Errorf("Expected exit code 1 but %d received", code)
}
return
})
time.Sleep(1 * time.Second)

2
cmd/plugin/commands/backends/backends.go
View file

@ -80,6 +80,6 @@ func backends(flags *genericclioptions.ConfigFlags, podName string, deployment s
return err
}
fmt.Printf(out)
fmt.Print(out)
return nil
}

6
cmd/plugin/lints/ingress.go
View file

@ -148,11 +148,7 @@ func removedAnnotation(annotationName string, issueNumber int, version string) I
func satisfyDirective(ing networking.Ingress) bool {
for name, val := range ing.Annotations {
if strings.HasSuffix(name, "/configuration-snippet") {
if strings.Index(val, "satisfy") != -1 {
return true
}
return false
return strings.Contains(val, "satisfy")
}
}

6
cmd/plugin/request/request.go
View file

@ -53,7 +53,7 @@ func GetNamedPod(flags *genericclioptions.ConfigFlags, name string) (apiv1.Pod,
}
}
return apiv1.Pod{}, fmt.Errorf("Pod %v not found in namespace %v", name, util.GetNamespace(flags))
return apiv1.Pod{}, fmt.Errorf("pod %v not found in namespace %v", name, util.GetNamespace(flags))
}
// GetDeploymentPod finds a pod from a given deployment
@ -64,7 +64,7 @@ func GetDeploymentPod(flags *genericclioptions.ConfigFlags, deployment string) (
}
if len(ings) == 0 {
return apiv1.Pod{}, fmt.Errorf("No pods for deployment %v found in namespace %v", deployment, util.GetNamespace(flags))
return apiv1.Pod{}, fmt.Errorf("no pods for deployment %v found in namespace %v", deployment, util.GetNamespace(flags))
}
return ings[0], nil
@ -222,7 +222,7 @@ func GetServiceByName(flags *genericclioptions.ConfigFlags, name string, service
}
}
return apiv1.Service{}, fmt.Errorf("Could not find service %v in namespace %v", name, util.GetNamespace(flags))
return apiv1.Service{}, fmt.Errorf("could not find service %v in namespace %v", name, util.GetNamespace(flags))
}
func getPods(flags *genericclioptions.ConfigFlags) ([]apiv1.Pod, error) {

17
cmd/plugin/util/util.go
View file

@ -45,27 +45,12 @@ func PrintError(e error) {
}
}
func printWithError(s string, e error) {
if e != nil {
fmt.Println(e)
}
fmt.Print(s)
}
func printOrError(s string, e error) error {
if e != nil {
return e
}
fmt.Print(s)
return nil
}
// ParseVersionString returns the major, minor, and patch numbers of a version string
func ParseVersionString(v string) (int, int, int, error) {
parts := versionRegex.FindStringSubmatch(v)
if len(parts) != 4 {
return 0, 0, 0, fmt.Errorf("Could not parse %v as a version string (like 0.20.3)", v)
return 0, 0, 0, fmt.Errorf("could not parse %v as a version string (like 0.20.3)", v)
}
major, _ := strconv.Atoi(parts[1])