Migrate golangci lint (#3097)

Upgrade the linter to V2 and fix various issues discovered by the new
version.

V1 has some non-determinism with its lints causing PRs to pass the
linter and then it fails on master, for example:
#3096

The changes are mostly making the imports consistent and removing
double-imports. I've also used the chance to add a rule to import some
common libraries with the same alias.

Author: VenelinMartinov

.github/workflows/build-and-test.yml

@@ -219,10 +219,10 @@ jobs:
           cache-dependency-path: |
             **/go.sum
       - name: Install golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           skip-cache: true
-          version: v1.64.7
+          version: v2.1
       - name: Lint
         run: make lint
   version-check:

.github/workflows/weekly-pulumi-update.yml

@@ -35,10 +35,10 @@ jobs:
         cache-dependency-path: |
             **/go.sum
     - name: Install golangci-lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v8
       with:
           skip-cache: true
-          version: v1.62
+          version: v2.1
     - name: Update Pulumi/Pulumi
       id: gomod
       run: >-

.golangci.yml

@@ -1,79 +1,99 @@
-run:
-  timeout: 10m
-
+version: "2"
 linters:
-  enable-all: false
   enable:
     - durationcheck
-    - errcheck
-    - gci
-    - gofumpt
     - goheader
     - goprintffuncname
     - gosec
-    - gosimple
-    - govet
     - importas
-    - ineffassign
     - lll
     - misspell
     - nakedret
     - nolintlint
+    - paralleltest
     - revive
-    - staticcheck
-    - tenv
     - unconvert
-    - unused
-    - paralleltest
     - wastedassign
     - whitespace
-issues:
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: pkg/pf/tests
-      linters:
-        - lll
-        - paralleltest
-    - path: pkg/tests
-      linters:
-        - lll
-    - path: pkg/pf/tests
-      linters:
-        - lll
-        - paralleltest
-  exclude:
-    - "unused-parameter: parameter"
-    - "redefines-builtin-id:"
-    - "exhaustive"
-  exclude-dirs:
-    - pkg/tf2pulumi/internal/addrs
-    - pkg/tf2pulumi/internal/config
-    - pkg/tf2pulumi/internal/configs
-    - pkg/vendored
-    # TODO(https://github.com/pulumi/pulumi-terraform-bridge/issues/2474)
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/pulumi/pulumi-terraform-bridge)
-    skip-generated: true
-  paralleltest:
-    ignore-missing-subtests: true
-  nakedret:
-    # Make an issue if func has more lines of code than this setting, and it has naked returns.
-    # Default: 30
-    max-func-lines: 60
-  govet:
-    enable:
-      - nilness
-      # Reject comparisons of reflect.Value with DeepEqual or '=='.
-      - reflectvaluecompare
-      # Reject sort.Slice calls with a non-slice argument.
-      - sortslice
-      # Detect write to struct/arrays by-value that aren't read again.
-      - unusedwrite
-  importas:
-    alias:
-    - pkg: github.com/pulumi/pulumi/sdk/v3/proto/go
-      alias: pulumirpc
+  settings:
+    govet:
+      enable:
+        - nilness
+        - reflectvaluecompare
+        - sortslice
+        - unusedwrite
+    importas:
+      alias:
+        - pkg: github.com/pulumi/pulumi/sdk/v3/proto/go
+          alias: pulumirpc
+        - pkg: github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/providerbuilder
+          alias: pb
+        - pkg: github.com/hashicorp/terraform-plugin-framework/resource/schema
+          alias: rschema
+        - pkg: github.com/hashicorp/terraform-plugin-framework/provider/schema
+          alias: prschema
+        - pkg: github.com/hashicorp/terraform-plugin-framework/datasource/schema
+          alias: dschema
+        - pkg: github.com/pulumi/pulumi/pkg/v3/codegen/schema
+          alias: pschema
+    nakedret:
+      max-func-lines: 60
+    paralleltest:
+      ignore-missing-subtests: true
+    staticcheck:
+      checks:
+        - 'SA1019'
+        - '-ST1005' # error strings should not be capitalized
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - lll
+          - paralleltest
+        path: pkg/pf/tests
+      - linters:
+          - lll
+        path: pkg/tests
+      - linters:
+          - lll
+          - paralleltest
+        path: pkg/pf/tests
+      - path: (.+)\.go$
+        text: 'unused-parameter: parameter'
+      - path: (.+)\.go$
+        text: 'redefines-builtin-id:'
+      - path: (.+)\.go$
+        text: exhaustive
+    paths:
+      - pkg/tf2pulumi/internal/addrs
+      - pkg/tf2pulumi/internal/config
+      - pkg/tf2pulumi/internal/configs
+      - pkg/vendored
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/pulumi/pulumi-terraform-bridge)
+  exclusions:
+    generated: lax
+    paths:
+      - pkg/tf2pulumi/internal/addrs
+      - pkg/tf2pulumi/internal/config
+      - pkg/tf2pulumi/internal/configs
+      - pkg/vendored
+      - third_party$
+      - builtin$
+      - examples$

