chore(upgrade golangci-lint): upgrade golangci-lint to 1.64.5

juju · Mar 3, 2025 · 709a0c5 · 709a0c5
1 parent 3290a23
commit 709a0c5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -75,7 +75,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.61.0
+          version: v1.64.5
           args: --print-issued-lines=true
 
   # This runs copyright-check against the codebase

diff --git a/internal/provider/resource_access_offer.go b/internal/provider/resource_access_offer.go
@@ -18,10 +18,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-
 	"github.com/juju/juju/core/crossmodel"
 	"github.com/juju/juju/core/permission"
 	"github.com/juju/names/v5"
+
 	"github.com/juju/terraform-provider-juju/internal/juju"
 )
 

diff --git a/internal/provider/resource_access_offer_test.go b/internal/provider/resource_access_offer_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
 	internaltesting "github.com/juju/terraform-provider-juju/internal/testing"
 )
 

diff --git a/tools/static-analysis.sh b/tools/static-analysis.sh
@@ -118,8 +118,8 @@ run_linter() {
 
 run_go() {
 	VER=$(golangci-lint --version | tr -s ' ' | cut -d ' ' -f 4 | cut -d '.' -f 1,2)
-	if [[ ${VER} != "1.61.0" ]] && [[ ${VER} != "v1.61.0" ]]; then
-		(echo >&2 -e '\nError: golangci-lint version does not match 1.61.0. Please upgrade/downgrade to the right version.')
+	if [[ ${VER} != "1.64.5" ]] && [[ ${VER} != "v1.64.5" ]]; then
+		(echo >&2 -e '\nError: golangci-lint version does not match 1.64.5. Please upgrade/downgrade to the right version.')
 		exit 1
 	fi
 	OUT=$(golangci-lint run -c .github/golangci-lint.config.yaml 2>&1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ import ( @@
     	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
     	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
     	internaltesting "github.com/juju/terraform-provider-juju/internal/testing"
     )
@@ Expand Down @@