diff --git a/.drone.yml b/.drone.yml index e5feb99..509a884 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,7 +55,7 @@ name: golangci-lint steps: - name: golangci-lint - image: golangci/golangci-lint:v1.52 + image: golangci/golangci-lint:v1.53 pull: always commands: - make generate @@ -216,7 +216,7 @@ name: deploy steps: - name: deploy-k8s - image: alpine/k8s:1.26.4 + image: alpine/k8s:1.26.5 environment: KUBECONFIG: from_secret: kubeconfig diff --git a/.golangci.yml b/.golangci.yml index 0fc2803..1abd7cf 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -62,6 +62,16 @@ linters-settings: line-length: 150 gocyclo: min-complexity: 10 + depguard: + rules: + main: + files: + - "$all" + deny: + - pkg: reflect + desc: Please don't use reflect package + - pkg: github.com/pkg/errors + desc: Should be replaced by standard lib errors package govet: enable: - asmdecl diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 498fd0a..d82dd16 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,6 +6,6 @@ repos: stages: [commit-msg] additional_dependencies: ['@commitlint/config-conventional'] - repo: https://github.com/golangci/golangci-lint - rev: v1.52.2 + rev: v1.53.2 hooks: - id: golangci-lint diff --git a/Makefile b/Makefile index 8d6b6e9..6de7796 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ install-swag: .PHONY: install-golangci-lint install-golangci-lint: @echo "Installing github.com/golangci/golangci-lint..." - @test -f $(GOLANGCI_LINT_PATH) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.52.2 + @test -f $(GOLANGCI_LINT_PATH) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.53.2 .PHONY: install-tools install-tools: install-golangci-lint install-counterfeiter install-swag diff --git a/go.mod b/go.mod index 5f8eff7..b0388b0 100644 --- a/go.mod +++ b/go.mod @@ -14,14 +14,14 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/ory/dockertest/v3 v3.10.0 github.com/realclientip/realclientip-go v1.0.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 github.com/swaggo/http-swagger v1.3.3 github.com/swaggo/swag v1.8.8 github.com/uptrace/bun v1.1.14 github.com/uptrace/bun/dbfixture v1.1.14 github.com/uptrace/bun/dialect/pgdialect v1.1.14 github.com/uptrace/bun/driver/pgdriver v1.1.14 - github.com/urfave/cli/v2 v2.25.3 + github.com/urfave/cli/v2 v2.25.5 go.uber.org/zap v1.24.0 ) diff --git a/go.sum b/go.sum index 73393fd..61cc9d5 100644 --- a/go.sum +++ b/go.sum @@ -130,8 +130,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe h1:K8pHPVoTgxFJt1lXuIzzOX7zZhZFldJQK/CgKx9BFIc= github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w= github.com/swaggo/http-swagger v1.3.3 h1:Hu5Z0L9ssyBLofaama21iYaF2VbWyA8jdohaaCGpHsc= @@ -150,8 +150,8 @@ github.com/uptrace/bun/dialect/pgdialect v1.1.14/go.mod h1:v6YiaXmnKQ2FlhRD2c0Zf github.com/uptrace/bun/driver/pgdriver v1.1.14 h1:V2Etm7mLGS3mhx8ddxZcUnwZLX02Jmq9JTlo0sNVDhA= github.com/uptrace/bun/driver/pgdriver v1.1.14/go.mod h1:D4FjWV9arDYct6sjMJhFoyU71SpllZRHXFRRP2Kd0Kw= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.25.3 h1:VJkt6wvEBOoSjPFQvOkv6iWIrsJyCrKGtCtxXWwmGeY= -github.com/urfave/cli/v2 v2.25.3/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/urfave/cli/v2 v2.25.5 h1:d0NIAyhh5shGscroL7ek/Ya9QYQE0KNabJgiUinIQkc= +github.com/urfave/cli/v2 v2.25.5/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= diff --git a/k8s/overlays/dev/kustomization.yml b/k8s/overlays/dev/kustomization.yml index bbf6fe1..d27727d 100644 --- a/k8s/overlays/dev/kustomization.yml +++ b/k8s/overlays/dev/kustomization.yml @@ -5,4 +5,4 @@ resources: - secret.yml - ../../base patchesStrategicMerge: - - api.yml \ No newline at end of file + - api.yml