pkg/convert/convert_test.go

@@ -293,7 +293,7 @@ func arrayPV[T any](topv func(T) resource.PropertyValue) func(data []T) resource
 
 func mapPV[T any](topv func(T) resource.PropertyValue) func(data map[string]T) resource.PropertyValue {
 	return func(data map[string]T) resource.PropertyValue {
-		var entries resource.PropertyMap = make(resource.PropertyMap)
+		entries := make(resource.PropertyMap)
 		for k, v := range data {
 			entries[resource.PropertyKey(k)] = topv(v)
 		}

pkg/convert/infer_object_test.go

@@ -29,7 +29,7 @@ func TestInferType(t *testing.T) {
 		elem interface{}
 	}
 
-	var res shim.Resource = (&schema.Resource{
+	res := (&schema.Resource{
 		Schema: &schema.SchemaMap{
 			"x": (&schema.Schema{Type: shim.TypeString}).Shim(),
 			"y": (&schema.Schema{Type: shim.TypeInt, Optional: true}).Shim(),

pkg/pf/internal/check/check_test.go

@@ -374,9 +374,9 @@ func (i testIDResource) Schema(_ context.Context, _ resource.SchemaRequest, resp
 	resp.Schema = schema.Schema{
 		Attributes: map[string]schema.Attribute{
 			"id": schema.StringAttribute{
-				Computed: i.idSchema.computed,
-				Required: i.idSchema.required,
-				Optional: i.idSchema.optional,
+				Computed: i.computed,
+				Required: i.required,
+				Optional: i.optional,
 			},
 		},
 	}

pkg/pf/internal/pfutils/attr.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	dschema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
-	pschema "github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	prschema "github.com/hashicorp/terraform-plugin-framework/provider/schema"
 	rschema "github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
@@ -53,7 +53,7 @@ type AttrLike interface {
 	GetType() attr.Type
 }
 
-func FromProviderAttribute(x pschema.Attribute) Attr {
+func FromProviderAttribute(x prschema.Attribute) Attr {
 	return FromAttrLike(x)
 }
 

pkg/pf/internal/pfutils/block.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	dschema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
-	pschema "github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	prschema "github.com/hashicorp/terraform-plugin-framework/provider/schema"
 	rschema "github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
@@ -46,7 +46,7 @@ type BlockLike interface {
 	Type() attr.Type
 }
 
-func FromProviderBlock(x pschema.Block) Block {
+func FromProviderBlock(x prschema.Block) Block {
 	return FromBlockLike(x)
 }
 

pkg/pf/internal/pfutils/proposed_new_test.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	rschema "github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -808,7 +807,7 @@ func TestProposedNewWithPortedCases(t *testing.T) {
 					"bloop": rschema.SetNestedAttribute{
 						NestedObject: rschema.NestedAttributeObject{
 							Attributes: map[string]rschema.Attribute{
-								"blop": schema.StringAttribute{
+								"blop": rschema.StringAttribute{
 									Required: true,
 								},
 							},

pkg/pf/internal/pfutils/schema.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	dschema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
-	pschema "github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	prschema "github.com/hashicorp/terraform-plugin-framework/provider/schema"
 	rschema "github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -48,7 +48,7 @@ type Schema interface {
 	ResourceProtoSchema(ctx context.Context) (*tfprotov6.Schema, error)
 }
 
-func FromProviderSchema(x pschema.Schema) Schema {
+func FromProviderSchema(x prschema.Schema) Schema {
 	attrs := convertMap(FromProviderAttribute, x.Attributes)
 	blocks := convertMap(FromProviderBlock, x.Blocks)
 	return newSchemaAdapter(x, x.Type(), x.DeprecationMessage, attrs, blocks, nil)