fix(clients): merge default variants by comparing tags (#3044)

trivikr · web-flow · commit d65a310ed5a4 · 2021-11-19T09:04:40.000-08:00
diff --git a/clients/client-acm-pca/src/endpoints.ts b/clients/client-acm-pca/src/endpoints.ts
@@ -200,6 +200,14 @@ const partitionHash: PartitionHash = {
         hostname: "acm-pca.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "acm-pca-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "acm-pca.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-batch/src/endpoints.ts b/clients/client-batch/src/endpoints.ts
@@ -115,6 +115,14 @@ const partitionHash: PartitionHash = {
         hostname: "fips.batch.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "batch-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "batch.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
   "aws-cn": {
@@ -179,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "batch.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "batch-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "batch.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-cloudwatch/src/endpoints.ts b/clients/client-cloudwatch/src/endpoints.ts
@@ -187,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "monitoring.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "monitoring-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "monitoring.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-config-service/src/endpoints.ts b/clients/client-config-service/src/endpoints.ts
@@ -187,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "config.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "config-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "config.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-database-migration-service/src/endpoints.ts b/clients/client-database-migration-service/src/endpoints.ts
@@ -213,6 +213,14 @@ const partitionHash: PartitionHash = {
         hostname: "dms.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "dms-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "dms.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-docdb/src/endpoints.ts b/clients/client-docdb/src/endpoints.ts
@@ -217,6 +217,14 @@ const partitionHash: PartitionHash = {
         hostname: "rds.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "rds-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "rds.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-dynamodb/src/endpoints.ts b/clients/client-dynamodb/src/endpoints.ts
@@ -210,6 +210,14 @@ const partitionHash: PartitionHash = {
         hostname: "dynamodb.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "dynamodb-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "dynamodb.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-ecr/src/endpoints.ts b/clients/client-ecr/src/endpoints.ts
@@ -327,6 +327,14 @@ const partitionHash: PartitionHash = {
         hostname: "ecr-fips.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "api.ecr-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "api.ecr.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
   "aws-cn": {
@@ -400,6 +408,14 @@ const partitionHash: PartitionHash = {
         hostname: "ecr-fips.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "api.ecr-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "api.ecr.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-eks/src/endpoints.ts b/clients/client-eks/src/endpoints.ts
@@ -115,6 +115,14 @@ const partitionHash: PartitionHash = {
         hostname: "fips.eks.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "eks-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "eks.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
   "aws-cn": {
@@ -179,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "eks.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "eks-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "eks.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-elastic-load-balancing-v2/src/endpoints.ts b/clients/client-elastic-load-balancing-v2/src/endpoints.ts
@@ -187,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "elasticloadbalancing.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "elasticloadbalancing-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "elasticloadbalancing.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-elastic-load-balancing/src/endpoints.ts b/clients/client-elastic-load-balancing/src/endpoints.ts
@@ -187,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "elasticloadbalancing.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "elasticloadbalancing-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "elasticloadbalancing.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-elasticache/src/endpoints.ts b/clients/client-elasticache/src/endpoints.ts
@@ -176,6 +176,14 @@ const partitionHash: PartitionHash = {
         hostname: "elasticache.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "elasticache-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "elasticache.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-emr/src/endpoints.ts b/clients/client-emr/src/endpoints.ts
@@ -200,6 +200,14 @@ const partitionHash: PartitionHash = {
         hostname: "elasticmapreduce.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "elasticmapreduce-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "elasticmapreduce.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-guardduty/src/endpoints.ts b/clients/client-guardduty/src/endpoints.ts
@@ -187,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "guardduty.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "guardduty-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "guardduty.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-identitystore/src/endpoints.ts b/clients/client-identitystore/src/endpoints.ts
@@ -123,6 +123,14 @@ const partitionHash: PartitionHash = {
         hostname: "identitystore.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "identitystore-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "identitystore.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-lex-model-building-service/src/endpoints.ts b/clients/client-lex-model-building-service/src/endpoints.ts
@@ -77,6 +77,14 @@ const partitionHash: PartitionHash = {
         hostname: "models-fips.lex.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "models.lex-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "models.lex.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
   "aws-cn": {
@@ -141,6 +149,14 @@ const partitionHash: PartitionHash = {
         hostname: "models-fips.lex.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "models.lex-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "models.lex.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-lex-runtime-service/src/endpoints.ts b/clients/client-lex-runtime-service/src/endpoints.ts
@@ -77,6 +77,14 @@ const partitionHash: PartitionHash = {
         hostname: "runtime-fips.lex.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "runtime.lex-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "runtime.lex.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
   "aws-cn": {
@@ -141,6 +149,14 @@ const partitionHash: PartitionHash = {
         hostname: "runtime-fips.lex.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "runtime.lex-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "runtime.lex.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-neptune/src/endpoints.ts b/clients/client-neptune/src/endpoints.ts
@@ -217,6 +217,14 @@ const partitionHash: PartitionHash = {
         hostname: "rds.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "rds-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "rds.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-rds/src/endpoints.ts b/clients/client-rds/src/endpoints.ts
@@ -217,6 +217,14 @@ const partitionHash: PartitionHash = {
         hostname: "rds.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "rds-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "rds.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-resource-groups/src/endpoints.ts b/clients/client-resource-groups/src/endpoints.ts
@@ -187,6 +187,14 @@ const partitionHash: PartitionHash = {
         hostname: "resource-groups.{region}.amazonaws.com",
         tags: ["fips"],
       },
+      {
+        hostname: "resource-groups-fips.{region}.api.aws",
+        tags: ["dualstack", "fips"],
+      },
+      {
+        hostname: "resource-groups.{region}.api.aws",
+        tags: ["dualstack"],
+      },
     ],
   },
 };
diff --git a/clients/client-s3-control/src/endpoints.ts b/clients/client-s3-control/src/endpoints.ts
diff --git a/clients/client-s3/src/endpoints.ts b/clients/client-s3/src/endpoints.ts
diff --git a/clients/client-sagemaker-runtime/src/endpoints.ts b/clients/client-sagemaker-runtime/src/endpoints.ts
diff --git a/clients/client-sagemaker/src/endpoints.ts b/clients/client-sagemaker/src/endpoints.ts
diff --git a/clients/client-service-catalog-appregistry/src/endpoints.ts b/clients/client-service-catalog-appregistry/src/endpoints.ts
diff --git a/clients/client-service-quotas/src/endpoints.ts b/clients/client-service-quotas/src/endpoints.ts
diff --git a/clients/client-ssm/src/endpoints.ts b/clients/client-ssm/src/endpoints.ts
diff --git a/clients/client-sts/src/endpoints.ts b/clients/client-sts/src/endpoints.ts
diff --git a/clients/client-transcribe/src/endpoints.ts b/clients/client-transcribe/src/endpoints.ts
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/EndpointGenerator.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/EndpointGenerator.java
