Skip to content

Commit fc7208d

Browse files
aws-sdk-python-automationaws-sdk-python-automation
committed
Merge branch 'release-1.35.90' into develop
* release-1.35.90: Bumping version to 1.35.90 Update to latest models
2 parents 5094241 + 5093c63 commit fc7208d

File tree

8 files changed

+1372
-220
lines changed

8 files changed

+1372
-220
lines changed

‎.changes/1.35.90.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[
2+
{
3+
"category": "``ecr``",
4+
"description": "Restoring custom endpoint functionality for ECR",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``ecr-public``",
9+
"description": "Restoring custom endpoint functionality for ECR Public",
10+
"type": "api-change"
11+
}
12+
]

‎CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
CHANGELOG
33
=========
44

5+
1.35.90
6+
=======
7+
8+
* api-change:``ecr``: Restoring custom endpoint functionality for ECR
9+
* api-change:``ecr-public``: Restoring custom endpoint functionality for ECR Public
10+
11+
512
1.35.89
613
=======
714

‎botocore/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
import re
1818

19-
__version__ = '1.35.89'
19+
__version__ = '1.35.90'
2020

2121

2222
class NullHandler(logging.Handler):

‎botocore/data/ecr-public/2020-10-30/endpoint-rule-set-1.json

Lines changed: 225 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,25 @@
77
"documentation": "The AWS region used to dispatch the request.",
88
"type": "String"
99
},
10-
"UseFIPS": {
11-
"builtIn": "AWS::UseFIPS",
10+
"UseDualStack": {
11+
"builtIn": "AWS::UseDualStack",
1212
"required": true,
1313
"default": false,
14-
"documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
14+
"documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.",
1515
"type": "Boolean"
1616
},
17-
"UseDualStack": {
18-
"builtIn": "AWS::UseDualStack",
17+
"UseFIPS": {
18+
"builtIn": "AWS::UseFIPS",
1919
"required": true,
2020
"default": false,
21-
"documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.",
21+
"documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
2222
"type": "Boolean"
23+
},
24+
"Endpoint": {
25+
"builtIn": "SDK::Endpoint",
26+
"required": false,
27+
"documentation": "Override the endpoint used to send this request",
28+
"type": "String"
2329
}
2430
},
2531
"rules": [
@@ -29,18 +35,9 @@
2935
"fn": "isSet",
3036
"argv": [
3137
{
32-
"ref": "Region"
38+
"ref": "Endpoint"
3339
}
3440
]
35-
},
36-
{
37-
"fn": "aws.partition",
38-
"argv": [
39-
{
40-
"ref": "Region"
41-
}
42-
],
43-
"assign": "PartitionResult"
4441
}
4542
],
4643
"rules": [
@@ -56,7 +53,7 @@
5653
]
5754
}
5855
],
59-
"error": "ECR Public does not support FIPS",
56+
"error": "Invalid Configuration: FIPS and custom endpoint are not supported",
6057
"type": "error"
6158
},
6259
{
@@ -71,57 +68,247 @@
7168
]
7269
}
7370
],
71+
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
72+
"type": "error"
73+
},
74+
{
75+
"conditions": [],
76+
"endpoint": {
77+
"url": {
78+
"ref": "Endpoint"
79+
},
80+
"properties": {},
81+
"headers": {}
82+
},
83+
"type": "endpoint"
84+
}
85+
],
86+
"type": "tree"
87+
},
88+
{
89+
"conditions": [
90+
{
91+
"fn": "isSet",
92+
"argv": [
93+
{
94+
"ref": "Region"
95+
}
96+
]
97+
}
98+
],
99+
"rules": [
100+
{
101+
"conditions": [
102+
{
103+
"fn": "aws.partition",
104+
"argv": [
105+
{
106+
"ref": "Region"
107+
}
108+
],
109+
"assign": "PartitionResult"
110+
}
111+
],
74112
"rules": [
75113
{
76114
"conditions": [
77115
{
78116
"fn": "booleanEquals",
79117
"argv": [
80-
true,
81118
{
82-
"fn": "getAttr",
119+
"ref": "UseFIPS"
120+
},
121+
true
122+
]
123+
},
124+
{
125+
"fn": "booleanEquals",
126+
"argv": [
127+
{
128+
"ref": "UseDualStack"
129+
},
130+
true
131+
]
132+
}
133+
],
134+
"rules": [
135+
{
136+
"conditions": [
137+
{
138+
"fn": "booleanEquals",
83139
"argv": [
140+
true,
84141
{
85-
"ref": "PartitionResult"
142+
"fn": "getAttr",
143+
"argv": [
144+
{
145+
"ref": "PartitionResult"
146+
},
147+
"supportsFIPS"
148+
]
149+
}
150+
]
151+
},
152+
{
153+
"fn": "booleanEquals",
154+
"argv": [
155+
true,
156+
{
157+
"fn": "getAttr",
158+
"argv": [
159+
{
160+
"ref": "PartitionResult"
161+
},
162+
"supportsDualStack"
163+
]
164+
}
165+
]
166+
}
167+
],
168+
"rules": [
169+
{
170+
"conditions": [],
171+
"endpoint": {
172+
"url": "https://api.ecr-public-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
173+
"properties": {},
174+
"headers": {}
175+
},
176+
"type": "endpoint"
177+
}
178+
],
179+
"type": "tree"
180+
},
181+
{
182+
"conditions": [],
183+
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
184+
"type": "error"
185+
}
186+
],
187+
"type": "tree"
188+
},
189+
{
190+
"conditions": [
191+
{
192+
"fn": "booleanEquals",
193+
"argv": [
194+
{
195+
"ref": "UseFIPS"
196+
},
197+
true
198+
]
199+
}
200+
],
201+
"rules": [
202+
{
203+
"conditions": [
204+
{
205+
"fn": "booleanEquals",
206+
"argv": [
207+
{
208+
"fn": "getAttr",
209+
"argv": [
210+
{
211+
"ref": "PartitionResult"
212+
},
213+
"supportsFIPS"
214+
]
86215
},
87-
"supportsDualStack"
216+
true
88217
]
89218
}
219+
],
220+
"rules": [
221+
{
222+
"conditions": [],
223+
"endpoint": {
224+
"url": "https://api.ecr-public-fips.{Region}.{PartitionResult#dnsSuffix}",
225+
"properties": {},
226+
"headers": {}
227+
},
228+
"type": "endpoint"
229+
}
230+
],
231+
"type": "tree"
232+
},
233+
{
234+
"conditions": [],
235+
"error": "FIPS is enabled but this partition does not support FIPS",
236+
"type": "error"
237+
}
238+
],
239+
"type": "tree"
240+
},
241+
{
242+
"conditions": [
243+
{
244+
"fn": "booleanEquals",
245+
"argv": [
246+
{
247+
"ref": "UseDualStack"
248+
},
249+
true
90250
]
91251
}
92252
],
93253
"rules": [
254+
{
255+
"conditions": [
256+
{
257+
"fn": "booleanEquals",
258+
"argv": [
259+
true,
260+
{
261+
"fn": "getAttr",
262+
"argv": [
263+
{
264+
"ref": "PartitionResult"
265+
},
266+
"supportsDualStack"
267+
]
268+
}
269+
]
270+
}
271+
],
272+
"rules": [
273+
{
274+
"conditions": [],
275+
"endpoint": {
276+
"url": "https://api.ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",
277+
"properties": {},
278+
"headers": {}
279+
},
280+
"type": "endpoint"
281+
}
282+
],
283+
"type": "tree"
284+
},
94285
{
95286
"conditions": [],
96-
"endpoint": {
97-
"url": "https://ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",
98-
"properties": {},
99-
"headers": {}
100-
},
101-
"type": "endpoint"
287+
"error": "DualStack is enabled but this partition does not support DualStack",
288+
"type": "error"
102289
}
103290
],
104291
"type": "tree"
105292
},
106293
{
107294
"conditions": [],
108-
"error": "Dualstack is enabled but this partition does not support dualstack",
109-
"type": "error"
295+
"endpoint": {
296+
"url": "https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",
297+
"properties": {},
298+
"headers": {}
299+
},
300+
"type": "endpoint"
110301
}
111302
],
112303
"type": "tree"
113-
},
114-
{
115-
"conditions": [],
116-
"endpoint": {
117-
"url": "https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",
118-
"properties": {},
119-
"headers": {}
120-
},
121-
"type": "endpoint"
122304
}
123305
],
124306
"type": "tree"
307+
},
308+
{
309+
"conditions": [],
310+
"error": "Invalid Configuration: Missing Region",
311+
"type": "error"
125312
}
126313
]
127314
}

0 commit comments

Comments
 (0)