Skip to content

Commit 645d19a

Browse files
author
awstools
committed
feat(client-elasticsearch-service): This release adds support for new or existing Amazon OpenSearch domains to enable TLS 1.3 or TLS 1.2 with perfect forward secrecy cipher suites for domain endpoints.
1 parent 618a36c commit 645d19a

File tree

9 files changed

+116
-30
lines changed

9 files changed

+116
-30
lines changed

‎clients/client-elasticsearch-service/src/commands/CreateElasticsearchDomainCommand.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export interface CreateElasticsearchDomainCommandOutput extends CreateElasticsea
107107
* },
108108
* DomainEndpointOptions: { // DomainEndpointOptions
109109
* EnforceHTTPS: true || false,
110-
* TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
110+
* TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
111111
* CustomEndpointEnabled: true || false,
112112
* CustomEndpoint: "STRING_VALUE",
113113
* CustomEndpointCertificateArn: "STRING_VALUE",
@@ -244,7 +244,7 @@ export interface CreateElasticsearchDomainCommandOutput extends CreateElasticsea
244244
* // },
245245
* // DomainEndpointOptions: { // DomainEndpointOptions
246246
* // EnforceHTTPS: true || false,
247-
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
247+
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
248248
* // CustomEndpointEnabled: true || false,
249249
* // CustomEndpoint: "STRING_VALUE",
250250
* // CustomEndpointCertificateArn: "STRING_VALUE",

‎clients/client-elasticsearch-service/src/commands/DeleteElasticsearchDomainCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export interface DeleteElasticsearchDomainCommandOutput extends DeleteElasticsea
132132
* // },
133133
* // DomainEndpointOptions: { // DomainEndpointOptions
134134
* // EnforceHTTPS: true || false,
135-
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
135+
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
136136
* // CustomEndpointEnabled: true || false,
137137
* // CustomEndpoint: "STRING_VALUE",
138138
* // CustomEndpointCertificateArn: "STRING_VALUE",

‎clients/client-elasticsearch-service/src/commands/DescribeElasticsearchDomainCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export interface DescribeElasticsearchDomainCommandOutput
137137
* // },
138138
* // DomainEndpointOptions: { // DomainEndpointOptions
139139
* // EnforceHTTPS: true || false,
140-
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
140+
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
141141
* // CustomEndpointEnabled: true || false,
142142
* // CustomEndpoint: "STRING_VALUE",
143143
* // CustomEndpointCertificateArn: "STRING_VALUE",

‎clients/client-elasticsearch-service/src/commands/DescribeElasticsearchDomainConfigCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export interface DescribeElasticsearchDomainConfigCommandOutput
183183
* // DomainEndpointOptions: { // DomainEndpointOptionsStatus
184184
* // Options: { // DomainEndpointOptions
185185
* // EnforceHTTPS: true || false,
186-
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
186+
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
187187
* // CustomEndpointEnabled: true || false,
188188
* // CustomEndpoint: "STRING_VALUE",
189189
* // CustomEndpointCertificateArn: "STRING_VALUE",

‎clients/client-elasticsearch-service/src/commands/DescribeElasticsearchDomainsCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export interface DescribeElasticsearchDomainsCommandOutput
140140
* // },
141141
* // DomainEndpointOptions: { // DomainEndpointOptions
142142
* // EnforceHTTPS: true || false,
143-
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
143+
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
144144
* // CustomEndpointEnabled: true || false,
145145
* // CustomEndpoint: "STRING_VALUE",
146146
* // CustomEndpointCertificateArn: "STRING_VALUE",

‎clients/client-elasticsearch-service/src/commands/UpdateElasticsearchDomainConfigCommand.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export interface UpdateElasticsearchDomainConfigCommandOutput
103103
* },
104104
* DomainEndpointOptions: { // DomainEndpointOptions
105105
* EnforceHTTPS: true || false,
106-
* TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
106+
* TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
107107
* CustomEndpointEnabled: true || false,
108108
* CustomEndpoint: "STRING_VALUE",
109109
* CustomEndpointCertificateArn: "STRING_VALUE",
@@ -286,7 +286,7 @@ export interface UpdateElasticsearchDomainConfigCommandOutput
286286
* // DomainEndpointOptions: { // DomainEndpointOptionsStatus
287287
* // Options: { // DomainEndpointOptions
288288
* // EnforceHTTPS: true || false,
289-
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07",
289+
* // TLSSecurityPolicy: "Policy-Min-TLS-1-0-2019-07" || "Policy-Min-TLS-1-2-2019-07" || "Policy-Min-TLS-1-2-PFS-2023-10",
290290
* // CustomEndpointEnabled: true || false,
291291
* // CustomEndpoint: "STRING_VALUE",
292292
* // CustomEndpointCertificateArn: "STRING_VALUE",

‎clients/client-elasticsearch-service/src/endpoint/ruleset.ts‎

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

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

‎clients/client-elasticsearch-service/src/models/models_0.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,7 @@ export interface CognitoOptions {
10981098
export const TLSSecurityPolicy = {
10991099
POLICY_MIN_TLS_1_0_2019_07: "Policy-Min-TLS-1-0-2019-07",
11001100
POLICY_MIN_TLS_1_2_2019_07: "Policy-Min-TLS-1-2-2019-07",
1101+
POLICY_MIN_TLS_1_2_PFS_2023_10: "Policy-Min-TLS-1-2-PFS-2023-10",
11011102
} as const;
11021103

11031104
/**
@@ -1121,8 +1122,9 @@ export interface DomainEndpointOptions {
11211122
* <p>Specify the TLS security policy that needs to be applied to the HTTPS endpoint of Elasticsearch domain.
11221123
* <br></br> It can be one of the following values:
11231124
* <ul>
1124-
* <li><b>Policy-Min-TLS-1-0-2019-07: </b> TLS security policy which supports TLSv1.0 and higher.</li>
1125-
* <li><b>Policy-Min-TLS-1-2-2019-07: </b> TLS security policy which supports only TLSv1.2</li>
1125+
* <li><b>Policy-Min-TLS-1-0-2019-07: </b> TLS security policy that supports TLS version 1.0 to TLS version 1.2</li>
1126+
* <li><b>Policy-Min-TLS-1-2-2019-07: </b> TLS security policy that supports only TLS version 1.2</li>
1127+
* <li><b>Policy-Min-TLS-1-2-PFS-2023-10: </b> TLS security policy that supports TLS version 1.2 to TLS version 1.3 with perfect forward secrecy cipher suites</li>
11261128
* </ul>
11271129
* </p>
11281130
*/

‎codegen/sdk-codegen/aws-models/elasticsearch-service.json‎

Lines changed: 85 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,81 @@
796796
}
797797
],
798798
"rules": [
799+
{
800+
"conditions": [
801+
{
802+
"fn": "stringEquals",
803+
"argv": [
804+
"aws",
805+
{
806+
"fn": "getAttr",
807+
"argv": [
808+
{
809+
"ref": "PartitionResult"
810+
},
811+
"name"
812+
]
813+
}
814+
]
815+
}
816+
],
817+
"endpoint": {
818+
"url": "https://aos.{Region}.api.aws",
819+
"properties": {},
820+
"headers": {}
821+
},
822+
"type": "endpoint"
823+
},
824+
{
825+
"conditions": [
826+
{
827+
"fn": "stringEquals",
828+
"argv": [
829+
"aws-cn",
830+
{
831+
"fn": "getAttr",
832+
"argv": [
833+
{
834+
"ref": "PartitionResult"
835+
},
836+
"name"
837+
]
838+
}
839+
]
840+
}
841+
],
842+
"endpoint": {
843+
"url": "https://aos.{Region}.api.amazonwebservices.com.cn",
844+
"properties": {},
845+
"headers": {}
846+
},
847+
"type": "endpoint"
848+
},
849+
{
850+
"conditions": [
851+
{
852+
"fn": "stringEquals",
853+
"argv": [
854+
"aws-us-gov",
855+
{
856+
"fn": "getAttr",
857+
"argv": [
858+
{
859+
"ref": "PartitionResult"
860+
},
861+
"name"
862+
]
863+
}
864+
]
865+
}
866+
],
867+
"endpoint": {
868+
"url": "https://aos.{Region}.api.aws",
869+
"properties": {},
870+
"headers": {}
871+
},
872+
"type": "endpoint"
873+
},
799874
{
800875
"conditions": [],
801876
"endpoint": {
@@ -1195,7 +1270,7 @@
11951270
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
11961271
"expect": {
11971272
"endpoint": {
1198-
"url": "https://es.us-east-1.api.aws"
1273+
"url": "https://aos.us-east-1.api.aws"
11991274
}
12001275
},
12011276
"params": {
@@ -1260,7 +1335,7 @@
12601335
"documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
12611336
"expect": {
12621337
"endpoint": {
1263-
"url": "https://es.cn-north-1.api.amazonwebservices.com.cn"
1338+
"url": "https://aos.cn-north-1.api.amazonwebservices.com.cn"
12641339
}
12651340
},
12661341
"params": {
@@ -1338,7 +1413,7 @@
13381413
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
13391414
"expect": {
13401415
"endpoint": {
1341-
"url": "https://es.us-gov-east-1.api.aws"
1416+
"url": "https://aos.us-gov-east-1.api.aws"
13421417
}
13431418
},
13441419
"params": {
@@ -4301,7 +4376,7 @@
43014376
"TLSSecurityPolicy": {
43024377
"target": "com.amazonaws.elasticsearchservice#TLSSecurityPolicy",
43034378
"traits": {
4304-
"smithy.api#documentation": "<p>Specify the TLS security policy that needs to be applied to the HTTPS endpoint of Elasticsearch domain.\n <br></br> It can be one of the following values:\n <ul>\n <li><b>Policy-Min-TLS-1-0-2019-07: </b> TLS security policy which supports TLSv1.0 and higher.</li>\n <li><b>Policy-Min-TLS-1-2-2019-07: </b> TLS security policy which supports only TLSv1.2</li>\n </ul>\n </p>"
4379+
"smithy.api#documentation": "<p>Specify the TLS security policy that needs to be applied to the HTTPS endpoint of Elasticsearch domain.\n <br></br> It can be one of the following values:\n <ul>\n <li><b>Policy-Min-TLS-1-0-2019-07: </b> TLS security policy that supports TLS version 1.0 to TLS version 1.2</li>\n <li><b>Policy-Min-TLS-1-2-2019-07: </b> TLS security policy that supports only TLS version 1.2</li>\n <li><b>Policy-Min-TLS-1-2-PFS-2023-10: </b> TLS security policy that supports TLS version 1.2 to TLS version 1.3 with perfect forward secrecy cipher suites</li>\n </ul>\n </p>"
43054380
}
43064381
},
43074382
"CustomEndpointEnabled": {
@@ -8531,6 +8606,12 @@
85318606
"traits": {
85328607
"smithy.api#enumValue": "Policy-Min-TLS-1-2-2019-07"
85338608
}
8609+
},
8610+
"POLICY_MIN_TLS_1_2_PFS_2023_10": {
8611+
"target": "smithy.api#Unit",
8612+
"traits": {
8613+
"smithy.api#enumValue": "Policy-Min-TLS-1-2-PFS-2023-10"
8614+
}
85348615
}
85358616
}
85368617
},

0 commit comments

Comments
 (0)