lint

Author: VenelinMartinov

pkg/pf/internal/schemashim/datasource.go

@@ -17,11 +17,12 @@ package schemashim
 import (
 	"context"
 
+	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 )
 
 type schemaOnlyDataSource struct {

pkg/pf/internal/schemashim/resource.go

@@ -17,11 +17,12 @@ package schemashim
 import (
 	"context"
 
+	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 )
 
 type schemaOnlyResource struct {

pkg/pf/proto/schema.go

@@ -15,9 +15,8 @@
 package proto
 
 import (
-	// "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
-
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
+
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )

pkg/pf/tests/upgrade_state_cross_test.go

@@ -1096,7 +1096,7 @@ func TestPFUpgrade_Downgrading(t *testing.T) {
 func TestPFUpgrade_DynamicPseudoType(t *testing.T) {
 	t.Parallel()
 	ct.SkipUnlessLinux(t)
-	//skipUnlessDeltasEnabled(t)
+	// skipUnlessDeltasEnabled(t)
 
 	resourceBefore := pb.NewResource(pb.NewResourceArgs{
 		ResourceSchema: rschema.Schema{
@@ -1135,7 +1135,7 @@ func TestPFUpgrade_DynamicPseudoType(t *testing.T) {
 		InputsMap1: pmBefore,
 		Inputs2:    tfInputsAfter,
 		InputsMap2: pmAfter,
-		//ExpectedRawStateType: resourceBeforeAndAfter.ResourceSchema.Type().TerraformType(context.Background()),
+		// ExpectedRawStateType: resourceBeforeAndAfter.ResourceSchema.Type().TerraformType(context.Background()),
 		SkipPulumi: "TODO",
 	}
 

pkg/pf/tfbridge/resource_state.go

@@ -256,7 +256,6 @@ func (p *provider) parseAndUpgradeResourceState(
 		return nil, fmt.Errorf("[pf/tfbridge] Error calling EncodePropertyMap: %w", err)
 	}
 
-
 	// Before EnableRawStateDelta rollout, the behavior used to be to skip the upgrade method in case of an exact
 	// version match. This seems incorrect, but to derisk fixing this problem it is flagged together with
 	// EnableRawStateDelta so it participates in the phased rollout. Remove once rollout completes.

pkg/tfshim/walk/walk.go

@@ -179,7 +179,7 @@ func LookupSchemaMapPath(path SchemaPath, schemaMap shim.SchemaMap) (shim.Schema
 func LookupType(path SchemaPath, ty valueshim.Type) (valueshim.Type, error) {
 	current := ty
 	for i, step := range path {
-		var subPath SchemaPath = path[0:i]
+		subPath := path[0:i]
 		switch step := step.(type) {
 		case GetAttrStep:
 			attr, ok := current.AttributeType(step.Name)

pkg/valueshim/cty_test.go

@@ -316,6 +316,7 @@ func Test_HCty_ToX(t *testing.T) {
 }
 
 func Test_HCtyType_AttributeType(t *testing.T) {
+	t.Parallel()
 	objTy := cty.Object(map[string]cty.Type{"x": cty.String})
 
 	ty, ok := valueshim.FromHCtyType(objTy).AttributeType("x")
@@ -327,6 +328,7 @@ func Test_HCtyType_AttributeType(t *testing.T) {
 }
 
 func Test_HCtyType_ElementType(t *testing.T) {
+	t.Parallel()
 	ty, ok := valueshim.FromHCtyType(cty.Set(cty.Number)).ElementType()
 	assert.True(t, ok)
 	assert.Equal(t, valueshim.FromHCtyType(cty.Number), ty)
@@ -339,6 +341,6 @@ func Test_HCtyType_ElementType(t *testing.T) {
 	assert.True(t, ok)
 	assert.Equal(t, valueshim.FromHCtyType(cty.Number), ty)
 
-	ty, ok = valueshim.FromHCtyType(cty.String).ElementType()
+	_, ok = valueshim.FromHCtyType(cty.String).ElementType()
 	assert.False(t, ok)
 }

pkg/valueshim/tfvalue_test.go

@@ -314,6 +314,7 @@ func Test_TType(t *testing.T) {
 }
 
 func Test_TType_AttributeType(t *testing.T) {
+	t.Parallel()
 	objTy := tftypes.Object{AttributeTypes: map[string]tftypes.Type{"x": tftypes.String}}
 
 	ty, ok := valueshim.FromTType(objTy).AttributeType("x")
@@ -325,6 +326,7 @@ func Test_TType_AttributeType(t *testing.T) {
 }
 
 func Test_TType_ElementType(t *testing.T) {
+	t.Parallel()
 	ty, ok := valueshim.FromTType(tftypes.Set{ElementType: tftypes.Number}).ElementType()
 	assert.True(t, ok)
 	assert.Equal(t, valueshim.FromTType(tftypes.Number), ty)
@@ -337,7 +339,7 @@ func Test_TType_ElementType(t *testing.T) {
 	assert.True(t, ok)
 	assert.Equal(t, valueshim.FromTType(tftypes.Number), ty)
 
-	ty, ok = valueshim.FromTType(tftypes.String).ElementType()
+	_, ok = valueshim.FromTType(tftypes.String).ElementType()
 	assert.False(t, ok)
 }