Skip to content

Commit 9e70db9

Browse files
author
AWS
committed
AWS Single Sign-On Update: Remove incorrect endpoint tests
1 parent cde0e8c commit 9e70db9

File tree

4 files changed

+39
-71
lines changed

4 files changed

+39
-71
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": "AWS Single Sign-On",
4+
"contributor": "",
5+
"description": "Remove incorrect endpoint tests"
6+
}

services/sso/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/sso/src/main/resources/codegen-resources/endpoint-tests.json

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -403,17 +403,6 @@
403403
"UseDualStack": true
404404
}
405405
},
406-
{
407-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
408-
"expect": {
409-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
410-
},
411-
"params": {
412-
"Region": "us-iso-east-1",
413-
"UseFIPS": true,
414-
"UseDualStack": true
415-
}
416-
},
417406
{
418407
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
419408
"expect": {
@@ -427,17 +416,6 @@
427416
"UseDualStack": false
428417
}
429418
},
430-
{
431-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
432-
"expect": {
433-
"error": "DualStack is enabled but this partition does not support DualStack"
434-
},
435-
"params": {
436-
"Region": "us-iso-east-1",
437-
"UseFIPS": false,
438-
"UseDualStack": true
439-
}
440-
},
441419
{
442420
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
443421
"expect": {
@@ -451,17 +429,6 @@
451429
"UseDualStack": false
452430
}
453431
},
454-
{
455-
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
456-
"expect": {
457-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
458-
},
459-
"params": {
460-
"Region": "us-isob-east-1",
461-
"UseFIPS": true,
462-
"UseDualStack": true
463-
}
464-
},
465432
{
466433
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
467434
"expect": {
@@ -475,17 +442,6 @@
475442
"UseDualStack": false
476443
}
477444
},
478-
{
479-
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
480-
"expect": {
481-
"error": "DualStack is enabled but this partition does not support DualStack"
482-
},
483-
"params": {
484-
"Region": "us-isob-east-1",
485-
"UseFIPS": false,
486-
"UseDualStack": true
487-
}
488-
},
489445
{
490446
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
491447
"expect": {

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
"endpointPrefix":"portal.sso",
66
"jsonVersion":"1.1",
77
"protocol":"rest-json",
8+
"protocols":["rest-json"],
89
"serviceAbbreviation":"SSO",
910
"serviceFullName":"AWS Single Sign-On",
1011
"serviceId":"SSO",
1112
"signatureVersion":"v4",
1213
"signingName":"awsssoportal",
13-
"uid":"sso-2019-06-10"
14+
"uid":"sso-2019-06-10",
15+
"auth":["aws.auth#sigv4"]
1416
},
1517
"operations":{
1618
"GetRoleCredentials":{
@@ -28,7 +30,8 @@
2830
{"shape":"ResourceNotFoundException"}
2931
],
3032
"documentation":"<p>Returns the STS short-term credentials for a given role name that is assigned to the user.</p>",
31-
"authtype":"none"
33+
"authtype":"none",
34+
"auth":["smithy.api#noAuth"]
3235
},
3336
"ListAccountRoles":{
3437
"name":"ListAccountRoles",
@@ -45,7 +48,8 @@
4548
{"shape":"ResourceNotFoundException"}
4649
],
4750
"documentation":"<p>Lists all roles that are assigned to the user for a given AWS account.</p>",
48-
"authtype":"none"
51+
"authtype":"none",
52+
"auth":["smithy.api#noAuth"]
4953
},
5054
"ListAccounts":{
5155
"name":"ListAccounts",
@@ -62,7 +66,8 @@
6266
{"shape":"ResourceNotFoundException"}
6367
],
6468
"documentation":"<p>Lists all AWS accounts assigned to the user. These AWS accounts are assigned by the administrator of the account. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/useraccess.html#assignusers\">Assign User Access</a> in the <i>IAM Identity Center User Guide</i>. This operation returns a paginated response.</p>",
65-
"authtype":"none"
69+
"authtype":"none",
70+
"auth":["smithy.api#noAuth"]
6671
},
6772
"Logout":{
6873
"name":"Logout",
@@ -77,7 +82,8 @@
7782
{"shape":"TooManyRequestsException"}
7883
],
7984
"documentation":"<p>Removes the locally stored SSO tokens from the client-side cache and sends an API call to the IAM Identity Center service to invalidate the corresponding server-side IAM Identity Center sign in session.</p> <note> <p>If a user uses IAM Identity Center to access the AWS CLI, the user’s IAM Identity Center sign in session is used to obtain an IAM session, as specified in the corresponding IAM Identity Center permission set. More specifically, IAM Identity Center assumes an IAM role in the target account on behalf of the user, and the corresponding temporary AWS credentials are returned to the client.</p> <p>After user logout, any existing IAM role sessions that were created by using IAM Identity Center permission sets continue based on the duration configured in the permission set. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/authconcept.html\">User authentications</a> in the <i>IAM Identity Center User Guide</i>.</p> </note>",
80-
"authtype":"none"
85+
"authtype":"none",
86+
"auth":["smithy.api#noAuth"]
8187
}
8288
},
8389
"shapes":{

0 commit comments

Comments
 (0)