Replace tenv and exportloopref linters with usetesting and copyloopvar (#173)

Author: SBGoods

.golangci.yml

@@ -1,13 +1,13 @@
 issues:
-  max-per-linter: 0
+  max-issues-per-linter: 0
   max-same-issues: 0
 
 linters:
   disable-all: true
   enable:
+    - copyloopvar
     - durationcheck
     - errcheck
-    - exportloopref
     - forcetypeassert
     - gofmt
     - gosimple
@@ -19,7 +19,7 @@ linters:
     - paralleltest
     - predeclared
     - staticcheck
-    - tenv
     - unconvert
     - unparam
     - unused
+    - usetesting

datasource/timeouts/schema_test.go

@@ -74,7 +74,7 @@ func TestBlockWithOpts(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.BlockWithOpts(context.Background(), test.opts)
@@ -118,7 +118,7 @@ func TestBlock(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.Block(context.Background())
@@ -189,7 +189,7 @@ func TestAttributesWithOpts(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.AttributesWithOpts(context.Background(), test.opts)
@@ -234,7 +234,7 @@ func TestAttributes(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.Attributes(context.Background())

datasource/timeouts/timeouts.go

@@ -131,6 +131,7 @@ func (t Value) getTimeout(ctx context.Context, timeoutName string, defaultTimeou
 
 	// No type assertion check is required as the schema guarantees that the object attributes
 	// are types.String.
+	//nolint:forcetypeassert
 	timeout, err := time.ParseDuration(value.(types.String).ValueString())
 	if err != nil {
 		diags.Append(diag.NewErrorDiagnostic(

datasource/timeouts/timeouts_test.go

@@ -56,7 +56,7 @@ func TestTimeoutsTypeValueFromTerraform(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -127,7 +127,7 @@ func TestTimeoutsTypeEqual(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -216,7 +216,7 @@ func TestTimeoutsValueRead(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

ephemeral/timeouts/schema_test.go

@@ -74,7 +74,7 @@ func TestBlockWithOpts(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.BlockWithOpts(context.Background(), test.opts)
@@ -118,7 +118,7 @@ func TestBlock(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.Block(context.Background())
@@ -189,7 +189,7 @@ func TestAttributesWithOpts(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.AttributesWithOpts(context.Background(), test.opts)
@@ -234,7 +234,7 @@ func TestAttributes(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.Attributes(context.Background())

ephemeral/timeouts/timeouts.go

@@ -131,6 +131,7 @@ func (t Value) getTimeout(ctx context.Context, timeoutName string, defaultTimeou
 
 	// No type assertion check is required as the schema guarantees that the object attributes
 	// are types.String.
+	//nolint:forcetypeassert
 	timeout, err := time.ParseDuration(value.(types.String).ValueString())
 	if err != nil {
 		diags.Append(diag.NewErrorDiagnostic(

ephemeral/timeouts/timeouts_test.go

@@ -56,7 +56,7 @@ func TestTimeoutsTypeValueFromTerraform(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -127,7 +127,7 @@ func TestTimeoutsTypeEqual(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -216,7 +216,7 @@ func TestTimeoutsValueOpen(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

internal/validators/timeduration_test.go

@@ -47,7 +47,7 @@ func TestTimeDuration(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			request := validator.StringRequest{

resource/timeouts/schema_test.go

@@ -158,7 +158,7 @@ func TestBlock(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.Block(context.Background(), test.opts)
@@ -379,7 +379,7 @@ func TestAttributes(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
+
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			actual := timeouts.Attributes(context.Background(), test.opts)

resource/timeouts/timeouts.go

@@ -149,6 +149,7 @@ func (t Value) getTimeout(ctx context.Context, timeoutName string, defaultTimeou
 
 	// No type assertion check is required as the schema guarantees that the object attributes
 	// are types.String.
+	//nolint:forcetypeassert
 	timeout, err := time.ParseDuration(value.(types.String).ValueString())
 	if err != nil {
 		diags.Append(diag.NewErrorDiagnostic(