From 6a1bcac60f1e221bfa682156ab1ab5d9d4f42ccf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:44:07 +0000 Subject: [PATCH 1/6] Bump golangci/golangci-lint-action from 6.5.2 to 7.0.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.5.2 to 7.0.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/55c2c1448f86e01eaae002a5a3a9624417608d84...1481404843c368bc19ca9406f87d6e0fc97bdcfd) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d67aed8..fc9ca66 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,7 @@ jobs: with: go-version: 1.24.2 - name: golangci-lint - uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2 + uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0 with: version: v1.64.6 args: --config tools/.golangci.yaml From c5583c26acfb527401fc5ab47f8587a8b9dfc552 Mon Sep 17 00:00:00 2001 From: Fabian Schulz Date: Wed, 23 Apr 2025 14:54:02 +0200 Subject: [PATCH 2/6] upgraded golangci image version to v2 --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index fc9ca66..832afe7 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -19,7 +19,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0 with: - version: v1.64.6 + version: v2.1.2 args: --config tools/.golangci.yaml - run: | set -euo pipefail From 1bc9e80f7cbe3a1828cb92ab5c66d915b64bbe69 Mon Sep 17 00:00:00 2001 From: Fabian Schulz Date: Wed, 23 Apr 2025 15:00:18 +0200 Subject: [PATCH 3/6] migrated golanci.yaml file --- tools/.golangci.bck.yaml | 103 +++++++++++++++++++++ tools/.golangci.yaml | 193 +++++++++++++++++++++------------------ 2 files changed, 205 insertions(+), 91 deletions(-) create mode 100644 tools/.golangci.bck.yaml diff --git a/tools/.golangci.bck.yaml b/tools/.golangci.bck.yaml new file mode 100644 index 0000000..cb8d0b0 --- /dev/null +++ b/tools/.golangci.bck.yaml @@ -0,0 +1,103 @@ +--- +run: + timeout: 30m +issues: + max-same-issues: 0 + exclude-files: + - ^zz_generated.* +linters: + disable-all: true + enable: + - goimports + - ineffassign + - nakedret + - revive + - staticcheck + - stylecheck + - unconvert + - unparam + - unused + - goheader +linters-settings: + staticcheck: + checks: + - "all" + - "-SA1019" # Using a deprecated function, variable, constant or field + - "-SA2002" # Called testing.T.FailNow or SkipNow in a goroutine, which isn’t allowed + stylecheck: + checks: + - "ST1019" # Importing the same package multiple times + revive: + ignore-generated-header: false + severity: error + confidence: 0.8 + enable-all-rules: false + rules: + # we specify rules we would like to enable + - name: blank-imports + severity: error + disabled: false + - name: context-as-argument + severity: error + disabled: false + - name: dot-imports + severity: error + disabled: true + - name: error-return + severity: error + disabled: false + - name: error-naming + severity: error + disabled: false + - name: if-return + severity: error + disabled: false + - name: increment-decrement + severity: error + disabled: false + - name: var-declaration + severity: error + disabled: false + - name: package-comments + severity: error + disabled: false + - name: range + severity: error + disabled: false + - name: receiver-naming + severity: error + disabled: false + - name: time-naming + severity: error + disabled: false + - name: indent-error-flow + severity: error + disabled: false + - name: errorf + severity: error + disabled: false + - name: context-keys-type + severity: error + disabled: false + - name: error-strings + severity: error + disabled: false + # https://golangci-lint.run/usage/linters/#goheader + goheader: + values: + regexp: + AUTHOR: ^Copyright 2024 (The Kubernetes authors|Swisscom \(Schweiz\) AG)\. + template: |- + {{ AUTHOR }} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/tools/.golangci.yaml b/tools/.golangci.yaml index cb8d0b0..4ba19fc 100644 --- a/tools/.golangci.yaml +++ b/tools/.golangci.yaml @@ -1,103 +1,114 @@ ---- -run: - timeout: 30m -issues: - max-same-issues: 0 - exclude-files: - - ^zz_generated.* +version: "2" linters: - disable-all: true + default: none enable: - - goimports + - goheader - ineffassign - nakedret - revive - staticcheck - - stylecheck - unconvert - unparam - unused - - goheader -linters-settings: - staticcheck: - checks: - - "all" - - "-SA1019" # Using a deprecated function, variable, constant or field - - "-SA2002" # Called testing.T.FailNow or SkipNow in a goroutine, which isn’t allowed - stylecheck: - checks: - - "ST1019" # Importing the same package multiple times - revive: - ignore-generated-header: false - severity: error - confidence: 0.8 - enable-all-rules: false - rules: - # we specify rules we would like to enable - - name: blank-imports - severity: error - disabled: false - - name: context-as-argument - severity: error - disabled: false - - name: dot-imports - severity: error - disabled: true - - name: error-return - severity: error - disabled: false - - name: error-naming - severity: error - disabled: false - - name: if-return - severity: error - disabled: false - - name: increment-decrement - severity: error - disabled: false - - name: var-declaration - severity: error - disabled: false - - name: package-comments - severity: error - disabled: false - - name: range - severity: error - disabled: false - - name: receiver-naming - severity: error - disabled: false - - name: time-naming - severity: error - disabled: false - - name: indent-error-flow - severity: error - disabled: false - - name: errorf - severity: error - disabled: false - - name: context-keys-type - severity: error - disabled: false - - name: error-strings - severity: error - disabled: false - # https://golangci-lint.run/usage/linters/#goheader - goheader: - values: - regexp: - AUTHOR: ^Copyright 2024 (The Kubernetes authors|Swisscom \(Schweiz\) AG)\. - template: |- - {{ AUTHOR }} + settings: + goheader: + values: + regexp: + AUTHOR: ^Copyright 2024 (The Kubernetes authors|Swisscom \(Schweiz\) AG)\. + template: |- + {{ AUTHOR }} - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + revive: + confidence: 0.8 + severity: error + enable-all-rules: false + rules: + - name: blank-imports + severity: error + disabled: false + - name: context-as-argument + severity: error + disabled: false + - name: dot-imports + severity: error + disabled: true + - name: error-return + severity: error + disabled: false + - name: error-naming + severity: error + disabled: false + - name: if-return + severity: error + disabled: false + - name: increment-decrement + severity: error + disabled: false + - name: var-declaration + severity: error + disabled: false + - name: package-comments + severity: error + disabled: false + - name: range + severity: error + disabled: false + - name: receiver-naming + severity: error + disabled: false + - name: time-naming + severity: error + disabled: false + - name: indent-error-flow + severity: error + disabled: false + - name: errorf + severity: error + disabled: false + - name: context-keys-type + severity: error + disabled: false + - name: error-strings + severity: error + disabled: false + staticcheck: + checks: + - -SA1019 + - -SA2002 + - ST1019 + - all + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + paths: + - ^zz_generated.* + - third_party$ + - builtin$ + - examples$ +issues: + max-same-issues: 0 +formatters: + enable: + - goimports + exclusions: + generated: lax + paths: + - ^zz_generated.* + - third_party$ + - builtin$ + - examples$ From f0d0fa57c65a6d304c4cf3a8aa8af179f54efb2c Mon Sep 17 00:00:00 2001 From: Fabian Schulz Date: Wed, 23 Apr 2025 15:30:08 +0200 Subject: [PATCH 4/6] disabled type naming convetion check due to CRD name in linter --- tools/.golangci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/.golangci.yaml b/tools/.golangci.yaml index 4ba19fc..bdaecac 100644 --- a/tools/.golangci.yaml +++ b/tools/.golangci.yaml @@ -84,6 +84,7 @@ linters: disabled: false staticcheck: checks: + - -ST1003 # Disable the type naming convention check - -SA1019 - -SA2002 - ST1019 From 508f28501d1c04cbcaee6e0115e55a5f9e715b74 Mon Sep 17 00:00:00 2001 From: Fabian Schulz Date: Wed, 23 Apr 2025 15:54:58 +0200 Subject: [PATCH 5/6] linter config fixes --- pkg/netbox/api/ip_range_claim_test.go | 24 ++++++++++++------------ tools/.golangci.yaml | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/netbox/api/ip_range_claim_test.go b/pkg/netbox/api/ip_range_claim_test.go index 14b26bd..e8d37f8 100644 --- a/pkg/netbox/api/ip_range_claim_test.go +++ b/pkg/netbox/api/ip_range_claim_test.go @@ -46,8 +46,8 @@ func TestIPRangeClaim(t *testing.T) { ipRangeV4_7 := "10.112.140.7/24" ipRangeV4_8 := "10.112.140.8/24" - expectedIp_5 := "10.112.140.5/32" - expectedIp_7 := "10.112.140.7/32" + expectedIpDot5 := "10.112.140.5/32" + expectedIpDot7 := "10.112.140.7/32" // example of available IPv4 ip adress availableIpAdressesIPv4 := func() []*netboxModels.AvailableIP { @@ -144,8 +144,8 @@ func TestIPRangeClaim(t *testing.T) { // assert error AssertNil(t, err) // assert nil output - assert.Equal(t, expectedIp_5, actual.StartAddress) - assert.Equal(t, expectedIp_7, actual.EndAddress) + assert.Equal(t, expectedIpDot5, actual.StartAddress) + assert.Equal(t, expectedIpDot7, actual.EndAddress) }) t.Run("Fail first available IP range by claim (IPv6) if not enough consequiteve ips.", func(t *testing.T) { @@ -225,8 +225,8 @@ func TestIPRangeClaim(t *testing.T) { Previous: nil, Results: []*netboxModels.IPRange{ { - StartAddress: &expectedIp_5, - EndAddress: &expectedIp_7, + StartAddress: &expectedIpDot5, + EndAddress: &expectedIpDot7, }, }, }, @@ -246,8 +246,8 @@ func TestIPRangeClaim(t *testing.T) { actual, err := client.RestoreExistingIpRangeByHash(input) assert.Nil(t, err) - assert.Equal(t, expectedIp_5, actual.StartAddress) - assert.Equal(t, expectedIp_7, actual.EndAddress) + assert.Equal(t, expectedIpDot5, actual.StartAddress) + assert.Equal(t, expectedIpDot7, actual.EndAddress) }) t.Run("Fail reclaim IP Range if multiple results returned", func(t *testing.T) { @@ -260,12 +260,12 @@ func TestIPRangeClaim(t *testing.T) { Previous: nil, Results: []*netboxModels.IPRange{ { - StartAddress: &expectedIp_5, - EndAddress: &expectedIp_7, + StartAddress: &expectedIpDot5, + EndAddress: &expectedIpDot7, }, { - StartAddress: &expectedIp_5, - EndAddress: &expectedIp_7, + StartAddress: &expectedIpDot5, + EndAddress: &expectedIpDot7, }, }, }, diff --git a/tools/.golangci.yaml b/tools/.golangci.yaml index bdaecac..dfcd2b6 100644 --- a/tools/.golangci.yaml +++ b/tools/.golangci.yaml @@ -83,12 +83,12 @@ linters: severity: error disabled: false staticcheck: + # removed: "IP", "HTTPS", "URL" from defaults + initialisms: ["ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS", "SIP", "RTP", "AMQP", "DB", "TS"] checks: - - -ST1003 # Disable the type naming convention check - - -SA1019 - - -SA2002 - - ST1019 - all + - -QF1008 + - -QF1003 exclusions: generated: lax presets: From 428bf4989b62cac3baf6cb6a4776321f2ff7d9d2 Mon Sep 17 00:00:00 2001 From: Fabian Schulz Date: Thu, 24 Apr 2025 09:11:25 +0200 Subject: [PATCH 6/6] removed .golangci.bck.yaml --- tools/.golangci.bck.yaml | 103 --------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 tools/.golangci.bck.yaml diff --git a/tools/.golangci.bck.yaml b/tools/.golangci.bck.yaml deleted file mode 100644 index cb8d0b0..0000000 --- a/tools/.golangci.bck.yaml +++ /dev/null @@ -1,103 +0,0 @@ ---- -run: - timeout: 30m -issues: - max-same-issues: 0 - exclude-files: - - ^zz_generated.* -linters: - disable-all: true - enable: - - goimports - - ineffassign - - nakedret - - revive - - staticcheck - - stylecheck - - unconvert - - unparam - - unused - - goheader -linters-settings: - staticcheck: - checks: - - "all" - - "-SA1019" # Using a deprecated function, variable, constant or field - - "-SA2002" # Called testing.T.FailNow or SkipNow in a goroutine, which isn’t allowed - stylecheck: - checks: - - "ST1019" # Importing the same package multiple times - revive: - ignore-generated-header: false - severity: error - confidence: 0.8 - enable-all-rules: false - rules: - # we specify rules we would like to enable - - name: blank-imports - severity: error - disabled: false - - name: context-as-argument - severity: error - disabled: false - - name: dot-imports - severity: error - disabled: true - - name: error-return - severity: error - disabled: false - - name: error-naming - severity: error - disabled: false - - name: if-return - severity: error - disabled: false - - name: increment-decrement - severity: error - disabled: false - - name: var-declaration - severity: error - disabled: false - - name: package-comments - severity: error - disabled: false - - name: range - severity: error - disabled: false - - name: receiver-naming - severity: error - disabled: false - - name: time-naming - severity: error - disabled: false - - name: indent-error-flow - severity: error - disabled: false - - name: errorf - severity: error - disabled: false - - name: context-keys-type - severity: error - disabled: false - - name: error-strings - severity: error - disabled: false - # https://golangci-lint.run/usage/linters/#goheader - goheader: - values: - regexp: - AUTHOR: ^Copyright 2024 (The Kubernetes authors|Swisscom \(Schweiz\) AG)\. - template: |- - {{ AUTHOR }} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.