diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2020-05-21 03:52:19 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-05-28 04:10:14 +0300 |
commit | f6dfa5d0043aeaa616c16f8babb64c0d0e8f72dd (patch) | |
tree | f8cbab7f2c4a30c07f827a50d7877c388e18616f /helpers_test.go | |
parent | 559311801a1e9114f8dee71faa388dcefab3dcbe (diff) |
Add .golangci.yml linter configuration
As part of https://gitlab.com/gitlab-org/gitlab-pages/-/issues/385
we have introduced the use of a custom `.golangci.yml` file with some
custom rules for linting.
This replaces the need of downloading and using `golint`, `gofmt`
`go vet` and `gocyclo` manually. We take advantage of the custom
`golangci-lint` docker image as stated in the [Automatic lintinb]
(https://docs.gitlab.com/ee/development/go_guide/#automatic-linting)
section of the Go standards and style guidelines.
This iteration enables a subset of linters, with the remaining
of them enabled on a separate MR as described in the issue above.
The main changes introduced by this linter include:
- gosec: potential hardcoded credentials
- goconst: DRY by declaring and using constants
- gosimple: reduce statements complexity and improve return statements
Diffstat (limited to 'helpers_test.go')
-rw-r--r-- | helpers_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/helpers_test.go b/helpers_test.go index 195c3cea..60fba9f5 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitlab-pages/internal/fixture" + "gitlab.com/gitlab-org/gitlab-pages/internal/request" ) type tWriter struct { @@ -116,9 +117,9 @@ type ListenSpec struct { } func (l ListenSpec) URL(suffix string) string { - scheme := "http" - if l.Type == "https" { - scheme = "https" + scheme := request.SchemeHTTP + if l.Type == request.SchemeHTTPS { + scheme = request.SchemeHTTPS } suffix = strings.TrimPrefix(suffix, "/") @@ -262,7 +263,7 @@ func getPagesArgs(t *testing.T, listeners []ListenSpec, promPort string, extraAr for _, spec := range listeners { args = append(args, "-listen-"+spec.Type, spec.JoinHostPort()) - if spec.Type == "https" { + if spec.Type == request.SchemeHTTPS { hasHTTPS = true } } @@ -362,9 +363,9 @@ func GetRedirectPage(t *testing.T, spec ListenSpec, host, urlsuffix string) (*ht } func GetProxyRedirectPageWithCookie(t *testing.T, spec ListenSpec, host string, urlsuffix string, cookie string, https bool) (*http.Response, error) { - schema := "http" + schema := request.SchemeHTTP if https { - schema = "https" + schema = request.SchemeHTTPS } header := http.Header{ "X-Forwarded-Proto": []string{schema}, |