Skip to content

Commit 354980a

Browse files
author
awstools
committed
feat(client-support): Releasing minor endpoint updates.
1 parent dcebb69 commit 354980a

File tree

2 files changed

+109
-22
lines changed

2 files changed

+109
-22
lines changed

Diff for: ‎clients/client-support/src/endpoint/ruleset.ts

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

9-
const y="required",
10-
z="fn",
11-
A="argv",
12-
B="ref";
9+
const A="required",
10+
B="fn",
11+
C="argv",
12+
D="ref";
1313
const a=true,
1414
b="isSet",
1515
c="booleanEquals",
@@ -20,19 +20,21 @@ g="PartitionResult",
2020
h="stringEquals",
2121
i="sigv4",
2222
j="support",
23-
k={[y]:false,"type":"String"},
24-
l={[y]:true,"default":false,"type":"Boolean"},
25-
m={[B]:"Endpoint"},
26-
n={[z]:c,[A]:[{[B]:"UseFIPS"},true]},
27-
o={[z]:c,[A]:[{[B]:"UseDualStack"},true]},
23+
k={[A]:false,"type":"String"},
24+
l={[A]:true,"default":false,"type":"Boolean"},
25+
m={[D]:"Endpoint"},
26+
n={[B]:c,[C]:[{[D]:"UseFIPS"},true]},
27+
o={[B]:c,[C]:[{[D]:"UseDualStack"},true]},
2828
p={},
29-
q={[z]:"getAttr",[A]:[{[B]:g},"name"]},
30-
r={[z]:c,[A]:[{[B]:"UseFIPS"},false]},
31-
s={[z]:c,[A]:[{[B]:"UseDualStack"},false]},
32-
t={[z]:"getAttr",[A]:[{[B]:g},"supportsFIPS"]},
33-
u={[z]:c,[A]:[true,{[z]:"getAttr",[A]:[{[B]:g},"supportsDualStack"]}]},
34-
v=[n],
35-
w=[o],
36-
x=[{[B]:"Region"}];
37-
const _data={version:"1.0",parameters:{Region:k,UseDualStack:l,UseFIPS:l,Endpoint:k},rules:[{conditions:[{[z]:b,[A]:[m]}],rules:[{conditions:v,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:d},{conditions:w,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:d},{endpoint:{url:m,properties:p,headers:p},type:e}],type:f},{conditions:[{[z]:b,[A]:x}],rules:[{conditions:[{[z]:"aws.partition",[A]:x,assign:g}],rules:[{conditions:[{[z]:h,[A]:[q,"aws"]},r,s],endpoint:{url:"https://support.us-east-1.amazonaws.com",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-east-1"}]},headers:p},type:e},{conditions:[{[z]:h,[A]:[q,"aws-cn"]},r,s],endpoint:{url:"https://support.cn-north-1.amazonaws.com.cn",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"cn-north-1"}]},headers:p},type:e},{conditions:[{[z]:h,[A]:[q,"aws-us-gov"]},r,s],endpoint:{url:"https://support.us-gov-west-1.amazonaws.com",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-gov-west-1"}]},headers:p},type:e},{conditions:[{[z]:h,[A]:[q,"aws-iso"]},r,s],endpoint:{url:"https://support.us-iso-east-1.c2s.ic.gov",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-iso-east-1"}]},headers:p},type:e},{conditions:[{[z]:h,[A]:[q,"aws-iso-b"]},r,s],endpoint:{url:"https://support.us-isob-east-1.sc2s.sgov.gov",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-isob-east-1"}]},headers:p},type:e},{conditions:[n,o],rules:[{conditions:[{[z]:c,[A]:[a,t]},u],rules:[{endpoint:{url:"https://support-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:p,headers:p},type:e}],type:f},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:d}],type:f},{conditions:v,rules:[{conditions:[{[z]:c,[A]:[t,a]}],rules:[{endpoint:{url:"https://support-fips.{Region}.{PartitionResult#dnsSuffix}",properties:p,headers:p},type:e}],type:f},{error:"FIPS is enabled but this partition does not support FIPS",type:d}],type:f},{conditions:w,rules:[{conditions:[u],rules:[{endpoint:{url:"https://support.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:p,headers:p},type:e}],type:f},{error:"DualStack is enabled but this partition does not support DualStack",type:d}],type:f},{endpoint:{url:"https://support.{Region}.{PartitionResult#dnsSuffix}",properties:p,headers:p},type:e}],type:f}],type:f},{error:"Invalid Configuration: Missing Region",type:d}]};
29+
q={[B]:"getAttr",[C]:[{[D]:g},"name"]},
30+
r={[B]:c,[C]:[{[D]:"UseFIPS"},false]},
31+
s={[B]:c,[C]:[{[D]:"UseDualStack"},false]},
32+
t={[B]:h,[C]:[q,"aws-us-gov"]},
33+
u={"url":"https://support.us-gov-west-1.amazonaws.com","properties":{"authSchemes":[{"name":i,"signingName":j,"signingRegion":"us-gov-west-1"}]},"headers":{}},
34+
v={[B]:"getAttr",[C]:[{[D]:g},"supportsFIPS"]},
35+
w={[B]:c,[C]:[true,{[B]:"getAttr",[C]:[{[D]:g},"supportsDualStack"]}]},
36+
x=[n],
37+
y=[o],
38+
z=[{[D]:"Region"}];
39+
const _data={version:"1.0",parameters:{Region:k,UseDualStack:l,UseFIPS:l,Endpoint:k},rules:[{conditions:[{[B]:b,[C]:[m]}],rules:[{conditions:x,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:d},{conditions:y,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:d},{endpoint:{url:m,properties:p,headers:p},type:e}],type:f},{conditions:[{[B]:b,[C]:z}],rules:[{conditions:[{[B]:"aws.partition",[C]:z,assign:g}],rules:[{conditions:[{[B]:h,[C]:[q,"aws"]},r,s],endpoint:{url:"https://support.us-east-1.amazonaws.com",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-east-1"}]},headers:p},type:e},{conditions:[{[B]:h,[C]:[q,"aws-cn"]},r,s],endpoint:{url:"https://support.cn-north-1.amazonaws.com.cn",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"cn-north-1"}]},headers:p},type:e},{conditions:[t,r,s],endpoint:u,type:e},{conditions:[t,n,s],endpoint:u,type:e},{conditions:[{[B]:h,[C]:[q,"aws-iso"]},r,s],endpoint:{url:"https://support.us-iso-east-1.c2s.ic.gov",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-iso-east-1"}]},headers:p},type:e},{conditions:[{[B]:h,[C]:[q,"aws-iso-b"]},r,s],endpoint:{url:"https://support.us-isob-east-1.sc2s.sgov.gov",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"us-isob-east-1"}]},headers:p},type:e},{conditions:[n,o],rules:[{conditions:[{[B]:c,[C]:[a,v]},w],rules:[{endpoint:{url:"https://support-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:p,headers:p},type:e}],type:f},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:d}],type:f},{conditions:x,rules:[{conditions:[{[B]:c,[C]:[v,a]}],rules:[{endpoint:{url:"https://support-fips.{Region}.{PartitionResult#dnsSuffix}",properties:p,headers:p},type:e}],type:f},{error:"FIPS is enabled but this partition does not support FIPS",type:d}],type:f},{conditions:y,rules:[{conditions:[w],rules:[{endpoint:{url:"https://support.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:p,headers:p},type:e}],type:f},{error:"DualStack is enabled but this partition does not support DualStack",type:d}],type:f},{endpoint:{url:"https://support.{Region}.{PartitionResult#dnsSuffix}",properties:p,headers:p},type:e}],type:f}],type:f},{error:"Invalid Configuration: Missing Region",type:d}]};
3840
export const ruleSet: RuleSetObject = _data;

Diff for: ‎codegen/sdk-codegen/aws-models/support.json

+89-4
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,57 @@
364364
},
365365
"type": "endpoint"
366366
},
367+
{
368+
"conditions": [
369+
{
370+
"fn": "stringEquals",
371+
"argv": [
372+
{
373+
"fn": "getAttr",
374+
"argv": [
375+
{
376+
"ref": "PartitionResult"
377+
},
378+
"name"
379+
]
380+
},
381+
"aws-us-gov"
382+
]
383+
},
384+
{
385+
"fn": "booleanEquals",
386+
"argv": [
387+
{
388+
"ref": "UseFIPS"
389+
},
390+
true
391+
]
392+
},
393+
{
394+
"fn": "booleanEquals",
395+
"argv": [
396+
{
397+
"ref": "UseDualStack"
398+
},
399+
false
400+
]
401+
}
402+
],
403+
"endpoint": {
404+
"url": "https://support.us-gov-west-1.amazonaws.com",
405+
"properties": {
406+
"authSchemes": [
407+
{
408+
"name": "sigv4",
409+
"signingName": "support",
410+
"signingRegion": "us-gov-west-1"
411+
}
412+
]
413+
},
414+
"headers": {}
415+
},
416+
"type": "endpoint"
417+
},
367418
{
368419
"conditions": [
369420
{
@@ -858,6 +909,28 @@
858909
"UseDualStack": false
859910
}
860911
},
912+
{
913+
"documentation": "For region aws-us-gov-global with FIPS enabled and DualStack disabled",
914+
"expect": {
915+
"endpoint": {
916+
"properties": {
917+
"authSchemes": [
918+
{
919+
"name": "sigv4",
920+
"signingName": "support",
921+
"signingRegion": "us-gov-west-1"
922+
}
923+
]
924+
},
925+
"url": "https://support.us-gov-west-1.amazonaws.com"
926+
}
927+
},
928+
"params": {
929+
"Region": "aws-us-gov-global",
930+
"UseFIPS": true,
931+
"UseDualStack": false
932+
}
933+
},
861934
{
862935
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
863936
"expect": {
@@ -875,7 +948,16 @@
875948
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
876949
"expect": {
877950
"endpoint": {
878-
"url": "https://support-fips.us-gov-east-1.amazonaws.com"
951+
"properties": {
952+
"authSchemes": [
953+
{
954+
"name": "sigv4",
955+
"signingName": "support",
956+
"signingRegion": "us-gov-west-1"
957+
}
958+
]
959+
},
960+
"url": "https://support.us-gov-west-1.amazonaws.com"
879961
}
880962
},
881963
"params": {
@@ -1745,7 +1827,7 @@
17451827
}
17461828
},
17471829
"serviceCode": {
1748-
"target": "com.amazonaws.support#ServiceCode",
1830+
"target": "com.amazonaws.support#ServiceCode2",
17491831
"traits": {
17501832
"smithy.api#documentation": "<p>The code for the Amazon Web Services service. You can use the <a>DescribeServices</a>\n operation to get the possible <code>serviceCode</code> values.</p>"
17511833
}
@@ -2137,7 +2219,7 @@
21372219
}
21382220
},
21392221
"serviceCode": {
2140-
"target": "com.amazonaws.support#ServiceCode",
2222+
"target": "com.amazonaws.support#ServiceCode2",
21412223
"traits": {
21422224
"smithy.api#documentation": "<p>The code for the Amazon Web Services service. You can use the <a>DescribeServices</a>\n operation to get the possible <code>serviceCode</code> values.</p>",
21432225
"smithy.api#required": {}
@@ -2782,6 +2864,9 @@
27822864
}
27832865
},
27842866
"com.amazonaws.support#ServiceCode": {
2867+
"type": "string"
2868+
},
2869+
"com.amazonaws.support#ServiceCode2": {
27852870
"type": "string",
27862871
"traits": {
27872872
"smithy.api#pattern": "^[0-9a-z\\-_]+$"
@@ -2790,7 +2875,7 @@
27902875
"com.amazonaws.support#ServiceCodeList": {
27912876
"type": "list",
27922877
"member": {
2793-
"target": "com.amazonaws.support#ServiceCode"
2878+
"target": "com.amazonaws.support#ServiceCode2"
27942879
},
27952880
"traits": {
27962881
"smithy.api#length": {

0 commit comments

Comments
 (0)