diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 7a7c2836..4476b0b3 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -30,7 +30,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0 with: - version: v2.10.1 + version: v2.12.2 args: -v -c .golangci.yaml audit: diff --git a/.golangci.yaml b/.golangci.yaml index 81cd6738..76873d64 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -10,6 +10,7 @@ linters: - forbidigo - gochecknoglobals - gochecknoinits + - goconst - mnd - testpackage - usetesting diff --git a/Makefile b/Makefile index c140db68..89df4adf 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ MOCK_SRC_DIR ?= mocks #----------------------------------------------------------------------------------------------------------------------- $(GO_BIN)/golangci-lint: @echo "==> Installing golangci-lint within "${GO_BIN}"" - @go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest + @go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2 $(GO_BIN)/govulncheck: @echo "==> Installing govulncheck within "${GO_BIN}"" diff --git a/internal/build/build.go b/internal/build/build.go index 786f84a2..19bc4a1c 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -16,8 +16,6 @@ limitations under the License. // Package build provides build information that is linked into the application. Other // packages within this project can use this information in logs etc.. - -//nolint:revive // package name conflicts with stdlib is acceptable here package build var ( diff --git a/internal/fga/fga.go b/internal/fga/fga.go index 0e56ac9d..cc3ecc76 100644 --- a/internal/fga/fga.go +++ b/internal/fga/fga.go @@ -44,12 +44,12 @@ type ClientConfig struct { ApiUrl string `json:"api_url,omitempty"` //nolint:revive,stylecheck StoreID string `json:"store_id,omitempty"` AuthorizationModelID string `json:"authorization_model_id,omitempty"` - APIToken string `json:"api_token,omitempty"` //nolint:gosec + APIToken string `json:"api_token,omitempty"` APITokenIssuer string `json:"api_token_issuer,omitempty"` APIAudience string `json:"api_audience,omitempty"` APIScopes []string `json:"api_scopes,omitempty"` ClientID string `json:"client_id,omitempty"` - ClientSecret string `json:"client_secret,omitempty"` //nolint:gosec + ClientSecret string `json:"client_secret,omitempty"` CustomHeaders []string `json:"custom_headers,omitempty"` Debug bool `json:"debug,omitempty"` } diff --git a/internal/utils/context.go b/internal/utils/context.go index 98277fb1..766dcd5b 100644 --- a/internal/utils/context.go +++ b/internal/utils/context.go @@ -1,4 +1,4 @@ -package utils //nolint:revive +package utils import "context"