Skip to content

Commit aefff9a

Browse files
author
AWS
committed
AWS Resource Explorer Update: Resource Explorer now uses newly supported IPv4 'amazonaws.com' endpoints by default.
1 parent b838024 commit aefff9a

File tree

3 files changed

+321
-53
lines changed

3 files changed

+321
-53
lines changed

‎.changes/next-release/feature-AWSResourceExplorer-11e8a78.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "AWS Resource Explorer",
4+
"contributor": "",
5+
"description": "Resource Explorer now uses newly supported IPv4 'amazonaws.com' endpoints by default."
6+
}

‎services/resourceexplorer2/src/main/resources/codegen-resources/endpoint-rule-set.json

Lines changed: 114 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
"documentation": "The AWS region used to dispatch the request.",
88
"type": "String"
99
},
10+
"UseDualStack": {
11+
"builtIn": "AWS::UseDualStack",
12+
"required": true,
13+
"default": false,
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.",
15+
"type": "Boolean"
16+
},
1017
"UseFIPS": {
1118
"builtIn": "AWS::UseFIPS",
1219
"required": true,
@@ -49,6 +56,21 @@
4956
"error": "Invalid Configuration: FIPS and custom endpoint are not supported",
5057
"type": "error"
5158
},
59+
{
60+
"conditions": [
61+
{
62+
"fn": "booleanEquals",
63+
"argv": [
64+
{
65+
"ref": "UseDualStack"
66+
},
67+
true
68+
]
69+
}
70+
],
71+
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
72+
"type": "error"
73+
},
5274
{
5375
"conditions": [],
5476
"endpoint": {
@@ -93,16 +115,19 @@
93115
{
94116
"fn": "booleanEquals",
95117
"argv": [
96-
true,
97118
{
98-
"fn": "getAttr",
99-
"argv": [
100-
{
101-
"ref": "PartitionResult"
102-
},
103-
"supportsDualStack"
104-
]
105-
}
119+
"ref": "UseFIPS"
120+
},
121+
true
122+
]
123+
},
124+
{
125+
"fn": "booleanEquals",
126+
"argv": [
127+
{
128+
"ref": "UseDualStack"
129+
},
130+
true
106131
]
107132
}
108133
],
@@ -112,61 +137,51 @@
112137
{
113138
"fn": "booleanEquals",
114139
"argv": [
140+
true,
115141
{
116-
"ref": "UseFIPS"
117-
},
118-
true
142+
"fn": "getAttr",
143+
"argv": [
144+
{
145+
"ref": "PartitionResult"
146+
},
147+
"supportsFIPS"
148+
]
149+
}
119150
]
120-
}
121-
],
122-
"rules": [
151+
},
123152
{
124-
"conditions": [
153+
"fn": "booleanEquals",
154+
"argv": [
155+
true,
125156
{
126-
"fn": "booleanEquals",
157+
"fn": "getAttr",
127158
"argv": [
128159
{
129-
"fn": "getAttr",
130-
"argv": [
131-
{
132-
"ref": "PartitionResult"
133-
},
134-
"supportsFIPS"
135-
]
160+
"ref": "PartitionResult"
136161
},
137-
true
162+
"supportsDualStack"
138163
]
139164
}
140-
],
141-
"rules": [
142-
{
143-
"conditions": [],
144-
"endpoint": {
145-
"url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
146-
"properties": {},
147-
"headers": {}
148-
},
149-
"type": "endpoint"
150-
}
151-
],
152-
"type": "tree"
153-
},
165+
]
166+
}
167+
],
168+
"rules": [
154169
{
155170
"conditions": [],
156-
"error": "FIPS is enabled but this partition does not support FIPS",
157-
"type": "error"
171+
"endpoint": {
172+
"url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
173+
"properties": {},
174+
"headers": {}
175+
},
176+
"type": "endpoint"
158177
}
159178
],
160179
"type": "tree"
161180
},
162181
{
163182
"conditions": [],
164-
"endpoint": {
165-
"url": "https://resource-explorer-2.{Region}.{PartitionResult#dualStackDnsSuffix}",
166-
"properties": {},
167-
"headers": {}
168-
},
169-
"type": "endpoint"
183+
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
184+
"type": "error"
170185
}
171186
],
172187
"type": "tree"
@@ -223,6 +238,58 @@
223238
],
224239
"type": "tree"
225240
},
241+
{
242+
"conditions": [
243+
{
244+
"fn": "booleanEquals",
245+
"argv": [
246+
{
247+
"ref": "UseDualStack"
248+
},
249+
true
250+
]
251+
}
252+
],
253+
"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://resource-explorer-2.{Region}.{PartitionResult#dualStackDnsSuffix}",
277+
"properties": {},
278+
"headers": {}
279+
},
280+
"type": "endpoint"
281+
}
282+
],
283+
"type": "tree"
284+
},
285+
{
286+
"conditions": [],
287+
"error": "DualStack is enabled but this partition does not support DualStack",
288+
"type": "error"
289+
}
290+
],
291+
"type": "tree"
292+
},
226293
{
227294
"conditions": [],
228295
"endpoint": {

0 commit comments

Comments
 (0)