Skip to content

Commit f67f982

Browse files
author
awstools
committed
feat(client-cloudfront): Add dualstack endpoint support
1 parent a78bcaf commit f67f982

File tree

8 files changed

+767
-406
lines changed

8 files changed

+767
-406
lines changed

clients/client-cloudfront/src/endpoint/EndpointParameters.ts

Lines changed: 2 additions & 2 deletions
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 | undefined | Provider<string | undefined>;
98
useDualstackEndpoint?: boolean | undefined | Provider<boolean | undefined>;
109
useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
1110
endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
11+
region?: string | undefined | Provider<string | undefined>;
1212
}
1313

1414
export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
@@ -33,8 +33,8 @@ export const commonParams = {
3333
} as const;
3434

3535
export interface EndpointParameters extends __EndpointParameters {
36-
Region?: string | undefined;
3736
UseDualStack?: boolean | undefined;
3837
UseFIPS?: boolean | undefined;
3938
Endpoint?: string | undefined;
39+
Region?: string | undefined;
4040
}

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

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

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

clients/client-cloudfront/src/models/models_0.ts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6876,12 +6876,47 @@ export const OriginsFilterSensitiveLog = (obj: Origins): any => ({
68766876
...obj,
68776877
});
68786878

6879+
/**
6880+
* @internal
6881+
*/
6882+
export const StringSchemaConfigFilterSensitiveLog = (obj: StringSchemaConfig): any => ({
6883+
...obj,
6884+
...(obj.Comment && { Comment: SENSITIVE_STRING }),
6885+
});
6886+
6887+
/**
6888+
* @internal
6889+
*/
6890+
export const ParameterDefinitionSchemaFilterSensitiveLog = (obj: ParameterDefinitionSchema): any => ({
6891+
...obj,
6892+
...(obj.StringSchema && { StringSchema: StringSchemaConfigFilterSensitiveLog(obj.StringSchema) }),
6893+
});
6894+
6895+
/**
6896+
* @internal
6897+
*/
6898+
export const ParameterDefinitionFilterSensitiveLog = (obj: ParameterDefinition): any => ({
6899+
...obj,
6900+
...(obj.Definition && { Definition: ParameterDefinitionSchemaFilterSensitiveLog(obj.Definition) }),
6901+
});
6902+
6903+
/**
6904+
* @internal
6905+
*/
6906+
export const TenantConfigFilterSensitiveLog = (obj: TenantConfig): any => ({
6907+
...obj,
6908+
...(obj.ParameterDefinitions && {
6909+
ParameterDefinitions: obj.ParameterDefinitions.map((item) => ParameterDefinitionFilterSensitiveLog(item)),
6910+
}),
6911+
});
6912+
68796913
/**
68806914
* @internal
68816915
*/
68826916
export const DistributionConfigFilterSensitiveLog = (obj: DistributionConfig): any => ({
68836917
...obj,
68846918
...(obj.Comment && { Comment: SENSITIVE_STRING }),
6919+
...(obj.TenantConfig && { TenantConfig: TenantConfigFilterSensitiveLog(obj.TenantConfig) }),
68856920
});
68866921

68876922
/**

clients/client-cloudfront/src/models/models_1.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6200,20 +6200,23 @@ export const GetFunctionResultFilterSensitiveLog = (obj: GetFunctionResult): any
62006200
*/
62016201
export const DistributionSummaryFilterSensitiveLog = (obj: DistributionSummary): any => ({
62026202
...obj,
6203+
...(obj.Comment && { Comment: SENSITIVE_STRING }),
62036204
});
62046205

62056206
/**
62066207
* @internal
62076208
*/
62086209
export const DistributionListFilterSensitiveLog = (obj: DistributionList): any => ({
62096210
...obj,
6211+
...(obj.Items && { Items: obj.Items.map((item) => DistributionSummaryFilterSensitiveLog(item)) }),
62106212
});
62116213

62126214
/**
62136215
* @internal
62146216
*/
62156217
export const ListDistributionsResultFilterSensitiveLog = (obj: ListDistributionsResult): any => ({
62166218
...obj,
6219+
...(obj.DistributionList && { DistributionList: DistributionListFilterSensitiveLog(obj.DistributionList) }),
62176220
});
62186221

