diff --git a/.golangci.yaml b/.golangci.yaml index 43c27a6206c097c68c6c5cd67f44025a54ff1c50..2ea353ebae7b7ff94c1eb73d60ff840be9ae083a 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,7 +1,32 @@ version: "2" linters: - default: standard + enable: + # Default linters + - errcheck + - ineffassign + - staticcheck + - unused + # Manually added linters + - gocyclo + - godot + - gosec + - loggercheck + - misspell + - nestif + - paralleltest + - protogetter + - testifylint + - whitespace + - durationcheck + - bodyclose + - reassign + - lll + - spancheck + - nlreturn + - tparallel + - sqlclosecheck + #- exhaustruct # Does not work with gRPC, as it wants us to implement 'UnimplementedHealthCtrlServer', which is obviously not intended to be implemented. Would otherwise be useful. formatters: # Enable specific formatter. @@ -22,7 +47,7 @@ issues: # Set to 0 to disable. # Default: 3 max-same-issues: 0 - fix: true + fix: false run: timeout: 5m diff --git a/ctrl/cmd/main.go b/ctrl/cmd/main.go index 0aca5d8bf149f771b5906da78b922e23c1615e44..e233b2644a1ee46a1189934af6343bbd94e43ea2 100644 --- a/ctrl/cmd/main.go +++ b/ctrl/cmd/main.go @@ -31,7 +31,7 @@ func main() { &bindAddr, "bindaddr", "127.0.0.1:1337", - "default adress and port to bind the controller interface to", + "default address and port to bind the controller interface to", ) flag.Parse() diff --git a/ctrl/internal/infrastructure/interaction/health.go b/ctrl/internal/infrastructure/interaction/health.go index 659d6132deacd01f7b164ecca3fe268a6a718787..1d29c2d841fff3f94435509b5e4d1d047aaf86b5 100644 --- a/ctrl/internal/infrastructure/interaction/health.go +++ b/ctrl/internal/infrastructure/interaction/health.go @@ -34,6 +34,6 @@ func (h *HealthServer) Health( defer span.End() return &pb.HealthResponse{ - Message: request.Message, + Message: request.GetMessage(), }, nil } diff --git a/justfile b/justfile index 71aa58eae187de9e1cb9dab03e971fe4c96ba7f2..87f44d9b266668ac9ae38f0101fbdb9ac6776c42 100644 --- a/justfile +++ b/justfile @@ -18,6 +18,14 @@ lint: -v ~/.cache/golangci-lint:/.cache/golangci-lint -e GOLANGCI_LINT_CACHE=/.cache/golangci-lint \ golangci/golangci-lint:{{ golangci-lint-version }} golangci-lint run +lint-fix: + docker run --rm -t -v $(pwd):/app -w /app \ + --user $(id -u):$(id -g) \ + -v $(go env GOCACHE):/.cache/go-build -e GOCACHE=/.cache/go-build \ + -v $(go env GOMODCACHE):/.cache/mod -e GOMODCACHE=/.cache/mod \ + -v ~/.cache/golangci-lint:/.cache/golangci-lint -e GOLANGCI_LINT_CACHE=/.cache/golangci-lint \ + golangci/golangci-lint:{{ golangci-lint-version }} golangci-lint run --fix + ci-lint: mkdir -p {{ tools-install-path }} export GOBIN={{ tools-install-path }} diff --git a/kms/cmd/main.go b/kms/cmd/main.go index 37392a437938ba79632894c5bce49ed7e251709b..2edbf115576f17848404c4d93f70212b4786f601 100644 --- a/kms/cmd/main.go +++ b/kms/cmd/main.go @@ -32,7 +32,7 @@ func main() { &bindAddr, "bindaddr", "127.0.0.1:1337", - "default adress and port to bind the controller interface to", + "default address and port to bind the controller interface to", ) flag.StringVar( &ctrlAddr, diff --git a/kms/internal/infrastructure/interaction/health.go b/kms/internal/infrastructure/interaction/health.go index d97bbe7d2a2847ef2c36ce8f000c65b423a1b91e..6e94c86792f18b55cf4db706075df6a082613f69 100644 --- a/kms/internal/infrastructure/interaction/health.go +++ b/kms/internal/infrastructure/interaction/health.go @@ -25,7 +25,7 @@ func (h *HealthServer) Health( defer span.End() return &pb.HealthKmsResponse{ - Message: request.Message, + Message: request.GetMessage(), }, nil } diff --git a/libs/tracing/tracing.go b/libs/tracing/tracing.go index 87c49326c84a6c452a30114b068e51c25ecf01da..67e5a9c6603b68cee86ce2529709cef38f98c207 100644 --- a/libs/tracing/tracing.go +++ b/libs/tracing/tracing.go @@ -38,7 +38,6 @@ func GetTracer(ctx context.Context, target TraceExportTarget) (*sdktrace.TracerP if err != nil { return nil, fmt.Errorf("failed to create trace exporter: %w", err) } - } tp := sdktrace.NewTracerProvider(