Merge pull request #41722 from hashicorp/f-block-tf0.12-beta

Block Terraform 0.12 from v6.0.0 beta
hashicorp · Mar 7, 2025 · 711335a · 711335a
2 parents 79de99f + a5f12cd
commit 711335a
Show file tree

Hide file tree

Showing 247 changed files with 507 additions and 2 deletions.
diff --git a/.changelog/41722.txt b/.changelog/41722.txt
@@ -0,0 +1,3 @@
+```release-note:note
+provider: Practitioners using Terraform 0.12 must [pin the version](https://developer.hashicorp.com/terraform/language/providers/requirements#v0-12-compatible-provider-requirements) of the AWS Provider to an exact version so as not to install a pre-release
+```
diff --git a/internal/conns/config_test.go b/internal/conns/config_test.go
@@ -460,6 +460,8 @@ func TestProxyConfig(t *testing.T) {
 				t.Fatal(err)
 			}
 
+			p.TerraformVersion = "1.0.0"
+
 			expectedDiags := tc.expectedDiags
 			diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config))
 

diff --git a/internal/generate/serviceendpointtests/file.gtpl b/internal/generate/serviceendpointtests/file.gtpl
@@ -756,6 +756,8 @@ func testEndpointCase(t *testing.T, region string, testcase endpointTestCase, ca
 		t.Fatal(err)
 	}
 
+	p.TerraformVersion = "1.0.0"
+
 	expectedDiags := testcase.expected.diags
 	diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config))
 

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -445,6 +445,16 @@ func configure(ctx context.Context, provider *schema.Provider, d *schema.Resourc
 		terraformVersion = "0.11+compatible"
 	}
 
+	// Terraform 0.12.31 will download beta version of the provider as the latest available.
+	// See https://github.com/hashicorp/terraform/issues/36586.
+	// This check must be removed before the GA release.
+	switch {
+	case terraformVersion == "0.11+compatible", strings.HasPrefix(terraformVersion, "0.12."):
+		return nil, sdkdiag.AppendErrorf(diags, "unsupported Terraform version: %s. "+
+			"This version of Terraform is not supported with pre-release version of the Terraform AWS Provider but will be supported at GA. "+
+			"See https://developer.hashicorp.com/terraform/language/providers/requirements#v0-12-compatible-provider-requirements for details of how to specify an exact provider version to use", terraformVersion)
+	}
+
 	config := conns.Config{
 		AccessKey:                      d.Get("access_key").(string),
 		CustomCABundle:                 d.Get("custom_ca_bundle").(string),

diff --git a/internal/provider/provider_config_test.go b/internal/provider/provider_config_test.go
@@ -174,6 +174,8 @@ sso_start_url = https://d-123456789a.awsapps.com/start#
 				t.Fatal(err)
 			}
 