62196222
/**
@@ -6223,6 +6226,7 @@ export const ListDistributionsByAnycastIpListIdResultFilterSensitiveLog = (
62236226
obj: ListDistributionsByAnycastIpListIdResult
62246227
): any => ({
62256228
...obj,
6229+
...(obj.DistributionList && { DistributionList: DistributionListFilterSensitiveLog(obj.DistributionList) }),
62266230
});
62276231

62286232
/**
@@ -6232,6 +6236,7 @@ export const ListDistributionsByConnectionModeResultFilterSensitiveLog = (
62326236
obj: ListDistributionsByConnectionModeResult
62336237
): any => ({
62346238
...obj,
6239+
...(obj.DistributionList && { DistributionList: DistributionListFilterSensitiveLog(obj.DistributionList) }),
62356240
});
62366241

62376242
/**
@@ -6241,11 +6246,13 @@ export const ListDistributionsByRealtimeLogConfigResultFilterSensitiveLog = (
62416246
obj: ListDistributionsByRealtimeLogConfigResult
62426247
): any => ({
62436248
...obj,
6249+
...(obj.DistributionList && { DistributionList: DistributionListFilterSensitiveLog(obj.DistributionList) }),
62446250
});
62456251

62466252
/**
62476253
* @internal
62486254
*/
62496255
export const ListDistributionsByWebACLIdResultFilterSensitiveLog = (obj: ListDistributionsByWebACLIdResult): any => ({
62506256
...obj,
6257+
...(obj.DistributionList && { DistributionList: DistributionListFilterSensitiveLog(obj.DistributionList) }),
62516258
});
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// smithy-typescript generated code
2+
import { createPaginator } from "@smithy/core";
3+
import { Paginator } from "@smithy/types";
4+
5+
import { CloudFrontClient } from "../CloudFrontClient";
6+
import {
7+
ListOriginAccessControlsCommand,
8+
ListOriginAccessControlsCommandInput,
9+
ListOriginAccessControlsCommandOutput,
10+
} from "../commands/ListOriginAccessControlsCommand";
11+
import { CloudFrontPaginationConfiguration } from "./Interfaces";
12+
13+
/**
14+
* @public
15+
*/
16+
export const paginateListOriginAccessControls: (
17+
config: CloudFrontPaginationConfiguration,
18+
input: ListOriginAccessControlsCommandInput,
19+
...rest: any[]
20+
) => Paginator<ListOriginAccessControlsCommandOutput> = createPaginator<
21+
CloudFrontPaginationConfiguration,
22+
ListOriginAccessControlsCommandInput,
23+
ListOriginAccessControlsCommandOutput
24+
>(CloudFrontClient, ListOriginAccessControlsCommand, "Marker", "OriginAccessControlList.NextMarker", "MaxItems");

clients/client-cloudfront/src/pagination/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ export * from "./ListDomainConflictsPaginator";
1010
export * from "./ListInvalidationsForDistributionTenantPaginator";
1111
export * from "./ListInvalidationsPaginator";
1212
export * from "./ListKeyValueStoresPaginator";
13+
export * from "./ListOriginAccessControlsPaginator";
1314
export * from "./ListPublicKeysPaginator";
1415
export * from "./ListStreamingDistributionsPaginator";

clients/client-cloudfront/src/protocols/Aws_restXml.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12372,7 +12372,7 @@ const se_StreamingLoggingConfig = (input: StreamingLoggingConfig, context: __Ser
1237212372
const se_StringSchemaConfig = (input: StringSchemaConfig, context: __SerdeContext): any => {
1237312373
const bn = new __XmlNode(_SSCt);
1237412374
if (input[_Co] != null) {
12375-
bn.c(__XmlNode.of(_s, input[_Co]).n(_Co));
12375+
bn.c(__XmlNode.of(_sST, input[_Co]).n(_Co));
1237612376
}
1237712377
if (input[_DV] != null) {
1237812378
bn.c(__XmlNode.of(_PV, input[_DV]).n(_DV));
@@ -12516,7 +12516,7 @@ const se_ViewerCertificate = (input: ViewerCertificate, context: __SerdeContext)
1251612516
bn.c(__XmlNode.of(_b, String(input[_CFDC])).n(_CFDC));
1251712517
}
1251812518
if (input[_IAMCI] != null) {
12519-
bn.c(__XmlNode.of(_s, input[_IAMCI]).n(_IAMCI));
12519+
bn.c(__XmlNode.of(_SCI, input[_IAMCI]).n(_IAMCI));
1252012520
}
1252112521
if (input[_ACMCA] != null) {
1252212522
bn.c(__XmlNode.of(_s, input[_ACMCA]).n(_ACMCA));
@@ -17568,6 +17568,7 @@ const _SARN = "SourceARN";
1756817568
const _SARNt = "StreamARN";
1756917569
const _SB = "SigningBehavior";
1757017570
const _SC = "SelectionCriteria";
17571+
const _SCI = "ServerCertificateId";
1757117572
const _SCUI = "S3CanonicalUserId";
1757217573
const _SCt = "StatusCodes";
1757317574
const _SCta = "StatusCode";

0 commit comments

Comments
 (0)