provider: Remove deprecated kinesis_analytics and r53 custom endpoint…

… arguments (#14238)

Reference: #13398

Output from acceptance testing:

```
--- PASS: TestAccAWSProvider_Region_AwsCommercial (3.64s)
--- PASS: TestAccAWSProvider_Region_AwsChina (3.64s)
--- PASS: TestAccAWSProvider_Region_AwsGovCloudUs (3.65s)
--- PASS: TestAccAWSProvider_IgnoreTags_KeyPrefixes_Multiple (4.00s)
--- PASS: TestAccAWSProvider_IgnoreTags_Keys_None (4.00s)
--- PASS: TestAccAWSProvider_IgnoreTags_Keys_Multiple (4.01s)
--- PASS: TestAccAWSProvider_IgnoreTags_Keys_One (4.01s)
--- PASS: TestAccAWSProvider_IgnoreTags_KeyPrefixes_None (4.01s)
--- PASS: TestAccAWSProvider_IgnoreTags_KeyPrefixes_One (4.02s)
--- PASS: TestAccAWSProvider_IgnoreTags_EmptyConfigurationBlock (4.01s)
--- PASS: TestAccAWSProvider_Endpoints (4.08s)
--- PASS: TestAccAWSProvider_AssumeRole_Empty (7.80s)
```

aws/config.go

@@ -589,14 +589,6 @@ func (c *Config) Client() (interface{}, error) {
  s3Config.DisableRestProtocolURICleaning = aws.Bool(true)
  client.s3connUriCleaningDisabled = s3.New(sess.Copy(s3Config))
 
- // Handle deprecated endpoint configurations
- if c.Endpoints["kinesis_analytics"] != "" {
- client.kinesisanalyticsconn = kinesisanalytics.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesis_analytics"])}))
- }
- if c.Endpoints["r53"] != "" {
- route53Config.Endpoint = aws.String(c.Endpoints["r53"])
- }
-
  // Force "global" services to correct regions
  switch partition {
  case endpoints.AwsPartitionID:

aws/provider.go

@@ -1095,7 +1095,6 @@ func init() {
  "iotanalytics",
  "iotevents",
  "kafka",
- "kinesis_analytics",
  "kinesis",
  "kinesisanalytics",
  "kinesisanalyticsv2",
@@ -1126,7 +1125,6 @@ func init() {
  "pricing",
  "qldb",
  "quicksight",
- "r53",
  "ram",
  "rds",
  "redshift",
@@ -1345,10 +1343,6 @@ func endpointsSchema() *schema.Schema {
  }
  }
 
- // Since the endpoints attribute is a TypeSet we cannot use ConflictsWith
- endpointsAttributes["kinesis_analytics"].Deprecated = "use `endpoints` configuration block `kinesisanalytics` argument instead"
- endpointsAttributes["r53"].Deprecated = "use `endpoints` configuration block `route53` argument instead"
-
  return &schema.Schema{
  Type: schema.TypeSet,
  Optional: true,

aws/provider_test.go

@@ -812,11 +812,6 @@ func TestAccAWSProvider_Endpoints(t *testing.T) {
 
  // Initialize each endpoint configuration with matching name and value
  for _, endpointServiceName := range endpointServiceNames {
- // Skip deprecated endpoint configurations as they will override expected values
- if endpointServiceName == "kinesis_analytics" || endpointServiceName == "r53" {
- continue
- }
-
  endpoints.WriteString(fmt.Sprintf("%s = \"http://%s\"\n", endpointServiceName, endpointServiceName))
  }
 
@@ -835,34 +830,6 @@ func TestAccAWSProvider_Endpoints(t *testing.T) {
  })
 }
 
-func TestAccAWSProvider_Endpoints_Deprecated(t *testing.T) {
- var providers []*schema.Provider
- var endpointsDeprecated strings.Builder
-
- // Initialize each deprecated endpoint configuration with matching name and value
- for _, endpointServiceName := range endpointServiceNames {
- // Only configure deprecated endpoint configurations
- if endpointServiceName != "kinesis_analytics" && endpointServiceName != "r53" {
- continue
- }
-
- endpointsDeprecated.WriteString(fmt.Sprintf("%s = \"http://%s\"\n", endpointServiceName, endpointServiceName))
- }
-
- resource.ParallelTest(t, resource.TestCase{
- PreCheck: func() { testAccPreCheck(t) },
- ProviderFactories: testAccProviderFactories(&providers),
- CheckDestroy: nil,
- Steps: []resource.TestStep{
- {
- Config: testAccAWSProviderConfigEndpoints(endpointsDeprecated.String()),
- Check: resource.ComposeTestCheckFunc(
- testAccCheckAWSProviderEndpointsDeprecated(&providers)),
- },
- },
- })
-}
-
 func TestAccAWSProvider_IgnoreTags_EmptyConfigurationBlock(t *testing.T) {
  var providers []*schema.Provider
 
@@ -1144,61 +1111,6 @@ func testAccCheckAWSProviderEndpoints(providers *[]*schema.Provider) resource.Te
  providerClient := provider.Meta().(*AWSClient)
 
  for _, endpointServiceName := range endpointServiceNames {
- // Skip deprecated endpoint configurations as they will override expected values
- if endpointServiceName == "kinesis_analytics" || endpointServiceName == "r53" {
- continue
- }
-
- providerClientField := reflect.Indirect(reflect.ValueOf(providerClient)).FieldByNameFunc(endpointFieldNameF(endpointServiceName))
-
- if !providerClientField.IsValid() {
- return fmt.Errorf("unable to match AWSClient struct field name for endpoint name: %s", endpointServiceName)
- }
-
- actualEndpoint := reflect.Indirect(reflect.Indirect(providerClientField).FieldByName("Config").FieldByName("Endpoint")).String()
- expectedEndpoint := fmt.Sprintf("http://%s", endpointServiceName)
-
- if actualEndpoint != expectedEndpoint {
- return fmt.Errorf("expected endpoint (%s) value (%s), got: %s", endpointServiceName, expectedEndpoint, actualEndpoint)
- }
- }
- }
-
- return nil
- }
-}
-
-func testAccCheckAWSProviderEndpointsDeprecated(providers *[]*schema.Provider) resource.TestCheckFunc {
- return func(s *terraform.State) error {
- if providers == nil {
- return fmt.Errorf("no providers initialized")
- }
-
- // Match AWSClient struct field names to endpoint configuration names
- endpointFieldNameF := func(endpoint string) func(string) bool {
- return func(name string) bool {
- switch endpoint {
- case "kinesis_analytics":
- endpoint = "kinesisanalytics"
- }
-
- return name == fmt.Sprintf("%sconn", endpoint)
- }
- }
-
- for _, provider := range *providers {
- if provider == nil || provider.Meta() == nil || provider.Meta().(*AWSClient) == nil {
- continue
- }
-
- providerClient := provider.Meta().(*AWSClient)
-
- for _, endpointServiceName := range endpointServiceNames {
- // Only check deprecated endpoint configurations
- if endpointServiceName != "kinesis_analytics" && endpointServiceName != "r53" {
- continue
- }
-
  providerClientField := reflect.Indirect(reflect.ValueOf(providerClient)).FieldByNameFunc(endpointFieldNameF(endpointServiceName))
 
  if !providerClientField.IsValid() {

website/docs/guides/custom-service-endpoints.html.md

@@ -128,7 +128,6 @@ The Terraform AWS Provider allows the following endpoints to be customized:
  <li><code>iotanalytics</code></li>
  <li><code>iotevents</code></li>
  <li><code>kafka</code></li>
- <li><code>kinesis_analytics</code> (<b>DEPRECATED</b> Use <code>kinesisanalytics</code> instead)</li>
  <li><code>kinesis</code></li>
  <li><code>kinesisanalytics</code></li>
  <li><code>kinesisanalyticsv2</code></li>
@@ -159,7 +158,6 @@ The Terraform AWS Provider allows the following endpoints to be customized:
  <li><code>pricing</code></li>
  <li><code>qldb</code></li>
  <li><code>quicksight</code></li>
- <li><code>r53</code></li> (<b>DEPRECATED</b> Use <code>route53</code> instead)</li>
  <li><code>ram</code></li>
  <li><code>rds</code></li>
  <li><code>redshift</code></li>

website/docs/guides/version-3-upgrade.html.md

@@ -20,6 +20,7 @@ Upgrade topics:
 
 - [Provider Version Configuration](#provider-version-configuration)
 - [Provider Authentication Updates](#provider-authentication-updates)
+- [Provider Custom Service Endpoint Updates](#provider-custom-service-endpoint-updates)
 - [Data Source: aws_availability_zones](#data-source-aws_availability_zones)
 - [Data Source: aws_lambda_invocation](#data-source-aws_lambda_invocation)
 - [Resource: aws_acm_certificate](#resource-aws_acm_certificate)
@@ -100,6 +101,42 @@ The `AWS_SDK_LOAD_CONFIG` environment variable is no longer necessary for the pr
 
 The provider now relies on the default AWS Go SDK timeouts for interacting with the EC2 Instance Metadata Service.
 
+## Provider Custom Service Endpoint Updates
+
+### Removal of kinesis_analytics and r53 Arguments
+
+The [custom service endpoints](custom-service-endpoints.html) for Kinesis Analytics and Route 53 now use the `kinesisanalytics` and `route53` argument names in the provider configuration.
+
+For example, given this previous configuration:
+
+```hcl
+provider "aws" {
+ # ... potentially other configuration ...
+
+ endpoints {
+ # ... potentially other configuration ...
+
+ kinesis_analytics = "https://example.com"
+ r53 = "https://example.com"
+ }
+}
+```
+
+An updated configuration:
+
+```hcl
+provider "aws" {
+ # ... potentially other configuration ...
+
+ endpoints {
+ # ... potentially other configuration ...
+
+ kinesisanalytics = "https://example.com"
+ route53 = "https://example.com"
+ }
+}
+```
+
 ## Data Source: aws_availability_zones
 
 ### blacklisted_names Attribute Removal