Linting (#16)

hashicorp · Jan 31, 2023 · bc8bc6d · bc8bc6d
1 parent d96eb7c
commit bc8bc6d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/go.sum b/go.sum
@@ -93,14 +93,6 @@ github.com/hashicorp/hcl/v2 v2.15.0 h1:CPDXO6+uORPjKflkWCCwoWc9uRp+zSIPcCQ+BrxV7
 github.com/hashicorp/hcl/v2 v2.15.0/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/terraform-exec v0.17.3 h1:MX14Kvnka/oWGmIkyuyvL6POx25ZmKrjlaclkx3eErU=
-github.com/hashicorp/terraform-exec v0.17.3/go.mod h1:+NELG0EqQekJzhvikkeQsOAZpsw0cv/03rbeQJqscAI=
-github.com/hashicorp/terraform-exec v0.17.4-0.20230110163400-c387e4f7bf98 h1:WkSxIVXfV/u9tvDGXdSw4v2eCpRMSt7mYRBseX+OaSU=
-github.com/hashicorp/terraform-exec v0.17.4-0.20230110163400-c387e4f7bf98/go.mod h1:5M9hP3RX39/2AWDpAEWf0whTJFibOUN7DfH1E1lCZN8=
-github.com/hashicorp/terraform-exec v0.17.4-0.20230116095935-bc76870e2b9b h1:z4a1oo2M/yWj2ljEoXsFQRkmp2dRqvq4Y9HjQl3eBz8=
-github.com/hashicorp/terraform-exec v0.17.4-0.20230116095935-bc76870e2b9b/go.mod h1:5M9hP3RX39/2AWDpAEWf0whTJFibOUN7DfH1E1lCZN8=
-github.com/hashicorp/terraform-exec v0.17.4-0.20230120174504-9acd44a7e5da h1:St2EWMkwfc56l9PqejkEV/r4S55Em9iXYvW2qdtyH+4=
-github.com/hashicorp/terraform-exec v0.17.4-0.20230120174504-9acd44a7e5da/go.mod h1:5M9hP3RX39/2AWDpAEWf0whTJFibOUN7DfH1E1lCZN8=
 github.com/hashicorp/terraform-exec v0.17.4-0.20230124151948-5eada031c166 h1:WCvC+VknMywOyDXTIzvHHYWknjNBKI0/dmIR9EZd0bw=
 github.com/hashicorp/terraform-exec v0.17.4-0.20230124151948-5eada031c166/go.mod h1:5M9hP3RX39/2AWDpAEWf0whTJFibOUN7DfH1E1lCZN8=
 github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e17dKDpqV7s=

diff --git a/helper/resource/teststep_providers_test.go b/helper/resource/teststep_providers_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-  "regexp"
+	"regexp"
 	"strconv"
 	"strings"
 	"testing"
@@ -28,8 +28,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
-	"github.com/hashicorp/terraform-plugin-testing/internal/testing/testprovider"
 	"github.com/hashicorp/terraform-plugin-testing/internal/plugintest"
+	"github.com/hashicorp/terraform-plugin-testing/internal/testing/testprovider"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 

diff --git a/helper/resource/wait_test.go b/helper/resource/wait_test.go
@@ -30,9 +30,9 @@ func TestRetry(t *testing.T) {
 }
 
 // make sure a slow StateRefreshFunc is allowed to complete after timeout
+//
+//nolint:paralleltest // Test fails when running using t.Parallel()
 func TestRetry_grace(t *testing.T) {
-	t.Parallel()
-
 	f := func() *RetryError {
 		time.Sleep(1 * time.Second)
 		return nil

diff --git a/internal/plugintest/terraform_json_buffer_test.go b/internal/plugintest/terraform_json_buffer_test.go
@@ -75,6 +75,8 @@ func TestTerraformJSONDiagnostics_Contains(t *testing.T) {
 		name, testCase := name, testCase
 
 		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
 			var tfJSONDiagnostics TerraformJSONDiagnostics = testCase.diags
 
 			isFound := tfJSONDiagnostics.Contains(testCase.regex, testCase.severity)
@@ -87,6 +89,8 @@ func TestTerraformJSONDiagnostics_Contains(t *testing.T) {
 }
 
 func TestTerraformJSONDiagnostics_Errors(t *testing.T) {
+	t.Parallel()
+
 	testCases := map[string]struct {
 		diags    []tfjson.Diagnostic
 		expected TerraformJSONDiagnostics
@@ -128,6 +132,8 @@ func TestTerraformJSONDiagnostics_Errors(t *testing.T) {
 		name, testCase := name, testCase
 
 		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
 			var tfJSONDiagnostics TerraformJSONDiagnostics = testCase.diags
 
 			actual := tfJSONDiagnostics.Errors()
@@ -140,6 +146,8 @@ func TestTerraformJSONDiagnostics_Errors(t *testing.T) {
 }
 
 func TestTerraformJSONDiagnostics_Warnings(t *testing.T) {
+	t.Parallel()
+
 	testCases := map[string]struct {
 		diags    []tfjson.Diagnostic
 		expected TerraformJSONDiagnostics
@@ -176,6 +184,8 @@ func TestTerraformJSONDiagnostics_Warnings(t *testing.T) {
 		name, testCase := name, testCase
 
 		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
 			var tfJSONDiagnostics TerraformJSONDiagnostics = testCase.diags
 
 			actual := tfJSONDiagnostics.Warnings()