Skip to content

Commit c5308f1

Browse files
author
AWS
committed
Amazon CloudSearch Update: Remove incorrect endpoint tests
1 parent 1e5fbca commit c5308f1

File tree

4 files changed

+36
-79
lines changed

4 files changed

+36
-79
lines changed

‎.changes/next-release/feature-AmazonCloudSearch-f3df12c.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": "Amazon CloudSearch",
4+
"contributor": "",
5+
"description": "Remove incorrect endpoint tests"
6+
}

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

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -273,17 +273,6 @@
273273
"UseDualStack": false
274274
}
275275
},
276-
{
277-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
278-
"expect": {
279-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
280-
},
281-
"params": {
282-
"Region": "us-iso-east-1",
283-
"UseFIPS": true,
284-
"UseDualStack": true
285-
}
286-
},
287276
{
288277
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
289278
"expect": {
@@ -297,17 +286,6 @@
297286
"UseDualStack": false
298287
}
299288
},
300-
{
301-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
302-
"expect": {
303-
"error": "DualStack is enabled but this partition does not support DualStack"
304-
},
305-
"params": {
306-
"Region": "us-iso-east-1",
307-
"UseFIPS": false,
308-
"UseDualStack": true
309-
}
310-
},
311289
{
312290
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
313291
"expect": {
@@ -321,17 +299,6 @@
321299
"UseDualStack": false
322300
}
323301
},
324-
{
325-
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
326-
"expect": {
327-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
328-
},
329-
"params": {
330-
"Region": "us-isob-east-1",
331-
"UseFIPS": true,
332-
"UseDualStack": true
333-
}
334-
},
335302
{
336303
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
337304
"expect": {
@@ -345,17 +312,6 @@
345312
"UseDualStack": false
346313
}
347314
},
348-
{
349-
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
350-
"expect": {
351-
"error": "DualStack is enabled but this partition does not support DualStack"
352-
},
353-
"params": {
354-
"Region": "us-isob-east-1",
355-
"UseFIPS": false,
356-
"UseDualStack": true
357-
}
358-
},
359315
{
360316
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
361317
"expect": {

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
"apiVersion":"2013-01-01",
55
"endpointPrefix":"cloudsearch",
66
"protocol":"query",
7+
"protocols":["query"],
78
"serviceFullName":"Amazon CloudSearch",
89
"serviceId":"CloudSearch",
910
"signatureVersion":"v4",
1011
"uid":"cloudsearch-2013-01-01",
11-
"xmlNamespace":"http://cloudsearch.amazonaws.com/doc/2013-01-01/"
12+
"xmlNamespace":"http://cloudsearch.amazonaws.com/doc/2013-01-01/",
13+
"auth":["aws.auth#sigv4"]
1214
},
1315
"operations":{
1416
"BuildSuggesters":{
@@ -1193,8 +1195,7 @@
11931195
},
11941196
"DisabledOperationException":{
11951197
"type":"structure",
1196-
"members":{
1197-
},
1198+
"members":{},
11981199
"documentation":"<p>The request was rejected because it attempted an operation which is not enabled.</p>",
11991200
"error":{
12001201
"code":"DisabledAction",
@@ -1609,8 +1610,7 @@
16091610
},
16101611
"InternalException":{
16111612
"type":"structure",
1612-
"members":{
1613-
},
1613+
"members":{},
16141614
"documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>",
16151615
"error":{
16161616
"code":"InternalException",
@@ -1620,8 +1620,7 @@
16201620
},
16211621
"InvalidTypeException":{
16221622
"type":"structure",
1623-
"members":{
1624-
},
1623+
"members":{},
16251624
"documentation":"<p>The request was rejected because it specified an invalid type definition.</p>",
16261625
"error":{
16271626
"code":"InvalidType",
@@ -1659,8 +1658,7 @@
16591658
},
16601659
"LimitExceededException":{
16611660
"type":"structure",
1662-
"members":{
1663-
},
1661+
"members":{},
16641662
"documentation":"<p>The request was rejected because a resource limit has already been met.</p>",
16651663
"error":{
16661664
"code":"LimitExceeded",
@@ -1828,8 +1826,7 @@
18281826
},
18291827
"ResourceAlreadyExistsException":{
18301828
"type":"structure",
1831-
"members":{
1832-
},
1829+
"members":{},
18331830
"documentation":"<p>The request was rejected because it attempted to create a resource that already exists.</p>",
18341831
"error":{
18351832
"code":"ResourceAlreadyExists",
@@ -1840,8 +1837,7 @@
18401837
},
18411838
"ResourceNotFoundException":{
18421839
"type":"structure",
1843-
"members":{
1844-
},
1840+
"members":{},
18451841
"documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>",
18461842
"error":{
18471843
"code":"ResourceNotFound",
@@ -2111,8 +2107,7 @@
21112107
"UpdateTimestamp":{"type":"timestamp"},
21122108
"ValidationException":{
21132109
"type":"structure",
2114-
"members":{
2115-
},
2110+
"members":{},
21162111
"documentation":"<p>The request was rejected because it has invalid parameters.</p>",
21172112
"exception":true
21182113
},

0 commit comments

Comments
 (0)