Skip to content

Commit 9ab9343

Browse files
author
AWS
committed
Amazon Security Lake Update: Remove incorrect regex enforcement on pagination tokens.
1 parent 20eba02 commit 9ab9343

File tree

3 files changed

+101
-75
lines changed

3 files changed

+101
-75
lines changed

‎.changes/next-release/feature-AmazonSecurityLake-7af7368.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 Security Lake",
4+
"contributor": "",
5+
"description": "Remove incorrect regex enforcement on pagination tokens."
6+
}

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

Lines changed: 93 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
22
"testCases": [
33
{
4-
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
4+
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
55
"expect": {
66
"endpoint": {
7-
"url": "https://securitylake-fips.us-gov-east-1.api.aws"
7+
"url": "https://securitylake-fips.us-east-1.api.aws"
88
}
99
},
1010
"params": {
11-
"UseDualStack": true,
11+
"Region": "us-east-1",
1212
"UseFIPS": true,
13-
"Region": "us-gov-east-1"
13+
"UseDualStack": true
1414
}
1515
},
1616
{
17-
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
17+
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
1818
"expect": {
1919
"endpoint": {
20-
"url": "https://securitylake-fips.us-gov-east-1.amazonaws.com"
20+
"url": "https://securitylake-fips.us-east-1.amazonaws.com"
2121
}
2222
},
2323
"params": {
24-
"UseDualStack": false,
24+
"Region": "us-east-1",
2525
"UseFIPS": true,
26-
"Region": "us-gov-east-1"
26+
"UseDualStack": false
2727
}
2828
},
2929
{
30-
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
30+
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
3131
"expect": {
3232
"endpoint": {
33-
"url": "https://securitylake.us-gov-east-1.api.aws"
33+
"url": "https://securitylake.us-east-1.api.aws"
3434
}
3535
},
3636
"params": {
37-
"UseDualStack": true,
37+
"Region": "us-east-1",
3838
"UseFIPS": false,
39-
"Region": "us-gov-east-1"
39+
"UseDualStack": true
4040
}
4141
},
4242
{
43-
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
43+
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
4444
"expect": {
4545
"endpoint": {
46-
"url": "https://securitylake.us-gov-east-1.amazonaws.com"
46+
"url": "https://securitylake.us-east-1.amazonaws.com"
4747
}
4848
},
4949
"params": {
50-
"UseDualStack": false,
50+
"Region": "us-east-1",
5151
"UseFIPS": false,
52-
"Region": "us-gov-east-1"
52+
"UseDualStack": false
5353
}
5454
},
5555
{
@@ -60,9 +60,9 @@
6060
}
6161
},
6262
"params": {
63-
"UseDualStack": true,
63+
"Region": "cn-north-1",
6464
"UseFIPS": true,
65-
"Region": "cn-north-1"
65+
"UseDualStack": true
6666
}
6767
},
6868
{
@@ -73,9 +73,9 @@
7373
}
7474
},
7575
"params": {
76-
"UseDualStack": false,
76+
"Region": "cn-north-1",
7777
"UseFIPS": true,
78-
"Region": "cn-north-1"
78+
"UseDualStack": false
7979
}
8080
},
8181
{
@@ -86,9 +86,9 @@
8686
}
8787
},
8888
"params": {
89-
"UseDualStack": true,
89+
"Region": "cn-north-1",
9090
"UseFIPS": false,
91-
"Region": "cn-north-1"
91+
"UseDualStack": true
9292
}
9393
},
9494
{
@@ -99,109 +99,109 @@
9999
}
100100
},
101101
"params": {
102-
"UseDualStack": false,
102+
"Region": "cn-north-1",
103103
"UseFIPS": false,
104-
"Region": "cn-north-1"
104+
"UseDualStack": false
105105
}
106106
},
107107
{
108-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
108+
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
109109
"expect": {
110-
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
110+
"endpoint": {
111+
"url": "https://securitylake-fips.us-gov-east-1.api.aws"
112+
}
111113
},
112114
"params": {
113-
"UseDualStack": true,
115+
"Region": "us-gov-east-1",
114116
"UseFIPS": true,
115-
"Region": "us-iso-east-1"
117+
"UseDualStack": true
116118
}
117119
},
118120
{
119-
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
121+
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
120122
"expect": {
121123
"endpoint": {
122-
"url": "https://securitylake-fips.us-iso-east-1.c2s.ic.gov"
124+
"url": "https://securitylake-fips.us-gov-east-1.amazonaws.com"
123125
}
124126
},
125127
"params": {
126-
"UseDualStack": false,
128+
"Region": "us-gov-east-1",
127129
"UseFIPS": true,
128-
"Region": "us-iso-east-1"
130+
"UseDualStack": false
129131
}
130132
},
131133
{
132-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
134+
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
133135
"expect": {
134-
"error": "DualStack is enabled but this partition does not support DualStack"
136+
"endpoint": {
137+
"url": "https://securitylake.us-gov-east-1.api.aws"
138+
}
135139
},
136140
"params": {
137-
"UseDualStack": true,
141+
"Region": "us-gov-east-1",
138142
"UseFIPS": false,
139-
"Region": "us-iso-east-1"
143+
"UseDualStack": true
140144
}
141145
},
142146
{
143-
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
147+
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
144148
"expect": {
145149
"endpoint": {
146-
"url": "https://securitylake.us-iso-east-1.c2s.ic.gov"
150+
"url": "https://securitylake.us-gov-east-1.amazonaws.com"
147151
}
148152
},
149153
"params": {
150-
"UseDualStack": false,
154+
"Region": "us-gov-east-1",
151155
"UseFIPS": false,
152-
"Region": "us-iso-east-1"
156+
"UseDualStack": false
153157
}
154158
},
155159
{
156-
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
160+
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
157161
"expect": {
158-
"endpoint": {
159-
"url": "https://securitylake-fips.us-east-1.api.aws"
160-
}
162+
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
161163
},
162164
"params": {
163-
"UseDualStack": true,
165+
"Region": "us-iso-east-1",
164166
"UseFIPS": true,
165-
"Region": "us-east-1"
167+
"UseDualStack": true
166168
}
167169
},
168170
{
169-
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
171+
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
170172
"expect": {
171173
"endpoint": {
172-
"url": "https://securitylake-fips.us-east-1.amazonaws.com"
174+
"url": "https://securitylake-fips.us-iso-east-1.c2s.ic.gov"
173175
}
174176
},
175177
"params": {
176-
"UseDualStack": false,
178+
"Region": "us-iso-east-1",
177179
"UseFIPS": true,
178-
"Region": "us-east-1"
180+
"UseDualStack": false
179181
}
180182
},
181183
{
182-
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
184+
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
183185
"expect": {
184-
"endpoint": {
185-
"url": "https://securitylake.us-east-1.api.aws"
186-
}
186+
"error": "DualStack is enabled but this partition does not support DualStack"
187187
},
188188
"params": {
189-
"UseDualStack": true,
189+
"Region": "us-iso-east-1",
190190
"UseFIPS": false,
191-
"Region": "us-east-1"
191+
"UseDualStack": true
192192
}
193193
},
194194
{
195-
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
195+
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
196196
"expect": {
197197
"endpoint": {
198-
"url": "https://securitylake.us-east-1.amazonaws.com"
198+
"url": "https://securitylake.us-iso-east-1.c2s.ic.gov"
199199
}
200200
},
201201
"params": {
202-
"UseDualStack": false,
202+
"Region": "us-iso-east-1",
203203
"UseFIPS": false,
204-
"Region": "us-east-1"
204+
"UseDualStack": false
205205
}
206206
},
207207
{
@@ -210,9 +210,9 @@
210210
"error": "FIPS and DualStack are enabled, but this partition does not support one or both"
211211
},
212212
"params": {
213-
"UseDualStack": true,
213+
"Region": "us-isob-east-1",
214214
"UseFIPS": true,
215-
"Region": "us-isob-east-1"
215+
"UseDualStack": true
216216
}
217217
},
218218
{
@@ -223,9 +223,9 @@
223223
}
224224
},
225225
"params": {
226-
"UseDualStack": false,
226+
"Region": "us-isob-east-1",
227227
"UseFIPS": true,
228-
"Region": "us-isob-east-1"
228+
"UseDualStack": false
229229
}
230230
},
231231
{
@@ -234,9 +234,9 @@
234234
"error": "DualStack is enabled but this partition does not support DualStack"
235235
},
236236
"params": {
237-
"UseDualStack": true,
237+
"Region": "us-isob-east-1",
238238
"UseFIPS": false,
239-
"Region": "us-isob-east-1"
239+
"UseDualStack": true
240240
}
241241
},
242242
{
@@ -247,22 +247,35 @@
247247
}
248248
},
249249
"params": {
250-
"UseDualStack": false,
250+
"Region": "us-isob-east-1",
251251
"UseFIPS": false,
252-
"Region": "us-isob-east-1"
252+
"UseDualStack": false
253253
}
254254
},
255255
{
256-
"documentation": "For custom endpoint with fips disabled and dualstack disabled",
256+
"documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
257257
"expect": {
258258
"endpoint": {
259259
"url": "https://example.com"
260260
}
261261
},
262262
"params": {
263+
"Region": "us-east-1",
264+
"UseFIPS": false,
263265
"UseDualStack": false,
266+
"Endpoint": "https://example.com"
267+
}
268+
},
269+
{
270+
"documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
271+
"expect": {
272+
"endpoint": {
273+
"url": "https://example.com"
274+
}
275+
},
276+
"params": {
264277
"UseFIPS": false,
265-
"Region": "us-east-1",
278+
"UseDualStack": false,
266279
"Endpoint": "https://example.com"
267280
}
268281
},
@@ -272,9 +285,9 @@
272285
"error": "Invalid Configuration: FIPS and custom endpoint are not supported"
273286
},
274287
"params": {
275-
"UseDualStack": false,
276-
"UseFIPS": true,
277288
"Region": "us-east-1",
289+
"UseFIPS": true,
290+
"UseDualStack": false,
278291
"Endpoint": "https://example.com"
279292
}
280293
},
@@ -284,11 +297,17 @@
284297
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
285298
},
286299
"params": {
287-
"UseDualStack": true,
288-
"UseFIPS": false,
289300
"Region": "us-east-1",
301+
"UseFIPS": false,
302+
"UseDualStack": true,
290303
"Endpoint": "https://example.com"
291304
}
305+
},
306+
{
307+
"documentation": "Missing region",
308+
"expect": {
309+
"error": "Invalid Configuration: Missing Region"
310+
}
292311
}
293312
],
294313
"version": "1.0"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,8 @@
18331833
},
18341834
"NextToken":{
18351835
"type":"string",
1836-
"pattern":"^[\\\\\\w\\-_:/.@=+]*$"
1836+
"max":2048,
1837+
"min":0
18371838
},
18381839
"NotificationConfiguration":{
18391840
"type":"structure",

0 commit comments

Comments
 (0)