Skip to content

Commit 0b76346

Browse files
author
awstools
committed
feat(client-sso): Fix FIPS Endpoints in aws-us-gov.
1 parent fa961c2 commit 0b76346

File tree

2 files changed

+45
-18
lines changed

2 files changed

+45
-18
lines changed

clients/client-sso/src/endpoint/ruleset.ts

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,27 @@ import { RuleSetObject } from "@smithy/types";
66
or see "smithy.rules#endpointRuleSet"
77
in codegen/sdk-codegen/aws-models/sso.json */
88

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

codegen/sdk-codegen/aws-models/sso.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,31 @@
760760
],
761761
"type": "tree",
762762
"rules": [
763+
{
764+
"conditions": [
765+
{
766+
"fn": "stringEquals",
767+
"argv": [
768+
"aws-us-gov",
769+
{
770+
"fn": "getAttr",
771+
"argv": [
772+
{
773+
"ref": "PartitionResult"
774+
},
775+
"name"
776+
]
777+
}
778+
]
779+
}
780+
],
781+
"endpoint": {
782+
"url": "https://portal.sso.{Region}.amazonaws.com",
783+
"properties": {},
784+
"headers": {}
785+
},
786+
"type": "endpoint"
787+
},
763788
{
764789
"conditions": [],
765790
"endpoint": {
@@ -1233,7 +1258,7 @@
12331258
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
12341259
"expect": {
12351260
"endpoint": {
1236-
"url": "https://portal.sso-fips.us-gov-east-1.amazonaws.com"
1261+
"url": "https://portal.sso.us-gov-east-1.amazonaws.com"
12371262
}
12381263
},
12391264
"params": {
@@ -1452,4 +1477,4 @@
14521477
}
14531478
}
14541479
}
1455-
}
1480+
}

0 commit comments

Comments
 (0)