Skip to content

Commit c259337

Browse files
Adds support for new image workflow details and image vulnerability detection.
1 parent 1bd97f0 commit c259337

File tree

138 files changed

+18634
-1936
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+18634
-1936
lines changed

generator/ServiceModels/imagebuilder/imagebuilder-2019-12-02.api.json

Lines changed: 623 additions & 6 deletions
Large diffs are not rendered by default.

generator/ServiceModels/imagebuilder/imagebuilder-2019-12-02.docs.json

Lines changed: 636 additions & 110 deletions
Large diffs are not rendered by default.

generator/ServiceModels/imagebuilder/imagebuilder-2019-12-02.endpoint-rule-set.json

Lines changed: 212 additions & 186 deletions
Large diffs are not rendered by default.

generator/ServiceModels/imagebuilder/imagebuilder-2019-12-02.endpoint-tests.json

Lines changed: 116 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,107 @@
11
{
22
"testCases": [
33
{
4-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
4+
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
55
"expect": {
66
"endpoint": {
7-
"url": "https://imagebuilder-fips.us-iso-east-1.c2s.ic.gov"
7+
"url": "https://imagebuilder-fips.us-east-1.api.aws"
88
}
99
},
1010
"params": {
11-
"UseDualStack": false,
11+
"UseDualStack": true,
1212
"UseFIPS": true,
13-
"Region": "us-iso-east-1"
13+
"Region": "us-east-1"
1414
}
1515
},
1616
{
17-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
17+
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
1818
"expect": {
1919
"endpoint": {
20-
"url": "https://imagebuilder.us-iso-east-1.c2s.ic.gov"
20+
"url": "https://imagebuilder-fips.us-east-1.amazonaws.com"
2121
}
2222
},
2323
"params": {
2424
"UseDualStack": false,
25-
"UseFIPS": false,
26-
"Region": "us-iso-east-1"
25+
"UseFIPS": true,
26+
"Region": "us-east-1"
2727
}
2828
},
2929
{
30-
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
30+
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
3131
"expect": {
3232
"endpoint": {
33-
"url": "https://imagebuilder-fips.us-east-1.api.aws"
33+
"url": "https://imagebuilder.us-east-1.api.aws"
3434
}
3535
},
3636
"params": {
3737
"UseDualStack": true,
38-
"UseFIPS": true,
38+
"UseFIPS": false,
3939
"Region": "us-east-1"
4040
}
4141
},
4242
{
43-
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
43+
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
4444
"expect": {
4545
"endpoint": {
46-
"url": "https://imagebuilder-fips.us-east-1.amazonaws.com"
46+
"url": "https://imagebuilder.us-east-1.amazonaws.com"
4747
}
4848
},
4949
"params": {
5050
"UseDualStack": false,
51-
"UseFIPS": true,
51+
"UseFIPS": false,
5252
"Region": "us-east-1"
5353
}
5454
},
5555
{
56-
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
56+
"documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
5757
"expect": {
5858
"endpoint": {
59-
"url": "https://imagebuilder.us-east-1.api.aws"
59+
"url": "https://imagebuilder-fips.cn-north-1.api.amazonwebservices.com.cn"
6060
}
6161
},
6262
"params": {
6363
"UseDualStack": true,
64-
"UseFIPS": false,
65-
"Region": "us-east-1"
64+
"UseFIPS": true,
65+
"Region": "cn-north-1"
6666
}
6767
},
6868
{
69-
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
69+
"documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
7070
"expect": {
7171
"endpoint": {
72-
"url": "https://imagebuilder.us-east-1.amazonaws.com"
72+
"url": "https://imagebuilder-fips.cn-north-1.amazonaws.com.cn"
7373
}
7474
},
7575
"params": {
7676
"UseDualStack": false,
77-
"UseFIPS": false,
78-
"Region": "us-east-1"
77+
"UseFIPS": true,
78+
"Region": "cn-north-1"
7979
}
8080
},
8181
{
82-
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
82+
"documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
8383
"expect": {
8484
"endpoint": {
85-
"url": "https://imagebuilder.us-gov-west-1.amazonaws.com"
85+
"url": "https://imagebuilder.cn-north-1.api.amazonwebservices.com.cn"
8686
}
8787
},
8888
"params": {
89-
"UseDualStack": false,
89+
"UseDualStack": true,
9090
"UseFIPS": false,
91-
"Region": "us-gov-west-1"
91+
"Region": "cn-north-1"
9292
}
9393
},
9494
{
95-
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
95+
"documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
9696
"expect": {
9797
"endpoint": {
98-
"url": "https://imagebuilder.us-gov-west-1.amazonaws.com"
98+
"url": "https://imagebuilder.cn-north-1.amazonaws.com.cn"
9999
}
100100
},
101101
"params": {
102102
"UseDualStack": false,
103-
"UseFIPS": true,
104-
"Region": "us-gov-west-1"
103+
"UseFIPS": false,
104+
"Region": "cn-north-1"
105105
}
106106
},
107107
{
@@ -130,6 +130,32 @@
130130
"Region": "us-gov-east-1"
131131
}
132132
},
133+
{
134+
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
135+
"expect": {
136+
"endpoint": {
137+
"url": "https://imagebuilder.us-gov-west-1.amazonaws.com"
138+
}
139+
},
140+
"params": {
141+
"UseDualStack": false,
142+
"UseFIPS": false,
143+
"Region": "us-gov-west-1"
144+
}
145+
},
146+
{
147+
"documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
148+
"expect": {
149+
"endpoint": {
150+
"url": "https://imagebuilder.us-gov-west-1.amazonaws.com"
151+
}
152+
},
153+
"params": {
154+
"UseDualStack": false,
155+
"UseFIPS": true,
156+
"Region": "us-gov-west-1"
157+
}
158+
},
133159
{
134160
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
135161
"expect": {
@@ -157,85 +183,103 @@
157183
}
158184
},
159185
{
160-
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
186+
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
187+
"expect": {
188+
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
189+
},
190+
"params": {
191+
"UseDualStack": true,
192+
"UseFIPS": true,
193+
"Region": "us-iso-east-1"
194+
}
195+
},
196+
{
197+
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
161198
"expect": {
162199
"endpoint": {
163-
"url": "https://imagebuilder-fips.us-isob-east-1.sc2s.sgov.gov"
200+
"url": "https://imagebuilder-fips.us-iso-east-1.c2s.ic.gov"
164201
}
165202
},
166203
"params": {
167204
"UseDualStack": false,
168205
"UseFIPS": true,
169-
"Region": "us-isob-east-1"
206+
"Region": "us-iso-east-1"
170207
}
171208
},
172209
{
173-
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
210+
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
211+
"expect": {
212+
"error": "DualStack is enabled but this partition does not support DualStack"
213+
},
214+
"params": {
215+
"UseDualStack": true,
216+
"UseFIPS": false,
217+
"Region": "us-iso-east-1"
218+
}
219+
},
220+
{
221+
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
174222
"expect": {
175223
"endpoint": {
176-
"url": "https://imagebuilder.us-isob-east-1.sc2s.sgov.gov"
224+
"url": "https://imagebuilder.us-iso-east-1.c2s.ic.gov"
177225
}
178226
},
179227
"params": {
180228
"UseDualStack": false,
181229
"UseFIPS": false,
182-
"Region": "us-isob-east-1"
230+
"Region": "us-iso-east-1"
183231
}
184232
},
185233
{
186-
"documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
234+
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
187235
"expect": {
188-
"endpoint": {
189-
"url": "https://imagebuilder-fips.cn-north-1.api.amazonwebservices.com.cn"
190-
}
236+
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
191237
},
192238
"params": {
193239
"UseDualStack": true,
194240
"UseFIPS": true,
195-
"Region": "cn-north-1"
241+
"Region": "us-isob-east-1"
196242
}
197243
},
198244
{
199-
"documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
245+
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
200246
"expect": {
201247
"endpoint": {
202-
"url": "https://imagebuilder-fips.cn-north-1.amazonaws.com.cn"
248+
"url": "https://imagebuilder-fips.us-isob-east-1.sc2s.sgov.gov"
203249
}
204250
},
205251
"params": {
206252
"UseDualStack": false,
207253
"UseFIPS": true,
208-
"Region": "cn-north-1"
254+
"Region": "us-isob-east-1"
209255
}
210256
},
211257
{
212-
"documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
258+
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
213259
"expect": {
214-
"endpoint": {
215-
"url": "https://imagebuilder.cn-north-1.api.amazonwebservices.com.cn"
216-
}
260+
"error": "DualStack is enabled but this partition does not support DualStack"
217261
},
218262
"params": {
219263
"UseDualStack": true,
220264
"UseFIPS": false,
221-
"Region": "cn-north-1"
265+
"Region": "us-isob-east-1"
222266
}
223267
},
224268
{
225-
"documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
269+
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
226270
"expect": {
227271
"endpoint": {
228-
"url": "https://imagebuilder.cn-north-1.amazonaws.com.cn"
272+
"url": "https://imagebuilder.us-isob-east-1.sc2s.sgov.gov"
229273
}
230274
},
231275
"params": {
232276
"UseDualStack": false,
233277
"UseFIPS": false,
234-
"Region": "cn-north-1"
278+
"Region": "us-isob-east-1"
235279
}
236280
},
237281
{
238-
"documentation": "For custom endpoint with fips disabled and dualstack disabled",
282+
"documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
239283
"expect": {
240284
"endpoint": {
241285
"url": "https://example.com"
@@ -248,6 +292,19 @@
248292
"Endpoint": "https://example.com"
249293
}
250294
},
295+
{
296+
"documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
297+
"expect": {
298+
"endpoint": {
299+
"url": "https://example.com"
300+
}
301+
},
302+
"params": {
303+
"UseDualStack": false,
304+
"UseFIPS": false,
305+
"Endpoint": "https://example.com"
306+
}
307+
},
251308
{
252309
"documentation": "For custom endpoint with fips enabled and dualstack disabled",
253310
"expect": {
@@ -271,6 +328,12 @@
271328
"Region": "us-east-1",
272329
"Endpoint": "https://example.com"
273330
}
331+
},
332+
{
333+
"documentation": "Missing region",
334+
"expect": {
335+
"error": "Invalid Configuration: Missing Region"
336+
}
274337
}
275338
],
276339
"version": "1.0"

0 commit comments

Comments
 (0)