Skip to content

Commit e78c85a

Browse files
author
AWS
committed
AWS S3 Control Update: Fix endpoint resolution test cases
1 parent 6d934c6 commit e78c85a

File tree

3 files changed

+25
-67
lines changed

3 files changed

+25
-67
lines changed

‎.changes/next-release/feature-AWSS3Control-7506cfe.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 S3 Control",
4+
"contributor": "",
5+
"description": "Fix endpoint resolution test cases"
6+
}

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

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,17 +2720,6 @@
27202720
"expect": {
27212721
"error": "AccountId must only contain a-z, A-Z, 0-9 and `-`."
27222722
},
2723-
"operationInputs": [
2724-
{
2725-
"builtInParams": {
2726-
"AWS::Region": "us-east-1"
2727-
},
2728-
"operationName": "ListRegionalBuckets",
2729-
"operationParams": {
2730-
"AccountId": "/?invalid&not-host*label"
2731-
}
2732-
}
2733-
],
27342723
"params": {
27352724
"AccountId": "/?invalid&not-host*label",
27362725
"Region": "us-east-1",
@@ -2876,18 +2865,6 @@
28762865
"expect": {
28772866
"error": "AccountId must only contain a-z, A-Z, 0-9 and `-`."
28782867
},
2879-
"operationInputs": [
2880-
{
2881-
"builtInParams": {
2882-
"AWS::Region": "us-east-1",
2883-
"SDK::Endpoint": "https://beta.example.com"
2884-
},
2885-
"operationName": "ListRegionalBuckets",
2886-
"operationParams": {
2887-
"AccountId": "/?invalid&not-host*label"
2888-
}
2889-
}
2890-
],
28912868
"params": {
28922869
"Region": "us-east-1",
28932870
"Endpoint": "https://beta.example.com",
@@ -3024,18 +3001,6 @@
30243001
"expect": {
30253002
"error": "AccountId must only contain a-z, A-Z, 0-9 and `-`."
30263003
},
3027-
"operationInputs": [
3028-
{
3029-
"builtInParams": {
3030-
"AWS::Region": "us-east-2"
3031-
},
3032-
"operationName": "ListRegionalBuckets",
3033-
"operationParams": {
3034-
"OutpostId": "op-123",
3035-
"AccountId": "/?invalid&not-host*label"
3036-
}
3037-
}
3038-
],
30393004
"params": {
30403005
"AccountId": "/?invalid&not-host*label",
30413006
"OutpostId": "op-123",
@@ -3229,12 +3194,12 @@
32293194
"operationName": "ListRegionalBuckets",
32303195
"operationParams": {
32313196
"OutpostId": "op-123",
3232-
"AccountId": "0123456789012"
3197+
"AccountId": "012345678912"
32333198
}
32343199
}
32353200
],
32363201
"params": {
3237-
"AccountId": "0123456789012",
3202+
"AccountId": "012345678912",
32383203
"OutpostId": "op-123",
32393204
"Region": "cn-north-1",
32403205
"RequiresAccountId": true,
@@ -3255,12 +3220,12 @@
32553220
"operationName": "ListRegionalBuckets",
32563221
"operationParams": {
32573222
"OutpostId": "?outpost/invalid+",
3258-
"AccountId": "0123456789012"
3223+
"AccountId": "012345678912"
32593224
}
32603225
}
32613226
],
32623227
"params": {
3263-
"AccountId": "0123456789012",
3228+
"AccountId": "012345678912",
32643229
"OutpostId": "?outpost/invalid+",
32653230
"Region": "us-west-1",
32663231
"RequiresAccountId": true,
@@ -3271,11 +3236,11 @@
32713236
{
32723237
"documentation": "bucket ARN with mismatched accountId",
32733238
"expect": {
3274-
"error": "Invalid ARN: the accountId specified in the ARN (`999999`) does not match the parameter (`0123456789012`)"
3239+
"error": "Invalid ARN: the accountId specified in the ARN (`999999`) does not match the parameter (`012345678912`)"
32753240
},
32763241
"params": {
32773242
"Bucket": "arn:aws:s3-outposts:us-west-2:999999:outpost:op-01234567890123456:bucket:mybucket",
3278-
"AccountId": "0123456789012",
3243+
"AccountId": "012345678912",
32793244
"Region": "us-west-2",
32803245
"RequiresAccountId": true,
32813246
"UseDualStack": false,

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

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,15 +2081,13 @@
20812081
"Boolean":{"type":"boolean"},
20822082
"BucketAlreadyExists":{
20832083
"type":"structure",
2084-
"members":{
2085-
},
2084+
"members":{},
20862085
"documentation":"<p>The requested Outposts bucket name is not available. The bucket namespace is shared by all users of the Outposts in this Region. Select a different name and try again.</p>",
20872086
"exception":true
20882087
},
20892088
"BucketAlreadyOwnedByYou":{
20902089
"type":"structure",
2091-
"members":{
2092-
},
2090+
"members":{},
20932091
"documentation":"<p>The Outposts bucket you tried to create already exists, and you own it. </p>",
20942092
"exception":true
20952093
},
@@ -3099,8 +3097,7 @@
30993097
},
31003098
"DeleteJobTaggingResult":{
31013099
"type":"structure",
3102-
"members":{
3103-
}
3100+
"members":{}
31043101
},
31053102
"DeleteMarkerReplication":{
31063103
"type":"structure",
@@ -3229,8 +3226,7 @@
32293226
},
32303227
"DeleteStorageLensConfigurationTaggingResult":{
32313228
"type":"structure",
3232-
"members":{
3233-
}
3229+
"members":{}
32343230
},
32353231
"DeleteStorageLensGroupRequest":{
32363232
"type":"structure",
@@ -7038,8 +7034,7 @@
70387034
},
70397035
"PutJobTaggingResult":{
70407036
"type":"structure",
7041-
"members":{
7042-
}
7037+
"members":{}
70437038
},
70447039
"PutMultiRegionAccessPointPolicyInput":{
70457040
"type":"structure",
@@ -7181,8 +7176,7 @@
71817176
},
71827177
"PutStorageLensConfigurationTaggingResult":{
71837178
"type":"structure",
7184-
"members":{
7185-
}
7179+
"members":{}
71867180
},
71877181
"Region":{
71887182
"type":"structure",
@@ -7690,8 +7684,7 @@
76907684
},
76917685
"S3DeleteObjectTaggingOperation":{
76927686
"type":"structure",
7693-
"members":{
7694-
},
7687+
"members":{},
76957688
"documentation":"<p>Contains no configuration parameters because the DELETE Object tagging (<code>DeleteObjectTagging</code>) API operation accepts only the bucket name and key name as parameters, which are defined in the job's manifest.</p>"
76967689
},
76977690
"S3ExpirationInDays":{
@@ -7984,8 +7977,7 @@
79847977
},
79857978
"S3ReplicateObjectOperation":{
79867979
"type":"structure",
7987-
"members":{
7988-
},
7980+
"members":{},
79897981
"documentation":"<p>Directs the specified job to invoke <code>ReplicateObject</code> on every object in the job's manifest.</p>"
79907982
},
79917983
"S3ResourceArn":{
@@ -8128,15 +8120,13 @@
81288120
"SSEKMSKeyId":{"type":"string"},
81298121
"SSES3":{
81308122
"type":"structure",
8131-
"members":{
8132-
},
8123+
"members":{},
81338124
"documentation":"<p/>",
81348125
"locationName":"SSE-S3"
81358126
},
81368127
"SSES3Encryption":{
81378128
"type":"structure",
8138-
"members":{
8139-
},
8129+
"members":{},
81408130
"documentation":"<p>Configuration for the use of SSE-S3 to encrypt generated manifest objects.</p>",
81418131
"locationName":"SSE-S3"
81428132
},
@@ -8573,8 +8563,7 @@
85738563
},
85748564
"SubmitMultiRegionAccessPointRoutesResult":{
85758565
"type":"structure",
8576-
"members":{
8577-
}
8566+
"members":{}
85788567
},
85798568
"Suffix":{"type":"string"},
85808569
"SuspendedCause":{
@@ -8652,8 +8641,7 @@
86528641
},
86538642
"TagResourceResult":{
86548643
"type":"structure",
8655-
"members":{
8656-
}
8644+
"members":{}
86578645
},
86588646
"TagValueString":{
86598647
"type":"string",
@@ -8761,8 +8749,7 @@
87618749
},
87628750
"UntagResourceResult":{
87638751
"type":"structure",
8764-
"members":{
8765-
}
8752+
"members":{}
87668753
},
87678754
"UpdateAccessGrantsLocationRequest":{
87688755
"type":"structure",

0 commit comments

Comments
 (0)