Skip to content

Commit f877977

Browse files
author
AWS
committed
AWS Resource Access Manager Update: Remove incorrect endpoint tests
1 parent 8275433 commit f877977

File tree

4 files changed

+34
-73
lines changed

4 files changed

+34
-73
lines changed

‎.changes/next-release/feature-AWSResourceAccessManager-277a141.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 Access Manager",
4+
"contributor": "",
5+
"description": "Remove incorrect endpoint tests"
6+
}

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
]
4141
}
4242
],
43-
"type": "tree",
4443
"rules": [
4544
{
4645
"conditions": [
@@ -83,7 +82,8 @@
8382
},
8483
"type": "endpoint"
8584
}
86-
]
85+
],
86+
"type": "tree"
8787
},
8888
{
8989
"conditions": [
@@ -96,7 +96,6 @@
9696
]
9797
}
9898
],
99-
"type": "tree",
10099
"rules": [
101100
{
102101
"conditions": [
@@ -110,7 +109,6 @@
110109
"assign": "PartitionResult"
111110
}
112111
],
113-
"type": "tree",
114112
"rules": [
115113
{
116114
"conditions": [
@@ -133,7 +131,6 @@
133131
]
134132
}
135133
],
136-
"type": "tree",
137134
"rules": [
138135
{
139136
"conditions": [
@@ -168,7 +165,6 @@
168165
]
169166
}
170167
],
171-
"type": "tree",
172168
"rules": [
173169
{
174170
"conditions": [],
@@ -179,14 +175,16 @@
179175
},
180176
"type": "endpoint"
181177
}
182-
]
178+
],
179+
"type": "tree"
183180
},
184181
{
185182
"conditions": [],
186183
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
187184
"type": "error"
188185
}
189-
]
186+
],
187+
"type": "tree"
190188
},
191189
{
192190
"conditions": [
@@ -200,14 +198,12 @@
200198
]
201199
}
202200
],
203-
"type": "tree",
204201
"rules": [
205202
{
206203
"conditions": [
207204
{
208205
"fn": "booleanEquals",
209206
"argv": [
210-
true,
211207
{
212208
"fn": "getAttr",
213209
"argv": [
@@ -216,18 +212,17 @@
216212
},
217213
"supportsFIPS"
218214
]
219-
}
215+
},
216+
true
220217
]
221218
}
222219
],
223-
"type": "tree",
224220
"rules": [
225221
{
226222
"conditions": [
227223
{
228224
"fn": "stringEquals",
229225
"argv": [
230-
"aws-us-gov",
231226
{
232227
"fn": "getAttr",
233228
"argv": [
@@ -236,7 +231,8 @@
236231
},
237232
"name"
238233
]
239-
}
234+
},
235+
"aws-us-gov"
240236
]
241237
}
242238
],
@@ -256,14 +252,16 @@
256252
},
257253
"type": "endpoint"
258254
}
259-
]
255+
],
256+
"type": "tree"
260257
},
261258
{
262259
"conditions": [],
263260
"error": "FIPS is enabled but this partition does not support FIPS",
264261
"type": "error"
265262
}
266-
]
263+
],
264+
"type": "tree"
267265
},
268266
{
269267
"conditions": [
@@ -277,7 +275,6 @@
277275
]
278276
}
279277
],
280-
"type": "tree",
281278
"rules": [
282279
{
283280
"conditions": [
@@ -297,7 +294,6 @@
297294
]
298295
}
299296
],
300-
"type": "tree",
301297
"rules": [
302298
{
303299
"conditions": [],
@@ -308,14 +304,16 @@
308304
},
309305
"type": "endpoint"
310306
}
311-
]
307+
],
308+
"type": "tree"
312309
},
313310
{
314311
"conditions": [],
315312
"error": "DualStack is enabled but this partition does not support DualStack",
316313
"type": "error"
317314
}
318-
]
315+
],
316+
"type": "tree"
319317
},
320318
{
321319
"conditions": [],
@@ -326,9 +324,11 @@
326324
},
327325
"type": "endpoint"
328326
}
329-
]
327+
],
328+
"type": "tree"
330329
}
331-
]
330+
],
331+
"type": "tree"
332332
},
333333
{
334334
"conditions": [],

‎services/ram/src/main/resources/codegen-resources/endpoint-tests.json‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -533,17 +533,6 @@
533533
"UseDualStack": false
534534
}
535535
},
536-
{
537-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
538-
"expect": {
539-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
540-
},
541-
"params": {
542-
"Region": "us-iso-east-1",
543-
"UseFIPS": true,
544-
"UseDualStack": true
545-
}
546-
},
547536
{
548537
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
549538
"expect": {
@@ -557,17 +546,6 @@
557546
"UseDualStack": false
558547
}
559548
},
560-
{
561-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
562-
"expect": {
563-
"error": "DualStack is enabled but this partition does not support DualStack"
564-
},
565-
"params": {
566-
"Region": "us-iso-east-1",
567-
"UseFIPS": false,
568-
"UseDualStack": true
569-
}
570-
},
571549
{
572550
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
573551
"expect": {
@@ -581,17 +559,6 @@
581559
"UseDualStack": false
582560
}
583561
},
584-
{
585-
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
586-
"expect": {
587-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
588-
},
589-
"params": {
590-
"Region": "us-isob-east-1",
591-
"UseFIPS": true,
592-
"UseDualStack": true
593-
}
594-
},
595562
{
596563
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
597564
"expect": {
@@ -605,17 +572,6 @@
605572
"UseDualStack": false
606573
}
607574
},
608-
{
609-
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
610-
"expect": {
611-
"error": "DualStack is enabled but this partition does not support DualStack"
612-
},
613-
"params": {
614-
"Region": "us-isob-east-1",
615-
"UseFIPS": false,
616-
"UseDualStack": true
617-
}
618-
},
619575
{
620576
"documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
621577
"expect": {

‎services/ram/src/main/resources/codegen-resources/service-2.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
"endpointPrefix":"ram",
66
"jsonVersion":"1.1",
77
"protocol":"rest-json",
8+
"protocols":["rest-json"],
89
"serviceAbbreviation":"RAM",
910
"serviceFullName":"AWS Resource Access Manager",
1011
"serviceId":"RAM",
1112
"signatureVersion":"v4",
12-
"uid":"ram-2018-01-04"
13+
"uid":"ram-2018-01-04",
14+
"auth":["aws.auth#sigv4"]
1315
},
1416
"operations":{
1517
"AcceptResourceShareInvitation":{
@@ -1142,8 +1144,7 @@
11421144
},
11431145
"EnableSharingWithAwsOrganizationRequest":{
11441146
"type":"structure",
1145-
"members":{
1146-
}
1147+
"members":{}
11471148
},
11481149
"EnableSharingWithAwsOrganizationResponse":{
11491150
"type":"structure",
@@ -2719,8 +2720,7 @@
27192720
},
27202721
"TagResourceResponse":{
27212722
"type":"structure",
2722-
"members":{
2723-
}
2723+
"members":{}
27242724
},
27252725
"TagValue":{"type":"string"},
27262726
"TagValueList":{
@@ -2777,8 +2777,7 @@
27772777
},
27782778
"UntagResourceResponse":{
27792779
"type":"structure",
2780-
"members":{
2781-
}
2780+
"members":{}
27822781
},
27832782
"UpdateResourceShareRequest":{
27842783
"type":"structure",

0 commit comments

Comments
 (0)