Modify regex to detect other legitimate forms of provider block decla…

…ration (#264)

internal/teststep/config.go

@@ -21,7 +21,7 @@ const (
 )
 
 var (
-	providerConfigBlockRegex  = regexp.MustCompile(`provider "?[a-zA-Z0-9_-]+"? {`)
+	providerConfigBlockRegex  = regexp.MustCompile(`provider(\s*"[a-zA-Z0-9_-]+"\s*|\s+[a-zA-Z0-9_-]+\s*){`)
 	terraformConfigBlockRegex = regexp.MustCompile(`terraform {`)
 )
 

internal/teststep/directory_test.go

@@ -57,24 +57,48 @@ func TestConfigurationDirectory_HasProviderBlock(t *testing.T) {
 			},
 			expected: true,
 		},
+		"provider-block-quoted-with-attributes-no-spaces": {
+			configDirectory: configurationDirectory{
+				directory: "testdata/provider_block_quoted_with_attributes_no_spaces",
+			},
+			expected: true,
+		},
 		"provider-block-unquoted-with-attributes": {
 			configDirectory: configurationDirectory{
 				directory: "testdata/provider_block_unquoted_with_attributes",
 			},
 			expected: true,
 		},
+		"provider-block-unquoted-with-attributes_no-trailing-space": {
+			configDirectory: configurationDirectory{
+				directory: "testdata/provider_block_unquoted_with_attributes_no_trailing_space",
+			},
+			expected: true,
+		},
 		"provider-block-quoted-without-attributes": {
 			configDirectory: configurationDirectory{
 				directory: "testdata/provider_block_quoted_without_attributes",
 			},
 			expected: true,
 		},
+		"provider-block-quoted-without-attributes-no-spaces": {
+			configDirectory: configurationDirectory{
+				directory: "testdata/provider_block_quoted_without_attributes_no_spaces",
+			},
+			expected: true,
+		},
 		"provider-block-unquoted-without-attributes": {
 			configDirectory: configurationDirectory{
 				directory: "testdata/provider_block_unquoted_without_attributes",
 			},
 			expected: true,
 		},
+		"provider-block-unquoted-without-attributes-no-trailing-space": {
+			configDirectory: configurationDirectory{
+				directory: "testdata/provider_block_unquoted_without_attributes_no_trailing_space",
+			},
+			expected: true,
+		},
 	}
 
 	for name, testCase := range testCases {

internal/teststep/file_test.go

@@ -57,24 +57,48 @@ func TestConfigurationFile_HasProviderBlock(t *testing.T) {
 			},
 			expected: true,
 		},
+		"provider-block-quoted-with-attributes-no-spaces": {
+			configFile: configurationFile{
+				file: "testdata/provider_block_quoted_with_attributes_no_spaces/main.tf",
+			},
+			expected: true,
+		},
 		"provider-block-unquoted-with-attributes": {
 			configFile: configurationFile{
 				file: "testdata/provider_block_unquoted_with_attributes/main.tf",
 			},
 			expected: true,
 		},
+		"provider-block-unquoted-with-attributes-no-trailing-space": {
+			configFile: configurationFile{
+				file: "testdata/provider_block_unquoted_with_attributes_no_trailing_space/main.tf",
+			},
+			expected: true,
+		},
 		"provider-block-quoted-without-attributes": {
 			configFile: configurationFile{
 				file: "testdata/provider_block_quoted_without_attributes/main.tf",
 			},
 			expected: true,
 		},
+		"provider-block-quoted-without-attributes-no-spaces": {
+			configFile: configurationFile{
+				file: "testdata/provider_block_quoted_without_attributes_no_spaces/main.tf",
+			},
+			expected: true,
+		},
 		"provider-block-unquoted-without-attributes": {
 			configFile: configurationFile{
 				file: "testdata/provider_block_unquoted_without_attributes/main.tf",
 			},
 			expected: true,
 		},
+		"provider-block-unquoted-without-attributes-no-trailing-space": {
+			configFile: configurationFile{
+				file: "testdata/provider_block_unquoted_without_attributes_no_trailing_space/main.tf",
+			},
+			expected: true,
+		},
 	}
 
 	for name, testCase := range testCases {

internal/teststep/string_test.go

@@ -65,6 +65,18 @@ provider "test" {
  test = true
 }
 
+resource "test_test" "test" {}
+`,
+			},
+			expected: true,
+		},
+		"provider-block-quoted-with-attributes-no-spaces": {
+			configRaw: configurationString{
+				raw: `
+provider"test"{
+ test = true
+}
+
 resource "test_test" "test" {}
 `,
 			},
@@ -77,6 +89,18 @@ provider test {
  test = true
 }
 
+resource "test_test" "test" {}
+`,
+			},
+			expected: true,
+		},
+		"provider-block-unquoted-with-attributes-no-trailing-space": {
+			configRaw: configurationString{
+				raw: `
+provider test{
+ test = true
+}
+
 resource "test_test" "test" {}
 `,
 			},
@@ -87,6 +111,16 @@ resource "test_test" "test" {}
 				raw: `
 provider "test" {}
 
+resource "test_test" "test" {}
+`,
+			},
+			expected: true,
+		},
+		"provider-block-quoted-without-attributes-no-spaces": {
+			configRaw: configurationString{
+				raw: `
+provider"test"{}
+
 resource "test_test" "test" {}
 `,
 			},
@@ -97,6 +131,16 @@ resource "test_test" "test" {}
 				raw: `
 provider test {}
 
+resource "test_test" "test" {}
+`,
+			},
+			expected: true,
+		},
+		"provider-block-unquoted-without-attributes-no-trailing-space": {
+			configRaw: configurationString{
+				raw: `
+provider test{}
+
 resource "test_test" "test" {}
 `,
 			},

internal/teststep/testdata/provider_block_quoted_with_attributes_no_spaces/main.tf

@@ -0,0 +1,8 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider"test"{
+  test = true
+}
+
+resource "test_test" "test" {}

internal/teststep/testdata/provider_block_quoted_without_attributes_no_spaces/main.tf

@@ -0,0 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider"test"{}
+
+resource "test_test" "test" {}

internal/teststep/testdata/provider_block_unquoted_with_attributes_no_trailing_space/main.tf

@@ -0,0 +1,8 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider test{
+  test = true
+}
+
+resource "test_test" "test" {}

internal/teststep/testdata/provider_block_unquoted_without_attributes_no_trailing_space/main.tf

@@ -0,0 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider test{}
+
+resource "test_test" "test" {}