Skip to content

Commit cf9ff3c

Browse files
author
AWS
committed
Amazon Inspector Update: Remove incorrect endpoint tests
1 parent a773778 commit cf9ff3c

File tree

4 files changed

+29
-65
lines changed

4 files changed

+29
-65
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "Amazon Inspector",
4+
"contributor": "",
5+
"description": "Remove incorrect endpoint tests"
6+
}

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

Lines changed: 20 additions & 20 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,11 +212,11 @@
216212
},
217213
"supportsFIPS"
218214
]
219-
}
215+
},
216+
true
220217
]
221218
}
222219
],
223-
"type": "tree",
224220
"rules": [
225221
{
226222
"conditions": [],
@@ -231,14 +227,16 @@
231227
},
232228
"type": "endpoint"
233229
}
234-
]
230+
],
231+
"type": "tree"
235232
},
236233
{
237234
"conditions": [],
238235
"error": "FIPS is enabled but this partition does not support FIPS",
239236
"type": "error"
240237
}
241-
]
238+
],
239+
"type": "tree"
242240
},
243241
{
244242
"conditions": [
@@ -252,7 +250,6 @@
252250
]
253251
}
254252
],
255-
"type": "tree",
256253
"rules": [
257254
{
258255
"conditions": [
@@ -272,7 +269,6 @@
272269
]
273270
}
274271
],
275-
"type": "tree",
276272
"rules": [
277273
{
278274
"conditions": [],
@@ -283,14 +279,16 @@
283279
},
284280
"type": "endpoint"
285281
}
286-
]
282+
],
283+
"type": "tree"
287284
},
288285
{
289286
"conditions": [],
290287
"error": "DualStack is enabled but this partition does not support DualStack",
291288
"type": "error"
292289
}
293-
]
290+
],
291+
"type": "tree"
294292
},
295293
{
296294
"conditions": [],
@@ -301,9 +299,11 @@
301299
},
302300
"type": "endpoint"
303301
}
304-
]
302+
],
303+
"type": "tree"
305304
}
306-
]
305+
],
306+
"type": "tree"
307307
},
308308
{
309309
"conditions": [],

services/inspector/src/main/resources/codegen-resources/endpoint-tests.json

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -364,17 +364,6 @@
364364
"UseDualStack": true
365365
}
366366
},
367-
{
368-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
369-
"expect": {
370-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
371-
},
372-
"params": {
373-
"Region": "us-iso-east-1",
374-
"UseFIPS": true,
375-
"UseDualStack": true
376-
}
377-
},
378367
{
379368
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
380369
"expect": {
@@ -388,17 +377,6 @@
388377
"UseDualStack": false
389378
}
390379
},
391-
{
392-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
393-
"expect": {
394-
"error": "DualStack is enabled but this partition does not support DualStack"
395-
},
396-
"params": {
397-
"Region": "us-iso-east-1",
398-
"UseFIPS": false,
399-
"UseDualStack": true
400-
}
401-
},
402380
{
403381
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
404382
"expect": {
@@ -412,17 +390,6 @@
412390
"UseDualStack": false
413391
}
414392
},
415-
{
416-
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
417-
"expect": {
418-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
419-
},
420-
"params": {
421-
"Region": "us-isob-east-1",
422-
"UseFIPS": true,
423-
"UseDualStack": true
424-
}
425-
},
426393
{
427394
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
428395
"expect": {
@@ -436,17 +403,6 @@
436403
"UseDualStack": false
437404
}
438405
},
439-
{
440-
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
441-
"expect": {
442-
"error": "DualStack is enabled but this partition does not support DualStack"
443-
},
444-
"params": {
445-
"Region": "us-isob-east-1",
446-
"UseFIPS": false,
447-
"UseDualStack": true
448-
}
449-
},
450406
{
451407
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
452408
"expect": {

services/inspector/src/main/resources/codegen-resources/service-2.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
"endpointPrefix":"inspector",
66
"jsonVersion":"1.1",
77
"protocol":"json",
8+
"protocols":["json"],
89
"serviceFullName":"Amazon Inspector",
910
"serviceId":"Inspector",
1011
"signatureVersion":"v4",
1112
"targetPrefix":"InspectorService",
12-
"uid":"inspector-2016-02-16"
13+
"uid":"inspector-2016-02-16",
14+
"auth":["aws.auth#sigv4"]
1315
},
1416
"operations":{
1517
"AddAttributesToFindings":{

0 commit comments

Comments
 (0)