Skip to content

Commit 6bb4e85

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Temporarily updating dualstack endpoint support
1 parent 95e9dd3 commit 6bb4e85

File tree

4 files changed

+30
-87
lines changed

4 files changed

+30
-87
lines changed

‎generator/ServiceModels/ecr-public/ecr-public-2020-10-30.endpoint-rule-set.json

-25
Original file line numberDiff line numberDiff line change
@@ -270,31 +270,6 @@
270270
}
271271
],
272272
"rules": [
273-
{
274-
"conditions": [
275-
{
276-
"fn": "stringEquals",
277-
"argv": [
278-
"aws",
279-
{
280-
"fn": "getAttr",
281-
"argv": [
282-
{
283-
"ref": "PartitionResult"
284-
},
285-
"name"
286-
]
287-
}
288-
]
289-
}
290-
],
291-
"endpoint": {
292-
"url": "https://ecr-public.{Region}.api.aws",
293-
"properties": {},
294-
"headers": {}
295-
},
296-
"type": "endpoint"
297-
},
298273
{
299274
"conditions": [],
300275
"endpoint": {

‎generator/ServiceModels/ecr-public/ecr-public-2020-10-30.endpoint-tests.json

+13-26
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,54 @@
11
{
22
"testCases": [
33
{
4-
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
5-
"expect": {
6-
"endpoint": {
7-
"url": "https://api.ecr-public.us-east-1.amazonaws.com"
8-
}
9-
},
10-
"params": {
11-
"Region": "us-east-1",
12-
"UseFIPS": false,
13-
"UseDualStack": false
14-
}
15-
},
16-
{
17-
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
4+
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
185
"expect": {
196
"endpoint": {
20-
"url": "https://ecr-public.us-east-1.api.aws"
7+
"url": "https://api.ecr-public-fips.us-east-1.api.aws"
218
}
229
},
2310
"params": {
2411
"Region": "us-east-1",
25-
"UseFIPS": false,
12+
"UseFIPS": true,
2613
"UseDualStack": true
2714
}
2815
},
2916
{
30-
"documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
17+
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
3118
"expect": {
3219
"endpoint": {
33-
"url": "https://api.ecr-public.us-west-2.amazonaws.com"
20+
"url": "https://api.ecr-public-fips.us-east-1.amazonaws.com"
3421
}
3522
},
3623
"params": {
37-
"Region": "us-west-2",
38-
"UseFIPS": false,
24+
"Region": "us-east-1",
25+
"UseFIPS": true,
3926
"UseDualStack": false
4027
}
4128
},
4229
{
43-
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
30+
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
4431
"expect": {
4532
"endpoint": {
46-
"url": "https://api.ecr-public-fips.us-east-1.api.aws"
33+
"url": "https://api.ecr-public.us-east-1.api.aws"
4734
}
4835
},
4936
"params": {
5037
"Region": "us-east-1",
51-
"UseFIPS": true,
38+
"UseFIPS": false,
5239
"UseDualStack": true
5340
}
5441
},
5542
{
56-
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
43+
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
5744
"expect": {
5845
"endpoint": {
59-
"url": "https://api.ecr-public-fips.us-east-1.amazonaws.com"
46+
"url": "https://api.ecr-public.us-east-1.amazonaws.com"
6047
}
6148
},
6249
"params": {
6350
"Region": "us-east-1",
64-
"UseFIPS": true,
51+
"UseFIPS": false,
6552
"UseDualStack": false
6653
}
6754
},

‎sdk/src/Services/ECRPublic/Generated/Internal/AmazonECRPublicEndpointProvider.cs

-4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ public Endpoint ResolveEndpoint(EndpointParameters parameters)
8888
{
8989
if (Equals(true, GetAttr(refs["PartitionResult"], "supportsDualStack")))
9090
{
91-
if (Equals("aws", GetAttr(refs["PartitionResult"], "name")))
92-
{
93-
return new Endpoint(Interpolate(@"https://ecr-public.{Region}.api.aws", refs), InterpolateJson(@"", refs), InterpolateJson(@"", refs));
94-
}
9591
return new Endpoint(Interpolate(@"https://api.ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}", refs), InterpolateJson(@"", refs), InterpolateJson(@"", refs));
9692
}
9793
throw new AmazonClientException("DualStack is enabled but this partition does not support DualStack");

‎sdk/test/Services/ECRPublic/UnitTests/Generated/Endpoints/ECRPublicEndpointProviderTests.cs

+17-32
Original file line numberDiff line numberDiff line change
@@ -32,75 +32,60 @@ public partial class ECRPublicEndpointsTests
3232
[TestCategory("UnitTest")]
3333
[TestCategory("Endpoints")]
3434
[TestCategory("ECRPublic")]
35-
[Description("For region us-east-1 with FIPS disabled and DualStack disabled")]
36-
public void For_region_useast1_with_FIPS_disabled_and_DualStack_disabled_Test()
37-
{
38-
var parameters = new ECRPublicEndpointParameters();
39-
parameters["Region"] = "us-east-1";
40-
parameters["UseFIPS"] = false;
41-
parameters["UseDualStack"] = false;
42-
var endpoint = new AmazonECRPublicEndpointProvider().ResolveEndpoint(parameters);
43-
Assert.AreEqual("https://api.ecr-public.us-east-1.amazonaws.com", endpoint.URL);
44-
}
45-
46-
[TestMethod]
47-
[TestCategory("UnitTest")]
48-
[TestCategory("Endpoints")]
49-
[TestCategory("ECRPublic")]
50-
[Description("For region us-east-1 with FIPS disabled and DualStack enabled")]
51-
public void For_region_useast1_with_FIPS_disabled_and_DualStack_enabled_Test()
35+
[Description("For region us-east-1 with FIPS enabled and DualStack enabled")]
36+
public void For_region_useast1_with_FIPS_enabled_and_DualStack_enabled_Test()
5237
{
5338
var parameters = new ECRPublicEndpointParameters();
5439
parameters["Region"] = "us-east-1";
55-
parameters["UseFIPS"] = false;
40+
parameters["UseFIPS"] = true;
5641
parameters["UseDualStack"] = true;
5742
var endpoint = new AmazonECRPublicEndpointProvider().ResolveEndpoint(parameters);
58-
Assert.AreEqual("https://ecr-public.us-east-1.api.aws", endpoint.URL);
43+
Assert.AreEqual("https://api.ecr-public-fips.us-east-1.api.aws", endpoint.URL);
5944
}
6045

6146
[TestMethod]
6247
[TestCategory("UnitTest")]
6348
[TestCategory("Endpoints")]
6449
[TestCategory("ECRPublic")]
65-
[Description("For region us-west-2 with FIPS disabled and DualStack disabled")]
66-
public void For_region_uswest2_with_FIPS_disabled_and_DualStack_disabled_Test()
50+
[Description("For region us-east-1 with FIPS enabled and DualStack disabled")]
51+
public void For_region_useast1_with_FIPS_enabled_and_DualStack_disabled_Test()
6752
{
6853
var parameters = new ECRPublicEndpointParameters();
69-
parameters["Region"] = "us-west-2";
70-
parameters["UseFIPS"] = false;
54+
parameters["Region"] = "us-east-1";
55+
parameters["UseFIPS"] = true;
7156
parameters["UseDualStack"] = false;
7257
var endpoint = new AmazonECRPublicEndpointProvider().ResolveEndpoint(parameters);
73-
Assert.AreEqual("https://api.ecr-public.us-west-2.amazonaws.com", endpoint.URL);
58+
Assert.AreEqual("https://api.ecr-public-fips.us-east-1.amazonaws.com", endpoint.URL);
7459
}
7560

7661
[TestMethod]
7762
[TestCategory("UnitTest")]
7863
[TestCategory("Endpoints")]
7964
[TestCategory("ECRPublic")]
80-
[Description("For region us-east-1 with FIPS enabled and DualStack enabled")]
81-
public void For_region_useast1_with_FIPS_enabled_and_DualStack_enabled_Test()
65+
[Description("For region us-east-1 with FIPS disabled and DualStack enabled")]
66+
public void For_region_useast1_with_FIPS_disabled_and_DualStack_enabled_Test()
8267
{
8368
var parameters = new ECRPublicEndpointParameters();
8469
parameters["Region"] = "us-east-1";
85-
parameters["UseFIPS"] = true;
70+
parameters["UseFIPS"] = false;
8671
parameters["UseDualStack"] = true;
8772
var endpoint = new AmazonECRPublicEndpointProvider().ResolveEndpoint(parameters);
88-
Assert.AreEqual("https://api.ecr-public-fips.us-east-1.api.aws", endpoint.URL);
73+
Assert.AreEqual("https://api.ecr-public.us-east-1.api.aws", endpoint.URL);
8974
}
9075

9176
[TestMethod]
9277
[TestCategory("UnitTest")]
9378
[TestCategory("Endpoints")]
9479
[TestCategory("ECRPublic")]
95-
[Description("For region us-east-1 with FIPS enabled and DualStack disabled")]
96-
public void For_region_useast1_with_FIPS_enabled_and_DualStack_disabled_Test()
80+
[Description("For region us-east-1 with FIPS disabled and DualStack disabled")]
81+
public void For_region_useast1_with_FIPS_disabled_and_DualStack_disabled_Test()
9782
{
9883
var parameters = new ECRPublicEndpointParameters();
9984
parameters["Region"] = "us-east-1";
100-
parameters["UseFIPS"] = true;
85+
parameters["UseFIPS"] = false;
10186
parameters["UseDualStack"] = false;
10287
var endpoint = new AmazonECRPublicEndpointProvider().ResolveEndpoint(parameters);
103-
Assert.AreEqual("https://api.ecr-public-fips.us-east-1.amazonaws.com", endpoint.URL);
88+
Assert.AreEqual("https://api.ecr-public.us-east-1.amazonaws.com", endpoint.URL);
10489
}
10590

10691
[TestMethod]

0 commit comments

Comments
 (0)