chore: updates golangci-lint version

juju · Dec 11, 2024 · 7aa9248 · 7aa9248
1 parent 5f21f83
commit 7aa9248
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 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.54.0
+          version: v1.61.0
           args: --print-issued-lines=true
 
   # This runs copyright-check against the codebase

diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml
@@ -102,7 +102,7 @@ jobs:
       - env:
           TF_ACC: "1"
           TEST_CLOUD: ${{ matrix.action-operator.cloud }}
-        run: go test -parallel 10 -timeout 40m -v -cover ./internal/provider/
+        run: go test -parallel 1 -timeout 60m -v -cover ./internal/provider/
         timeout-minutes: 40
 
   # Run acceptance tests in a matrix with Terraform CLI versions

diff --git a/internal/provider/resource_application_test.go b/internal/provider/resource_application_test.go
@@ -132,7 +132,7 @@ func TestAcc_ResourceApplication_Updates(t *testing.T) {
 					return testingCloud != LXDCloudTesting, nil
 				},
 				Config: testAccResourceApplicationUpdates(modelName, 2, true, "machinename"),
-				Check:  resource.TestCheckResourceAttr("juju_application.this", "charm.0.revision", "10"),
+				Check:  resource.TestCheckResourceAttr("juju_application.this", "charm.0.revision", "2"),
 			},
 			{
 				SkipFunc: func() (bool, error) {
@@ -1037,7 +1037,7 @@ resource "juju_application" "this" {
   name = "test-app"
   charm {
     name     = "ubuntu-lite"
-    revision = 10
+    revision = 2
   }
   
   trust = true 
@@ -1056,7 +1056,7 @@ resource "juju_application" "this" {
   name = "test-app"
   charm {
     name     = "ubuntu-lite"
-	revision = 10
+	revision = 2
   }
   trust = true
   expose{}
@@ -1097,7 +1097,7 @@ resource "juju_application" "this" {
   name = "test-app"
   charm {
     name     = "ubuntu-lite"
-    revision = 10
+    revision = 2
   }
   trust = true
   expose{}
@@ -1191,7 +1191,7 @@ resource "juju_application" "{{.AppName}}" {
   constraints = "{{.Constraints}}"
   charm {
     name     = "ubuntu-lite"
-    revision = 10
+    revision = 2
   }
   endpoint_bindings = {{.EndpointBindings}}
 }

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.53" ]] && [[ ${VER} != "v1.53" ]]; then
-		(echo >&2 -e '\nError: golangci-lint version does not match 1.53. Please upgrade/downgrade to the right version.')
+	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.')
 		exit 1
 	fi
 	OUT=$(golangci-lint run -c .github/golangci-lint.config.yaml 2>&1)