Skip to content

Commit 104dcc7

Browse files
author
awstools
committedDec 17, 2024
feat(client-account): Update endpoint configuration.
1 parent e03d20d commit 104dcc7

File tree

3 files changed

+491
-360
lines changed

3 files changed

+491
-360
lines changed
 

‎clients/client-account/src/endpoint/EndpointParameters.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2, Provi
55
* @public
66
*/
77
export interface ClientInputEndpointParameters {
8-
region?: string | Provider<string>;
98
useDualstackEndpoint?: boolean | Provider<boolean>;
109
useFipsEndpoint?: boolean | Provider<boolean>;
1110
endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
11+
region?: string | Provider<string>;
1212
}
1313

1414
export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
@@ -34,8 +34,8 @@ export const commonParams = {
3434
} as const;
3535

3636
export interface EndpointParameters extends __EndpointParameters {
37-
Region?: string;
3837
UseDualStack?: boolean;
3938
UseFIPS?: boolean;
4039
Endpoint?: string;
40+
Region?: string;
4141
}

‎clients/client-account/src/endpoint/ruleset.ts

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

9-
const y="required",
10-
z="fn",
11-
A="argv",
12-
B="ref";
9+
const u="required",
10+
v="fn",
11+
w="argv",
12+
x="ref";
1313
const a=true,
14-
b="isSet",
15-
c="booleanEquals",
16-
d="error",
17-
e="endpoint",
18-
f="tree",
19-
g="PartitionResult",
20-
h="stringEquals",
21-
i="sigv4",
22-
j="account",
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]},
14+
b=false,
15+
c="isSet",
16+
d="booleanEquals",
17+
e="error",
18+
f="endpoint",
19+
g="tree",
20+
h="PartitionResult",
21+
i={[u]:true,"default":false,"type":"Boolean"},
22+
j={[u]:false,"type":"String"},
23+
k={[x]:"Endpoint"},
24+
l={[v]:d,[w]:[{[x]:"UseFIPS"},true]},
25+
m={[x]:"UseFIPS"},
26+
n={[v]:d,[w]:[{[x]:"UseDualStack"},true]},
27+
o={[x]:"UseDualStack"},
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://account.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://account.cn-northwest-1.amazonaws.com.cn",properties:{authSchemes:[{name:i,signingName:j,signingRegion:"cn-northwest-1"}]},headers:p},type:e},{conditions:[n,o],rules:[{conditions:[{[z]:c,[A]:[a,t]},u],rules:[{endpoint:{url:"https://account-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://account-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://account.{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://account.{Region}.{PartitionResult#dnsSuffix}",properties:p,headers:p},type:e}],type:f}],type:f},{error:"Invalid Configuration: Missing Region",type:d}]};
29+
q={[v]:"getAttr",[w]:[{[x]:h},"supportsFIPS"]},
30+
r={[v]:d,[w]:[true,{[v]:"getAttr",[w]:[{[x]:h},"supportsDualStack"]}]},
31+
s={"authSchemes":[{"name":"sigv4","signingRegion":"{PartitionResult#implicitGlobalRegion}"}]},
32+
t=[{[x]:"Region"}];
33+
const _data={version:"1.0",parameters:{UseDualStack:i,UseFIPS:i,Endpoint:j,Region:j},rules:[{conditions:[{[v]:c,[w]:[k]}],rules:[{conditions:[l],error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:e},{rules:[{conditions:[n],error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:e},{endpoint:{url:k,properties:p,headers:p},type:f}],type:g}],type:g},{rules:[{conditions:[{[v]:c,[w]:t}],rules:[{conditions:[{[v]:"aws.partition",[w]:t,assign:h}],rules:[{conditions:[l,n],rules:[{conditions:[{[v]:d,[w]:[a,q]},r],rules:[{endpoint:{url:"https://account-fips.{PartitionResult#implicitGlobalRegion}.{PartitionResult#dualStackDnsSuffix}",properties:s,headers:p},type:f}],type:g},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:e}],type:g},{conditions:[l,{[v]:d,[w]:[o,b]}],rules:[{conditions:[{[v]:d,[w]:[q,a]}],rules:[{endpoint:{url:"https://account-fips.{PartitionResult#implicitGlobalRegion}.{PartitionResult#dnsSuffix}",properties:s,headers:p},type:f}],type:g},{error:"FIPS is enabled but this partition does not support FIPS",type:e}],type:g},{conditions:[{[v]:d,[w]:[m,b]},n],rules:[{conditions:[r],rules:[{endpoint:{url:"https://account.{PartitionResult#implicitGlobalRegion}.{PartitionResult#dualStackDnsSuffix}",properties:s,headers:p},type:f}],type:g},{error:"DualStack is enabled but this partition does not support DualStack",type:e}],type:g},{endpoint:{url:"https://account.{PartitionResult#implicitGlobalRegion}.{PartitionResult#dnsSuffix}",properties:s,headers:p},type:f}],type:g}],type:g},{error:"Invalid Configuration: Missing Region",type:e}],type:g}]};
3834
export const ruleSet: RuleSetObject = _data;

0 commit comments

Comments
 (0)