Skip to content

Commit 74067c7

Browse files
author
awstools
committed
feat(client-ecr-public): Temporarily updating dualstack endpoint support
1 parent dd8bd77 commit 74067c7

File tree

2 files changed

+29
-69
lines changed

2 files changed

+29
-69
lines changed

‎clients/client-ecr-public/src/endpoint/ruleset.ts

+16-18
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,27 @@ import { RuleSetObject } from "@smithy/types";
66
or see "smithy.rules#endpointRuleSet"
77
in codegen/sdk-codegen/aws-models/ecr-public.json */
88

9-
const u="required",
10-
v="fn",
11-
w="argv",
12-
x="ref";
9+
const s="required",
10+
t="fn",
11+
u="argv",
12+
v="ref";
1313
const a=true,
1414
b="isSet",
1515
c="booleanEquals",
1616
d="error",
1717
e="endpoint",
1818
f="tree",
1919
g="PartitionResult",
20-
h="getAttr",
21-
i={[u]:false,"type":"String"},
22-
j={[u]:true,"default":false,"type":"Boolean"},
23-
k={[x]:"Endpoint"},
24-
l={[v]:c,[w]:[{[x]:"UseFIPS"},true]},
25-
m={[v]:c,[w]:[{[x]:"UseDualStack"},true]},
26-
n={},
27-
o={[v]:h,[w]:[{[x]:g},"supportsFIPS"]},
28-
p={[x]:g},
29-
q={[v]:c,[w]:[true,{[v]:h,[w]:[p,"supportsDualStack"]}]},
30-
r=[l],
31-
s=[m],
32-
t=[{[x]:"Region"}];
33-
const _data={version:"1.0",parameters:{Region:i,UseDualStack:j,UseFIPS:j,Endpoint:i},rules:[{conditions:[{[v]:b,[w]:[k]}],rules:[{conditions:r,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:d},{conditions:s,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:d},{endpoint:{url:k,properties:n,headers:n},type:e}],type:f},{conditions:[{[v]:b,[w]:t}],rules:[{conditions:[{[v]:"aws.partition",[w]:t,assign:g}],rules:[{conditions:[l,m],rules:[{conditions:[{[v]:c,[w]:[a,o]},q],rules:[{endpoint:{url:"https://api.ecr-public-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:n,headers:n},type:e}],type:f},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:d}],type:f},{conditions:r,rules:[{conditions:[{[v]:c,[w]:[o,a]}],rules:[{endpoint:{url:"https://api.ecr-public-fips.{Region}.{PartitionResult#dnsSuffix}",properties:n,headers:n},type:e}],type:f},{error:"FIPS is enabled but this partition does not support FIPS",type:d}],type:f},{conditions:s,rules:[{conditions:[q],rules:[{conditions:[{[v]:"stringEquals",[w]:["aws",{[v]:h,[w]:[p,"name"]}]}],endpoint:{url:"https://ecr-public.{Region}.api.aws",properties:n,headers:n},type:e},{endpoint:{url:"https://api.ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:n,headers:n},type:e}],type:f},{error:"DualStack is enabled but this partition does not support DualStack",type:d}],type:f},{endpoint:{url:"https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",properties:n,headers:n},type:e}],type:f}],type:f},{error:"Invalid Configuration: Missing Region",type:d}]};
20+
h={[s]:false,"type":"String"},
21+
i={[s]:true,"default":false,"type":"Boolean"},
22+
j={[v]:"Endpoint"},
23+
k={[t]:c,[u]:[{[v]:"UseFIPS"},true]},
24+
l={[t]:c,[u]:[{[v]:"UseDualStack"},true]},
25+
m={},
26+
n={[t]:"getAttr",[u]:[{[v]:g},"supportsFIPS"]},
27+
o={[t]:c,[u]:[true,{[t]:"getAttr",[u]:[{[v]:g},"supportsDualStack"]}]},
28+
p=[k],
29+
q=[l],
30+
r=[{[v]:"Region"}];
31+
const _data={version:"1.0",parameters:{Region:h,UseDualStack:i,UseFIPS:i,Endpoint:h},rules:[{conditions:[{[t]:b,[u]:[j]}],rules:[{conditions:p,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:d},{conditions:q,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:d},{endpoint:{url:j,properties:m,headers:m},type:e}],type:f},{conditions:[{[t]:b,[u]:r}],rules:[{conditions:[{[t]:"aws.partition",[u]:r,assign:g}],rules:[{conditions:[k,l],rules:[{conditions:[{[t]:c,[u]:[a,n]},o],rules:[{endpoint:{url:"https://api.ecr-public-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:m,headers:m},type:e}],type:f},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:d}],type:f},{conditions:p,rules:[{conditions:[{[t]:c,[u]:[n,a]}],rules:[{endpoint:{url:"https://api.ecr-public-fips.{Region}.{PartitionResult#dnsSuffix}",properties:m,headers:m},type:e}],type:f},{error:"FIPS is enabled but this partition does not support FIPS",type:d}],type:f},{conditions:q,rules:[{conditions:[o],rules:[{endpoint:{url:"https://api.ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:m,headers:m},type:e}],type:f},{error:"DualStack is enabled but this partition does not support DualStack",type:d}],type:f},{endpoint:{url:"https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",properties:m,headers:m},type:e}],type:f}],type:f},{error:"Invalid Configuration: Missing Region",type:d}]};
3432
export const ruleSet: RuleSetObject = _data;

‎codegen/sdk-codegen/aws-models/ecr-public.json

+13-51
Original file line numberDiff line numberDiff line change
@@ -3131,31 +3131,6 @@
31313131
}
31323132
],
31333133
"rules": [
3134-
{
3135-
"conditions": [
3136-
{
3137-
"fn": "stringEquals",
3138-
"argv": [
3139-
"aws",
3140-
{
3141-
"fn": "getAttr",
3142-
"argv": [
3143-
{
3144-
"ref": "PartitionResult"
3145-
},
3146-
"name"
3147-
]
3148-
}
3149-
]
3150-
}
3151-
],
3152-
"endpoint": {
3153-
"url": "https://ecr-public.{Region}.api.aws",
3154-
"properties": {},
3155-
"headers": {}
3156-
},
3157-
"type": "endpoint"
3158-
},
31593134
{
31603135
"conditions": [],
31613136
"endpoint": {
@@ -3201,67 +3176,54 @@
32013176
"smithy.rules#endpointTests": {
32023177
"testCases": [
32033178
{
3204-
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
3205-
"expect": {
3206-
"endpoint": {
3207-
"url": "https://api.ecr-public.us-east-1.amazonaws.com"
3208-
}
3209-
},
3210-
"params": {
3211-
"Region": "us-east-1",
3212-
"UseFIPS": false,
3213-
"UseDualStack": false
3214-
}
3215-
},
3216-
{
3217-
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
3179+
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
32183180
"expect": {
32193181
"endpoint": {
3220-
"url": "https://ecr-public.us-east-1.api.aws"
3182+
"url": "https://api.ecr-public-fips.us-east-1.api.aws"
32213183
}
32223184
},
32233185
"params": {
32243186
"Region": "us-east-1",
3225-
"UseFIPS": false,
3187+
"UseFIPS": true,
32263188
"UseDualStack": true
32273189
}
32283190
},
32293191
{
3230-
"documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
3192+
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
32313193
"expect": {
32323194
"endpoint": {
3233-
"url": "https://api.ecr-public.us-west-2.amazonaws.com"
3195+
"url": "https://api.ecr-public-fips.us-east-1.amazonaws.com"
32343196
}
32353197
},
32363198
"params": {
3237-
"Region": "us-west-2",
3238-
"UseFIPS": false,
3199+
"Region": "us-east-1",
3200+
"UseFIPS": true,
32393201
"UseDualStack": false
32403202
}
32413203
},
32423204
{
3243-
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
3205+
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
32443206
"expect": {
32453207
"endpoint": {
3246-
"url": "https://api.ecr-public-fips.us-east-1.api.aws"
3208+
"url": "https://api.ecr-public.us-east-1.api.aws"
32473209
}
32483210
},
32493211
"params": {
32503212
"Region": "us-east-1",
3251-
"UseFIPS": true,
3213+
"UseFIPS": false,
32523214
"UseDualStack": true
32533215
}
32543216
},
32553217
{
3256-
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
3218+
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
32573219
"expect": {
32583220
"endpoint": {
3259-
"url": "https://api.ecr-public-fips.us-east-1.amazonaws.com"
3221+
"url": "https://api.ecr-public.us-east-1.amazonaws.com"
32603222
}
32613223
},
32623224
"params": {
32633225
"Region": "us-east-1",
3264-
"UseFIPS": true,
3226+
"UseFIPS": false,
32653227
"UseDualStack": false
32663228
}
32673229
},

0 commit comments

Comments
 (0)