Add support for Marketplace Entitlement Service dual-stack endpoints for CN and GOV regions

aws-sdk-dotnet-automation · aws-sdk-dotnet-automation · commit c7432ceba8c6 · 2025-04-11T18:25:05.000Z
diff --git a/generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.endpoint-rule-set.json b/generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.endpoint-rule-set.json
@@ -205,6 +205,49 @@
                                     },
                                     "type": "endpoint"
                                 },
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "stringEquals",
+                                            "argv": [
+                                                {
+                                                    "fn": "getAttr",
+                                                    "argv": [
+                                                        {
+                                                            "ref": "PartitionResult"
+                                                        },
+                                                        "name"
+                                                    ]
+                                                },
+                                                "aws-cn"
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                false
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "endpoint": {
+                                        "url": "https://entitlement-marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                },
                                 {
                                     "conditions": [
                                         {
diff --git a/generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.endpoint-tests.json b/generator/ServiceModels/entitlement.marketplace/entitlement.marketplace-2017-01-11.endpoint-tests.json
@@ -115,7 +115,7 @@
             "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://entitlement.marketplace.cn-northwest-1.api.amazonwebservices.com.cn"
+                    "url": "https://entitlement-marketplace.cn-northwest-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
diff --git a/sdk/src/Services/MarketplaceEntitlementService/Generated/Internal/AmazonMarketplaceEntitlementServiceEndpointProvider.cs b/sdk/src/Services/MarketplaceEntitlementService/Generated/Internal/AmazonMarketplaceEntitlementServiceEndpointProvider.cs
@@ -76,6 +76,10 @@ public Endpoint ResolveEndpoint(EndpointParameters parameters)
                     {
                         return new Endpoint(Interpolate(@"https://entitlement-marketplace.{Region}.amazonaws.com.cn", refs), InterpolateJson(@"", refs), InterpolateJson(@"", refs));
                     }
+                    if (Equals(GetAttr(refs["PartitionResult"], "name"), "aws-cn") && Equals(refs["UseFIPS"], false) && Equals(refs["UseDualStack"], true))
+                    {
+                        return new Endpoint(Interpolate(@"https://entitlement-marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}", refs), InterpolateJson(@"", refs), InterpolateJson(@"", refs));
+                    }
                     if (Equals(refs["UseFIPS"], true) && Equals(refs["UseDualStack"], true))
                     {
                         if (Equals(true, GetAttr(refs["PartitionResult"], "supportsFIPS")) && Equals(true, GetAttr(refs["PartitionResult"], "supportsDualStack")))
diff --git a/sdk/test/Services/MarketplaceEntitlementService/UnitTests/Generated/Endpoints/MarketplaceEntitlementServiceEndpointProviderTests.cs b/sdk/test/Services/MarketplaceEntitlementService/UnitTests/Generated/Endpoints/MarketplaceEntitlementServiceEndpointProviderTests.cs
@@ -173,7 +173,7 @@ public void For_region_cnnorthwest1_with_FIPS_disabled_and_DualStack_enabled_Tes
             parameters["UseFIPS"] = false;
             parameters["UseDualStack"] = true;
             var endpoint = new AmazonMarketplaceEntitlementServiceEndpointProvider().ResolveEndpoint(parameters);
-            Assert.AreEqual("https://entitlement.marketplace.cn-northwest-1.api.amazonwebservices.com.cn", endpoint.URL);
+            Assert.AreEqual("https://entitlement-marketplace.cn-northwest-1.api.amazonwebservices.com.cn", endpoint.URL);
         }
 
         [TestMethod]

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@`
`115`	`115`	`"documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",`
`116`	`116`	`"expect": {`
`117`	`117`	`"endpoint": {`
`118`		`- "url": "https://entitlement.marketplace.cn-northwest-1.api.amazonwebservices.com.cn"`
	`118`	`+ "url": "https://entitlement-marketplace.cn-northwest-1.api.amazonwebservices.com.cn"`
`119`	`119`	`}`
`120`	`120`	`},`
`121`	`121`	`"params": {`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,10 @@ public Endpoint ResolveEndpoint(EndpointParameters parameters)`
`76`	`76`	`{`
`77`	`77`	`return new Endpoint(Interpolate(@"https://entitlement-marketplace.{Region}.amazonaws.com.cn", refs), InterpolateJson(@"", refs), InterpolateJson(@"", refs));`
`78`	`78`	`}`
	`79`	`+ if (Equals(GetAttr(refs["PartitionResult"], "name"), "aws-cn") && Equals(refs["UseFIPS"], false) && Equals(refs["UseDualStack"], true))`
	`80`	`+ {`
	`81`	`+ return new Endpoint(Interpolate(@"https://entitlement-marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}", refs), InterpolateJson(@"", refs), InterpolateJson(@"", refs));`
	`82`	`+ }`
`79`	`83`	`if (Equals(refs["UseFIPS"], true) && Equals(refs["UseDualStack"], true))`
`80`	`84`	`{`
`81`	`85`	`if (Equals(true, GetAttr(refs["PartitionResult"], "supportsFIPS")) && Equals(true, GetAttr(refs["PartitionResult"], "supportsDualStack")))`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public void For_region_cnnorthwest1_with_FIPS_disabled_and_DualStack_enabled_Tes`
`173`	`173`	`parameters["UseFIPS"] = false;`
`174`	`174`	`parameters["UseDualStack"] = true;`
`175`	`175`	`var endpoint = new AmazonMarketplaceEntitlementServiceEndpointProvider().ResolveEndpoint(parameters);`
`176`		`- Assert.AreEqual("https://entitlement.marketplace.cn-northwest-1.api.amazonwebservices.com.cn", endpoint.URL);`
	`176`	`+ Assert.AreEqual("https://entitlement-marketplace.cn-northwest-1.api.amazonwebservices.com.cn", endpoint.URL);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`[TestMethod]`