Merge pull request #40264 from kilmajster/main

fix ignored skip_requesting_account_id argument
hashicorp · Nov 22, 2024 · d244ae5 · d244ae5
2 parents 7a50b4d + a53860e
commit d244ae5
Show file tree

Hide file tree

Showing 240 changed files with 4 additions and 1,923 deletions.
diff --git a/.changelog/40264.txt b/.changelog/40264.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+provider: Suppress `Warning: AWS account ID not found for provider` when `skip_requesting_account_id` is `true`
+```
diff --git a/internal/conns/config.go b/internal/conns/config.go
@@ -190,7 +190,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
 		})
 	}
 
-	if accountID == "" {
+	if accountID == "" && !awsbaseConfig.SkipRequestingAccountId {
 		diags = append(diags, errs.NewWarningDiagnostic(
 			"AWS account ID not found for provider",
 			"See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications."))

diff --git a/internal/conns/config_test.go b/internal/conns/config_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
-	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/provider"
 )
@@ -462,14 +461,6 @@ func TestProxyConfig(t *testing.T) {
 			}
 
 			expectedDiags := tc.expectedDiags
-			expectedDiags = append(
-				expectedDiags,
-				errs.NewWarningDiagnostic(
-					"AWS account ID not found for provider",
-					"See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications.",
-				),
-			)
-
 			diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config))
 
 			if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" {

diff --git a/internal/generate/serviceendpointtests/file.gtpl b/internal/generate/serviceendpointtests/file.gtpl
@@ -756,14 +756,6 @@ func testEndpointCase(t *testing.T, region string, testcase endpointTestCase, ca
 	}
 
 	expectedDiags := testcase.expected.diags
-	expectedDiags = append(
-		expectedDiags,
-		errs.NewWarningDiagnostic(
-			"AWS account ID not found for provider",
-			"See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications.",
-		),
-	)
-
 	diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config))
 
 	if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" {

diff --git a/internal/provider/provider_config_test.go b/internal/provider/provider_config_test.go
@@ -181,14 +181,7 @@ sso_start_url = https://d-123456789a.awsapps.com/start#
 
 			diags = append(diags, p.Configure(ctx, rc)...)
 
-			// The provider always returns a warning if there is no account ID
 			var expected diag.Diagnostics
-			expected = append(expected,
-				errs.NewWarningDiagnostic(
-					"AWS account ID not found for provider",
-					"See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications.",
-				),
-			)
 
 			if diff := cmp.Diff(diags, expected, cmp.Comparer(sdkdiag.Comparer)); diff != "" {
 				t.Errorf("unexpected diagnostics difference: %s", diff)
@@ -282,16 +275,7 @@ func (d testCaseDriver) Apply(ctx context.Context, t *testing.T) (context.Contex
 
 	diags = append(diags, p.Configure(ctx, rc)...)
 
-	// The provider always returns a warning if there is no account ID
 	var expected diag.Diagnostics
-	if d.mode == configtesting.TestModeLocal {
-		expected = append(expected,
-			errs.NewWarningDiagnostic(
-				"AWS account ID not found for provider",
-				"See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications.",
-			),
-		)
-	}
 
 	if diff := cmp.Diff(diags, expected, cmp.Comparer(sdkdiag.Comparer)); diff != "" {
 		t.Errorf("unexpected diagnostics difference: %s", diff)
@@ -623,15 +607,6 @@ func TestProviderConfig_AssumeRole(t *testing.T) { //nolint:paralleltest
 			diags = append(diags, p.Configure(ctx, rc)...)
 
 			expectedDiags := tc.ExpectedDiags
-			// If the provider attempts authorization, it always returns a warning if there is no account ID
-			if !tc.ExpectedDiags.HasError() {
-				expectedDiags = append(expectedDiags,
-					errs.NewWarningDiagnostic(
-						"AWS account ID not found for provider",
-						"See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications.",
-					),
-				)
-			}
 
 			if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" {
 				t.Errorf("unexpected diagnostics difference: %s", diff)

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