+			p.TerraformVersion = "1.0.0"
+
 			var diags diag.Diagnostics
 			diags = append(diags, p.Validate(rc)...)
 			if diags.HasError() {
@@ -268,6 +270,8 @@ func (d testCaseDriver) Apply(ctx context.Context, t *testing.T) (context.Contex
 		t.Fatal(err)
 	}
 
+	p.TerraformVersion = "1.0.0"
+
 	var diags diag.Diagnostics
 	diags = append(diags, p.Validate(rc)...)
 	if diags.HasError() {
@@ -599,6 +603,8 @@ func TestProviderConfig_AssumeRole(t *testing.T) { //nolint:paralleltest
 				t.Fatal(err)
 			}
 
+			p.TerraformVersion = "1.0.0"
+
 			var diags diag.Diagnostics
 			diags = append(diags, p.Validate(rc)...)
 			if diags.HasError() {

diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
@@ -32,13 +32,13 @@ func TestProvider(t *testing.T) {
 	t.Parallel()
 
 	p, err := New(context.Background())
-
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = p.InternalValidate()
+	p.TerraformVersion = "1.0.0"
 
+	err = p.InternalValidate()
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/internal/service/accessanalyzer/service_endpoints_gen_test.go b/internal/service/accessanalyzer/service_endpoints_gen_test.go
diff --git a/internal/service/account/service_endpoints_gen_test.go b/internal/service/account/service_endpoints_gen_test.go
diff --git a/internal/service/acm/service_endpoints_gen_test.go b/internal/service/acm/service_endpoints_gen_test.go
diff --git a/internal/service/acmpca/service_endpoints_gen_test.go b/internal/service/acmpca/service_endpoints_gen_test.go
diff --git a/internal/service/amp/service_endpoints_gen_test.go b/internal/service/amp/service_endpoints_gen_test.go
diff --git a/internal/service/amplify/service_endpoints_gen_test.go b/internal/service/amplify/service_endpoints_gen_test.go
diff --git a/internal/service/apigateway/service_endpoints_gen_test.go b/internal/service/apigateway/service_endpoints_gen_test.go
diff --git a/internal/service/apigatewayv2/service_endpoints_gen_test.go b/internal/service/apigatewayv2/service_endpoints_gen_test.go
diff --git a/internal/service/appautoscaling/service_endpoints_gen_test.go b/internal/service/appautoscaling/service_endpoints_gen_test.go
diff --git a/internal/service/appconfig/service_endpoints_gen_test.go b/internal/service/appconfig/service_endpoints_gen_test.go
diff --git a/internal/service/appfabric/service_endpoints_gen_test.go b/internal/service/appfabric/service_endpoints_gen_test.go
diff --git a/internal/service/appflow/service_endpoints_gen_test.go b/internal/service/appflow/service_endpoints_gen_test.go
diff --git a/internal/service/appintegrations/service_endpoints_gen_test.go b/internal/service/appintegrations/service_endpoints_gen_test.go
diff --git a/internal/service/applicationinsights/service_endpoints_gen_test.go b/internal/service/applicationinsights/service_endpoints_gen_test.go
diff --git a/internal/service/applicationsignals/service_endpoints_gen_test.go b/internal/service/applicationsignals/service_endpoints_gen_test.go
diff --git a/internal/service/appmesh/service_endpoints_gen_test.go b/internal/service/appmesh/service_endpoints_gen_test.go
diff --git a/internal/service/apprunner/service_endpoints_gen_test.go b/internal/service/apprunner/service_endpoints_gen_test.go
diff --git a/internal/service/appstream/service_endpoints_gen_test.go b/internal/service/appstream/service_endpoints_gen_test.go
diff --git a/internal/service/appsync/service_endpoints_gen_test.go b/internal/service/appsync/service_endpoints_gen_test.go
diff --git a/internal/service/athena/service_endpoints_gen_test.go b/internal/service/athena/service_endpoints_gen_test.go
diff --git a/internal/service/auditmanager/service_endpoints_gen_test.go b/internal/service/auditmanager/service_endpoints_gen_test.go
diff --git a/internal/service/autoscaling/service_endpoints_gen_test.go b/internal/service/autoscaling/service_endpoints_gen_test.go
diff --git a/internal/service/autoscalingplans/service_endpoints_gen_test.go b/internal/service/autoscalingplans/service_endpoints_gen_test.go
diff --git a/internal/service/backup/service_endpoints_gen_test.go b/internal/service/backup/service_endpoints_gen_test.go
diff --git a/internal/service/batch/service_endpoints_gen_test.go b/internal/service/batch/service_endpoints_gen_test.go
diff --git a/internal/service/bcmdataexports/service_endpoints_gen_test.go b/internal/service/bcmdataexports/service_endpoints_gen_test.go
diff --git a/internal/service/bedrock/service_endpoints_gen_test.go b/internal/service/bedrock/service_endpoints_gen_test.go
diff --git a/internal/service/bedrockagent/service_endpoints_gen_test.go b/internal/service/bedrockagent/service_endpoints_gen_test.go
diff --git a/internal/service/billing/service_endpoints_gen_test.go b/internal/service/billing/service_endpoints_gen_test.go
diff --git a/internal/service/budgets/service_endpoints_gen_test.go b/internal/service/budgets/service_endpoints_gen_test.go
diff --git a/internal/service/ce/service_endpoints_gen_test.go b/internal/service/ce/service_endpoints_gen_test.go
diff --git a/internal/service/chatbot/service_endpoints_gen_test.go b/internal/service/chatbot/service_endpoints_gen_test.go
diff --git a/internal/service/chime/service_endpoints_gen_test.go b/internal/service/chime/service_endpoints_gen_test.go
diff --git a/internal/service/chimesdkmediapipelines/service_endpoints_gen_test.go b/internal/service/chimesdkmediapipelines/service_endpoints_gen_test.go
diff --git a/internal/service/chimesdkvoice/service_endpoints_gen_test.go b/internal/service/chimesdkvoice/service_endpoints_gen_test.go