Enforce import order with a lint (#2145)

This PR enforces import order via a linter, just like our other
providers. The second commit is the result of running `make fix_lint`,
and does not have manual edits.

Author: iwahbe

.golangci.yml

@@ -6,11 +6,14 @@ linters:
   enable:
     - errcheck
     - gofmt
+    - gci
     - gosec
     - govet
     - ineffassign
     - lll
-    - megacheck
+    - gosimple
+    - staticcheck
+    - unused
     - misspell
     - nakedret
     - nolintlint
@@ -25,3 +28,10 @@ issues:
     - pkg/tf2pulumi/internal/addrs
     - pkg/tf2pulumi/internal/config
     - pkg/tf2pulumi/internal/configs
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/pulumi/pulumi-terraform-bridge)
+    skip-generated: true

Makefile

@@ -13,9 +13,12 @@ build::
 fmt::
 	@gofmt -w -s .
 
-lint::
+lint:
 	go run scripts/build.go lint
 
+lint_fix:
+	go run scripts/build.go fix-lint
+
 test::
 	@mkdir -p bin
 	go build -o bin ./internal/testing/pulumi-terraform-bridge-test-provider

dynamic/info.go

@@ -21,11 +21,11 @@ import (
 	"strings"
 
 	"github.com/opentofu/opentofu/shim/run"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 
 	"github.com/pulumi/pulumi-terraform-bridge/pf/proto"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 )
 
 func providerInfo(ctx context.Context, p run.Provider) tfbridge.ProviderInfo {

dynamic/internal/shim/run/loader.go

@@ -38,10 +38,10 @@ import (
 	v5shim "github.com/opentofu/opentofu/shim/protov5"
 	v6shim "github.com/opentofu/opentofu/shim/protov6"
 	tfaddr "github.com/opentofu/registry-address"
-	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
 
-	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 )
 
 // envPluginCache allows users to override where we cache TF providers used by

dynamic/internal/shim/run/loader_test.go

@@ -20,7 +20,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

dynamic/main.go

@@ -27,12 +27,11 @@ import (
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 
+	"github.com/pulumi/pulumi-terraform-bridge/dynamic/version"
 	"github.com/pulumi/pulumi-terraform-bridge/pf/proto"
 	pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
-
-	"github.com/pulumi/pulumi-terraform-bridge/dynamic/version"
 )
 
 func initialSetup() (tfbridge.ProviderInfo, pfbridge.ProviderMetadata, func() error) {

dynamic/provider_test.go

@@ -14,18 +14,18 @@ import (
 	"testing"
 
 	"github.com/hexops/autogold/v2"
-	helper "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/testing"
-	pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 	pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	helper "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/testing"
+	pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
 )
 
 // globalTempDir is a temporary directory scoped to the entire test cycle.

internal/testprovider_invalid_schema/resources.go

@@ -15,10 +15,11 @@
 package tpinvschema
 
 import (
+	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 	sdkv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 )
 
 func ProviderInfo() tfbridge.ProviderInfo {

internal/testprovider_sdkv2/resources.go

@@ -15,10 +15,11 @@
 package tpsdkv2
 
 import (
+	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 	sdkv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 )
 
 func ProviderInfo() tfbridge.ProviderInfo {

pf/internal/check/check_test.go

@@ -24,15 +24,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	sdkschema "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
-	sdkv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
 	property "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
+	"github.com/stretchr/testify/assert"
 
 	pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
+	sdkv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
 )
 
 func TestMissingIDProperty(t *testing.T) {