Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lint code using staticcheck #4471

Merged
merged 1 commit into from
Aug 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/plugin/request/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func tryAllNamespacesEndpointsCache(flags *genericclioptions.ConfigFlags) {
}

func tryFilteringEndpointsFromAllNamespacesCache(flags *genericclioptions.ConfigFlags, namespace string) *[]apiv1.Endpoints {
allEndpoints, _ := endpointsCache[""]
allEndpoints := endpointsCache[""]
if allEndpoints != nil {
endpoints := make([]apiv1.Endpoints, 0)
for _, thisEndpoints := range *allEndpoints {
Expand Down
14 changes: 7 additions & 7 deletions internal/ingress/annotations/fastcgi/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestParseEmptyFastCGIAnnotations(t *testing.T) {
t.Errorf("Index should be an empty string")
}

if 0 != len(config.Params) {
if len(config.Params) != 0 {
t.Errorf("Params should be an empty slice")
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@ func TestParseEmptyFastCGIParamsConfigMapAnnotation(t *testing.T) {
t.Errorf("Parse do not return a Config object")
}

if 0 != len(config.Params) {
if len(config.Params) != 0 {
t.Errorf("Params should be an empty slice")
}
}
Expand All @@ -150,7 +150,7 @@ func TestParseFastCGIInvalidParamsConfigMapAnnotation(t *testing.T) {
t.Errorf("Parse do not return a Config object")
}

if 0 != len(config.Params) {
if len(config.Params) != 0 {
t.Errorf("Params should be an empty slice")
}
}
Expand All @@ -173,11 +173,11 @@ func TestParseFastCGIParamsConfigMapAnnotationWithoutNS(t *testing.T) {
t.Errorf("Parse do not return a Config object")
}

if 2 != len(config.Params) {
if len(config.Params) != 2 {
t.Errorf("Params should have a length of 2")
}

if "200" != config.Params["REDIRECT_STATUS"] || "$server_name" != config.Params["SERVER_NAME"] {
if config.Params["REDIRECT_STATUS"] != "200" || config.Params["SERVER_NAME"] != "$server_name" {
t.Errorf("Params value is not the one expected")
}
}
Expand All @@ -199,11 +199,11 @@ func TestParseFastCGIParamsConfigMapAnnotationWithNS(t *testing.T) {
t.Errorf("Parse do not return a Config object")
}

if 2 != len(config.Params) {
if len(config.Params) != 2 {
t.Errorf("Params should have a length of 2")
}

if "200" != config.Params["REDIRECT_STATUS"] || "$server_name" != config.Params["SERVER_NAME"] {
if config.Params["REDIRECT_STATUS"] != "200" || config.Params["SERVER_NAME"] != "$server_name" {
t.Errorf("Params value is not the one expected")
}
}
Expand Down
6 changes: 3 additions & 3 deletions internal/ingress/controller/nginx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,13 @@ func TestConfigureDynamically(t *testing.T) {
if err != nil {
t.Errorf("unexpected error posting dynamic configuration: %v", err)
}
if count, _ := endpointStats["/configuration/backends"]; count != 0 {
if count := endpointStats["/configuration/backends"]; count != 0 {
t.Errorf("Expected %v to receive %d requests but received %d.", "/configuration/backends", 0, count)
}
if count, _ := endpointStats["/configuration/servers"]; count != 0 {
if count := endpointStats["/configuration/servers"]; count != 0 {
t.Errorf("Expected %v to receive %d requests but received %d.", "/configuration/servers", 0, count)
}
if count, _ := endpointStats["/configuration/general"]; count != 1 {
if count := endpointStats["/configuration/general"]; count != 1 {
t.Errorf("Expected %v to receive %d requests but received %d.", "/configuration/general", 0, count)
}

Expand Down
2 changes: 0 additions & 2 deletions internal/ingress/controller/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,8 @@ func quote(input interface{}) string {
switch input := input.(type) {
case string:
inputStr = input
break
case fmt.Stringer:
inputStr = input.String()
break
default:
inputStr = fmt.Sprintf("%v", input)
}
Expand Down
8 changes: 6 additions & 2 deletions internal/ingress/controller/template/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ func TestBuildLuaSharedDictionaries(t *testing.T) {
}
// test invalid config
configuration = buildLuaSharedDictionaries(invalidType, servers, false)
if expected != actual {
if configuration != "" {
t.Errorf("expected an empty string, but got %s", configuration)
}

if actual != expected {
t.Errorf("Expected '%v' but returned '%v' ", expected, actual)
}
}
Expand All @@ -233,7 +237,7 @@ func TestLuaConfigurationRequestBodySize(t *testing.T) {
}

size := luaConfigurationRequestBodySize(cfg)
if "21" != size {
if size != "21" {
t.Errorf("expected the size to be 20 but got: %v", size)
}
}
Expand Down
6 changes: 3 additions & 3 deletions internal/ingress/defaults/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type Backend struct {
// http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_intercept_errors
// http://nginx.org/en/docs/http/ngx_http_core_module.html#error_page
// By default this is disabled
CustomHTTPErrors []int `json:"custom-http-errors,-"`
CustomHTTPErrors []int `json:"custom-http-errors"`

// http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
// Sets the maximum allowed size of the client request body
Expand Down Expand Up @@ -102,7 +102,7 @@ type Backend struct {
// SkipAccessLogURLs sets a list of URLs that should not appear in the NGINX access log
// This is useful with urls like `/health` or `health-check` that make "complex" reading the logs
// By default this list is empty
SkipAccessLogURLs []string `json:"skip-access-log-urls,-"`
SkipAccessLogURLs []string `json:"skip-access-log-urls"`

// Enables or disables the redirect (301) to the HTTPS port
SSLRedirect bool `json:"ssl-redirect"`
Expand Down Expand Up @@ -134,7 +134,7 @@ type Backend struct {

// WhitelistSourceRange allows limiting access to certain client addresses
// http://nginx.org/en/docs/http/ngx_http_access_module.html
WhitelistSourceRange []string `json:"whitelist-source-range,-"`
WhitelistSourceRange []string `json:"whitelist-source-range"`

// Limits the rate of response transmission to a client.
// The rate is specified in bytes per second. The zero value disables rate limiting.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/annotations/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
err := f.DeleteDeployment("httpbin")
Expect(err).NotTo(HaveOccurred())

resp, _, errs = gorequest.New().
_, _, errs = gorequest.New().
Get(f.GetURL(framework.HTTP)+fooPath).
Retry(10, 1*time.Second, http.StatusNotFound).
Set("Host", thisHost).
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/defaultbackend/default_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)

const defaultBackend = "default backend - 404"

var _ = framework.IngressNginxDescribe("Default backend", func() {
f := framework.NewDefaultFramework("default-backend")

Expand Down
6 changes: 3 additions & 3 deletions test/e2e/framework/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (f *Framework) NewIngressController(namespace string, namespaceOverlay stri
cmd := exec.Command("./wait-for-nginx.sh", namespace, namespaceOverlay)
out, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("Unexpected error waiting for ingress controller deployment: %v.\nLogs:\n%v", err, string(out))
return fmt.Errorf("unexpected error waiting for ingress controller deployment: %v.\nLogs:\n%v", err, string(out))
}

return nil
Expand All @@ -117,7 +117,7 @@ func (f *Framework) KubectlProxy(port int) (int, *exec.Cmd, error) {
buf := make([]byte, 128)
var n int
if n, err = stdout.Read(buf); err != nil {
return -1, cmd, fmt.Errorf("Failed to read from kubectl proxy stdout: %v", err)
return -1, cmd, fmt.Errorf("failed to read from kubectl proxy stdout: %v", err)
}

output := string(buf[:n])
Expand All @@ -128,7 +128,7 @@ func (f *Framework) KubectlProxy(port int) (int, *exec.Cmd, error) {
}
}

return -1, cmd, fmt.Errorf("Failed to parse port from proxy stdout: %s", output)
return -1, cmd, fmt.Errorf("failed to parse port from proxy stdout: %s", output)
}

func startCmdAndStreamOutput(cmd *exec.Cmd) (stdout, stderr io.ReadCloser, err error) {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func getIngressNGINXPod(ns string, kubeClientSet kubernetes.Interface) (*core.Po
}

if len(l.Items) == 0 {
return nil, fmt.Errorf("There is no ingress-nginx pods running in namespace %v", ns)
return nil, fmt.Errorf("there is no ingress-nginx pods running in namespace %v", ns)
}

var pod *core.Pod
Expand All @@ -226,7 +226,7 @@ func getIngressNGINXPod(ns string, kubeClientSet kubernetes.Interface) (*core.Po
}

if pod == nil {
return nil, fmt.Errorf("There is no ingress-nginx pods running in namespace %v", ns)
return nil, fmt.Errorf("there is no ingress-nginx pods running in namespace %v", ns)
}

return pod, nil
Expand Down
9 changes: 0 additions & 9 deletions test/e2e/lua/dynamic_configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,3 @@ func ensureHTTPSRequest(url string, host string, expectedDNSName string) {
Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1))
Expect(resp.TLS.PeerCertificates[0].DNSNames[0]).Should(Equal(expectedDNSName))
}

func getCookie(name string, cookies []*http.Cookie) (*http.Cookie, error) {
for _, cookie := range cookies {
if cookie.Name == name {
return cookie, nil
}
}
return &http.Cookie{}, fmt.Errorf("Cookie does not exist")
}
2 changes: 1 addition & 1 deletion test/e2e/settings/configmap_change.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var _ = framework.IngressNginxDescribe("Configmap change", func() {

f.UpdateNginxConfigMapData(wlKey, wlValue)

checksumRegex := regexp.MustCompile("Configuration checksum:\\s+(\\d+)")
checksumRegex := regexp.MustCompile(`Configuration checksum:\s+(\d+)`)
checksum := ""

f.WaitForNginxConfiguration(
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/settings/global_external_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ var _ = framework.IngressNginxDescribe("Global External Auth", func() {
err := f.DeleteDeployment("httpbin")
Expect(err).NotTo(HaveOccurred())

resp, _, errs = gorequest.New().
_, _, errs = gorequest.New().
Get(f.GetURL(framework.HTTP)).
Retry(10, 1*time.Second, http.StatusNotFound).
Set("Host", host).
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/settings/ingress_class.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ var _ = framework.IngressNginxDescribe("Ingress class", func() {
Expect(resp.StatusCode).Should(Equal(http.StatusOK))

delete(ing.Annotations, "kubernetes.io/ingress.class")
ing = f.EnsureIngress(ing)
f.EnsureIngress(ing)

f.WaitForNginxConfiguration(func(cfg string) bool {
return !strings.Contains(cfg, "server_name foo")
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/settings/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
framework.WaitForTLS(f.GetURL(framework.HTTPS), tlsConfig)

resp, _, errs := gorequest.New().
Get(fmt.Sprintf(f.GetURL(framework.HTTP))).
Get(f.GetURL(framework.HTTP)).
Retry(10, 1*time.Second, http.StatusNotFound).
RedirectPolicy(noRedirectPolicyFunc).
Set("Host", host).
Expand All @@ -206,7 +206,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
framework.WaitForTLS(f.GetURL(framework.HTTPS), tlsConfig)

resp, _, errs := gorequest.New().
Get(fmt.Sprintf(f.GetURL(framework.HTTP))).
Get(f.GetURL(framework.HTTP)).
Retry(10, 1*time.Second, http.StatusNotFound).
RedirectPolicy(noRedirectPolicyFunc).
Set("Host", host).
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/status/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var _ = framework.IngressNginxDescribe("Status Update [Status]", func() {
// flags --publish-service and --publish-status-address are mutually exclusive
var index int
for k, v := range args {
if strings.Index(v, "--publish-service") != -1 {
if strings.Contains(v, "--publish-service") {
index = k
break
}
Expand Down