Skip to content

Commit fdea90a

Browse files
author
awstools
committed
feat(client-ecr-public): Restoring custom endpoint functionality for ECR Public
1 parent 53504cc commit fdea90a

File tree

4 files changed

+524
-78
lines changed

4 files changed

+524
-78
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// smithy-typescript generated code
2-
import { EndpointParameters as __EndpointParameters, Provider } from "@smithy/types";
2+
import { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2, Provider } from "@smithy/types";
33

44
/**
55
* @public
66
*/
77
export interface ClientInputEndpointParameters {
88
region?: string | Provider<string>;
9-
useFipsEndpoint?: boolean | Provider<boolean>;
109
useDualstackEndpoint?: boolean | Provider<boolean>;
10+
useFipsEndpoint?: boolean | Provider<boolean>;
11+
endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
1112
}
1213

1314
export type ClientResolvedEndpointParameters = ClientInputEndpointParameters & {
@@ -19,20 +20,22 @@ export const resolveClientEndpointParameters = <T>(
1920
): T & ClientResolvedEndpointParameters => {
2021
return {
2122
...options,
22-
useFipsEndpoint: options.useFipsEndpoint ?? false,
2323
useDualstackEndpoint: options.useDualstackEndpoint ?? false,
24+
useFipsEndpoint: options.useFipsEndpoint ?? false,
2425
defaultSigningName: "ecr-public",
2526
};
2627
};
2728

2829
export const commonParams = {
2930
UseFIPS: { type: "builtInParams", name: "useFipsEndpoint" },
31+
Endpoint: { type: "builtInParams", name: "endpoint" },
3032
Region: { type: "builtInParams", name: "region" },
3133
UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
3234
} as const;
3335

3436
export interface EndpointParameters extends __EndpointParameters {
3537
Region?: string;
36-
UseFIPS?: boolean;
3738
UseDualStack?: boolean;
39+
UseFIPS?: boolean;
40+
Endpoint?: string;
3841
}

clients/client-ecr-public/src/endpoint/endpointResolver.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ruleSet } from "./ruleset";
88

99
const cache = new EndpointCache({
1010
size: 50,
11-
params: ["Region", "UseDualStack", "UseFIPS"],
11+
params: ["Endpoint", "Region", "UseDualStack", "UseFIPS"],
1212
});
1313

1414
export const defaultEndpointResolver = (

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

+23-10
Original file line numberDiff line numberDiff line change
@@ -6,14 +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 a=false,
10-
b=true,
11-
c="PartitionResult",
12-
d="booleanEquals",
13-
e="error",
14-
f="endpoint",
15-
g="tree",
16-
h={"required":true,"default":false,"type":"Boolean"},
17-
i=[{"ref":"Region"}];
18-
const _data={version:"1.0",parameters:{Region:{required:a,type:"String"},UseFIPS:h,UseDualStack:h},rules:[{conditions:[{fn:"isSet",argv:i},{fn:"aws.partition",argv:i,assign:c}],rules:[{conditions:[{fn:d,argv:[{ref:"UseFIPS"},b]}],error:"ECR Public does not support FIPS",type:e},{conditions:[{fn:d,argv:[{ref:"UseDualStack"},b]}],rules:[{conditions:[{fn:d,argv:[b,{fn:"getAttr",argv:[{ref:c},"supportsDualStack"]}]}],rules:[{endpoint:{url:"https://ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:{},headers:{}},type:f}],type:g},{error:"Dualstack is enabled but this partition does not support dualstack",type:e}],type:g},{endpoint:{url:"https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",properties:{},headers:{}},type:f}],type:g}]};
9+
const s="required",
10+
t="fn",
11+
u="argv",
12+
v="ref";
13+
const a=true,
14+
b="isSet",
15+
c="booleanEquals",
16+
d="error",
17+
e="endpoint",
18+
f="tree",
19+
g="PartitionResult",
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}]};
1932
export const ruleSet: RuleSetObject = _data;

0 commit comments

Comments
 (0)