diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c36d99c0..8b02aa6ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ build: test:lint: stage: test - image: golangci/golangci-lint:v2.8 + image: golangci/golangci-lint:v2.10 variables: GOLANGCI_LINT_CACHE: $CI_PROJECT_DIR/.cache/golangci-lint cache: diff --git a/.golangci.yaml b/.golangci.yaml index f4e0e47ed..bfac94c66 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -74,6 +74,11 @@ linters: alias: hrobotmodels no-unaliased: true + revive: + rules: + - name: var-naming + arguments: [[], [], [{ skipPackageNameCollisionWithGoStd: true }]] + exclusions: generated: lax presets: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 11019beb0..409332ef3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -82,7 +82,7 @@ repos: - id: shellcheck - repo: https://github.com/golangci/golangci-lint - rev: v2.8.0 + rev: v2.10.1 hooks: - id: golangci-lint-full language_version: 1.25.7 # renovate: datasource=golang-version depName=go diff --git a/internal/config/config.go b/internal/config/config.go index 05f97504e..44995acd2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -47,7 +47,7 @@ type HCloudClientConfiguration struct { type RobotConfiguration struct { Enabled bool User string - Password string + Password string // #nosec G117 -- This config is never json marshaled CacheTimeout time.Duration RateLimitWaitTime time.Duration // ForwardInternalIPs is enabled by default. diff --git a/tools/doc_generation.go b/tools/doc_generation.go index 115bdd535..ef54faaff 100644 --- a/tools/doc_generation.go +++ b/tools/doc_generation.go @@ -145,19 +145,19 @@ func (t *ConstantDocTable) String(hasReadOnlyColumn bool) string { defaultVal = t.entries[constValue].Default } - tableStr.WriteString(fmt.Sprintf("| `%s` ", constValue)) - tableStr.WriteString(fmt.Sprintf("| `%s` ", typeVal)) - tableStr.WriteString(fmt.Sprintf("| `%s` ", defaultVal)) + fmt.Fprintf(&tableStr, "| `%s` ", constValue) + fmt.Fprintf(&tableStr, "| `%s` ", typeVal) + fmt.Fprintf(&tableStr, "| `%s` ", defaultVal) if hasReadOnlyColumn { readOnlyVal := "No" if t.entries[constValue].ReadOnly { readOnlyVal = "Yes" } - tableStr.WriteString(fmt.Sprintf("| `%s` ", readOnlyVal)) + fmt.Fprintf(&tableStr, "| `%s` ", readOnlyVal) } - tableStr.WriteString(fmt.Sprintf("| %s |\n", t.entries[constValue].Description)) + fmt.Fprintf(&tableStr, "| %s |\n", t.entries[constValue].Description) } return tableStr.String()