baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: update linter.

Browse source
This commit is contained in:
Ludovic Fernandez 2021-01-28 09:00:03 +01:00 committed by GitHub
parent 5f9a84fc8b
commit a371f971fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.golangci.toml
View file

@ -61,6 +61,7 @@
"exhaustivestruct", # Not relevant "exhaustivestruct", # Not relevant
"makezero", # not relevant "makezero", # not relevant
"forbidigo", # not relevant "forbidigo", # not relevant
"ifshort", # not relevant
] ]
[issues] [issues]
@ -119,4 +120,4 @@
text = "printf-like formatting function 'SetErrorWithEvent' should be named 'SetErrorWithEventf'" text = "printf-like formatting function 'SetErrorWithEvent' should be named 'SetErrorWithEventf'"
[[issues.exclude-rules]] [[issues.exclude-rules]]
path = "pkg/log/deprecated.go" path = "pkg/log/deprecated.go"
linters = ["godot"] linters = ["godot"]

2
build.Dockerfile
View file

@ -19,7 +19,7 @@ RUN mkdir -p /usr/local/bin \
&& chmod +x /usr/local/bin/go-bindata && chmod +x /usr/local/bin/go-bindata
# Download golangci-lint binary to bin folder in $GOPATH # Download golangci-lint binary to bin folder in $GOPATH
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.34.0 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.36.0
# Download misspell binary to bin folder in $GOPATH # Download misspell binary to bin folder in $GOPATH
RUN curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4 RUN curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4

4
pkg/metrics/prometheus.go
View file

@ -379,12 +379,12 @@ func (d *dynamicConfig) hasServerURL(serviceName, serverURL string) bool {
return false return false
} }
func newCollector(metricName string, labels stdprometheus.Labels, c stdprometheus.Collector, delete func()) *collector { func newCollector(metricName string, labels stdprometheus.Labels, c stdprometheus.Collector, deleteFn func()) *collector {
return &collector{ return &collector{
id: buildMetricID(metricName, labels), id: buildMetricID(metricName, labels),
labels: labels, labels: labels,
collector: c, collector: c,
delete: delete, delete: deleteFn,
} }
} }

4
pkg/middlewares/compress/compress_test.go
View file

@ -284,9 +284,9 @@ func TestIntegrationShouldCompress(t *testing.T) {
} }
} }
func generateBytes(len int) []byte { func generateBytes(length int) []byte {
var value []byte var value []byte
for i := 0; i < len; i++ { for i := 0; i < length; i++ {
value = append(value, 0x61+byte(i)) value = append(value, 0x61+byte(i))
} }
return value return value

7
pkg/middlewares/customerrors/custom_errors_test.go
View file

@ -29,6 +29,7 @@ func TestHandler(t *testing.T) {
fmt.Fprintln(w, "My error page.") fmt.Fprintln(w, "My error page.")
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusOK, recorder.Code, "HTTP status") assert.Equal(t, http.StatusOK, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusOK)) assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusOK))
}, },
@ -41,6 +42,7 @@ func TestHandler(t *testing.T) {
fmt.Fprintln(w, "My error page.") fmt.Fprintln(w, "My error page.")
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusPartialContent, recorder.Code, "HTTP status") assert.Equal(t, http.StatusPartialContent, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusPartialContent)) assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusPartialContent))
}, },
@ -53,6 +55,7 @@ func TestHandler(t *testing.T) {
fmt.Fprintln(w, "whatever, should not be called") fmt.Fprintln(w, "whatever, should not be called")
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusNotModified, recorder.Code, "HTTP status") assert.Equal(t, http.StatusNotModified, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), "") assert.Contains(t, recorder.Body.String(), "")
}, },
@ -65,6 +68,7 @@ func TestHandler(t *testing.T) {
fmt.Fprintln(w, "My error page.") fmt.Fprintln(w, "My error page.")
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusInternalServerError, recorder.Code, "HTTP status") assert.Equal(t, http.StatusInternalServerError, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), "My error page.") assert.Contains(t, recorder.Body.String(), "My error page.")
assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page") assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page")
@ -78,6 +82,7 @@ func TestHandler(t *testing.T) {
fmt.Fprintln(w, "My error page.") fmt.Fprintln(w, "My error page.")
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusBadGateway, recorder.Code, "HTTP status") assert.Equal(t, http.StatusBadGateway, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusBadGateway)) assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusBadGateway))
assert.NotContains(t, recorder.Body.String(), "Test Server", "Should return the oops page since we have not configured the 502 code") assert.NotContains(t, recorder.Body.String(), "Test Server", "Should return the oops page since we have not configured the 502 code")
@ -95,6 +100,7 @@ func TestHandler(t *testing.T) {
} }
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusServiceUnavailable, recorder.Code, "HTTP status") assert.Equal(t, http.StatusServiceUnavailable, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), "My 503 page.") assert.Contains(t, recorder.Body.String(), "My 503 page.")
assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page") assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page")
@ -112,6 +118,7 @@ func TestHandler(t *testing.T) {
} }
}), }),
validate: func(t *testing.T, recorder *httptest.ResponseRecorder) { validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
t.Helper()
assert.Equal(t, http.StatusServiceUnavailable, recorder.Code, "HTTP status") assert.Equal(t, http.StatusServiceUnavailable, recorder.Code, "HTTP status")
assert.Contains(t, recorder.Body.String(), "My 503 page.") assert.Contains(t, recorder.Body.String(), "My 503 page.")
assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page") assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page")