Merge pull request #120 from planetscale/joem/gha-golangci-lint-action-v7

chore(ci): bump golangci-lint to v2

Author: joemiller

.github/workflows/test-extensive.yml

@@ -45,9 +45,7 @@ jobs:
           go-version-file: 'go.mod'
       - run: make build
       - name: Run linters
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
-        with:
-          version: latest
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7
 
   test-terraform:
     name: integration-terraform

.github/workflows/test.yml

@@ -29,9 +29,7 @@ jobs:
           go-version-file: 'go.mod'
       - run: go build -v .
       - name: Run linters
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
-        with:
-          version: latest
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7
 
   generate:
     name: generate diff test

.golangci.yml

@@ -1,27 +1,49 @@
-# Visit https://golangci-lint.run/ for usage documentation
-# and information on other useful linters
-issues:
-  max-same-issues: 0
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - durationcheck
     - errcheck
-    # TODO: enable copyloopvar
-    #- copyloopvar
     - forcetypeassert
     - godot
-    - gofmt
-    - gosimple
+    - govet
     - ineffassign
     - makezero
     - misspell
     - nilerr
     - predeclared
     - staticcheck
-    - usetesting
     - unconvert
     - unparam
     - unused
-    - govet
+    - usetesting
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+  settings:
+    staticcheck:
+      checks:
+        - all
+        # disable these:
+        - -QF1008
+        - -ST1003
+
+issues:
+  max-same-issues: 0
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/provider/branch_resource.go

@@ -260,7 +260,7 @@ func (r *branchResource) Create(ctx context.Context, req resource.CreateRequest,
 		Name:         name.ValueString(),
 		ParentBranch: *parentBranch,
 	}
-	if !(data.RestoredFromBranch.IsNull() || data.RestoredFromBranch.IsUnknown()) {
+	if !data.RestoredFromBranch.IsNull() && !data.RestoredFromBranch.IsUnknown() {
 		var rfb restoredFromBranchResource
 		resp.Diagnostics.Append(data.RestoredFromBranch.As(ctx, &rfb, basetypes.ObjectAsOptions{})...)
 		if resp.Diagnostics.HasError() {