3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-17 08:38:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

lint: bump golangci-lint 1.21.0 (#391)

Browse source 
Signed-off-by: Bobby DeSimone <bobbydesimone@gmail.com>
This commit is contained in:
Bobby DeSimone 2019-11-19 19:58:11 -08:00 • committed by GitHub
parent ec9607d1d5
commit 6743accd74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.golangci.yml
View file

@ -1,10 +1,10 @@
# forked from istio # forked from istio
service: service:
# When updating this, also update bin/linters.sh accordingly # When updating this, also update bin/linters.sh accordingly
golangci-lint-version: 1.18.x # use the fixed version to not introduce new linters unexpectedly golangci-lint-version: 1.21.x # use the fixed version to not introduce new linters unexpectedly
run: run:
# timeout for analysis, e.g. 30s, 5m, default is 1m # timeout for analysis, e.g. 30s, 5m, default is 1m
deadline: 5m deadline: 20m
# which dirs to skip: they won't be analyzed; # which dirs to skip: they won't be analyzed;
# can use regexp here: generated.*, regexp is applied on full path; # can use regexp here: generated.*, regexp is applied on full path;
@ -28,16 +28,20 @@ linters:
disable: disable:
- depguard - depguard
- dupl - dupl
- funlen
- gochecknoglobals - gochecknoglobals
- gochecknoinits - gochecknoinits
- gocognit
- goconst - goconst
- gocyclo - gocyclo
- godox
- interfacer
- maligned
- nakedret - nakedret
- prealloc - prealloc
- scopelint - scopelint
- maligned - whitespace
- interfacer - wsl
- funlen
fast: false fast: false
linters-settings: linters-settings:

2
Makefile
View file

@ -27,7 +27,7 @@ CTIMEVAR=-X $(PKG)/internal/version.GitCommit=$(GITCOMMIT) \
-X $(PKG)/internal/version.ProjectURL=$(PKG) -X $(PKG)/internal/version.ProjectURL=$(PKG)
GO_LDFLAGS=-ldflags "-s -w $(CTIMEVAR)" GO_LDFLAGS=-ldflags "-s -w $(CTIMEVAR)"
GOOSARCHES = linux/amd64 darwin/amd64 windows/amd64 GOOSARCHES = linux/amd64 darwin/amd64 windows/amd64
GOLANGCI_VERSION = v1.18.0 # .... for some reason v1.18.0 misses? GOLANGCI_VERSION = v1.21.0 # .... for some reason v1.18.0 misses?
.PHONY: all .PHONY: all
all: clean build-deps test lint spellcheck build ## Runs a clean, build, fmt, lint, test, and vet. all: clean build-deps test lint spellcheck build ## Runs a clean, build, fmt, lint, test, and vet.

2
proxy/handlers.go
View file

@ -151,7 +151,7 @@ func (p *Proxy) Verify(verifyOnly bool) http.Handler {
w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.Header().Set("Content-Type", "text/plain; charset=utf-8")
w.Header().Set("X-Content-Type-Options", "nosniff") w.Header().Set("X-Content-Type-Options", "nosniff")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
fmt.Fprintf(w, fmt.Sprintf("Access to %s is allowed.", uri.Host)) fmt.Fprintf(w, "Access to %s is allowed.", uri.Host)
}) })
} }