Skip to content

Commit 1b65f6a

Browse files
Fixed regex patterns for ARN fields.
1 parent dc524ae commit 1b65f6a

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

generator/ServiceModels/pcs/pcs-2023-02-10.api.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
"type":"string",
369369
"max":1011,
370370
"min":1,
371-
"pattern":"arn:aws*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\\-]+"
371+
"pattern":"arn:aws.*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\\-]+"
372372
},
373373
"BootstrapId":{
374374
"type":"string",
@@ -848,7 +848,7 @@
848848
},
849849
"InstanceProfileArn":{
850850
"type":"string",
851-
"pattern":"arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/.{1,128}"
851+
"pattern":"arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/[\\w+=,.@-]{1,128}"
852852
},
853853
"Integer":{
854854
"type":"integer",

generator/ServiceModels/pcs/pcs-2023-02-10.normal.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@
401401
"type":"string",
402402
"max":1011,
403403
"min":1,
404-
"pattern":"arn:aws*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\\-]+"
404+
"pattern":"arn:aws.*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\\-]+"
405405
},
406406
"BootstrapId":{
407407
"type":"string",
@@ -1168,7 +1168,7 @@
11681168
},
11691169
"InstanceProfileArn":{
11701170
"type":"string",
1171-
"pattern":"arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/.{1,128}"
1171+
"pattern":"arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/[\\w+=,.@-]{1,128}"
11721172
},
11731173
"Integer":{
11741174
"type":"integer",

generator/ServiceModels/pcs/pcs-2023-02-10.smoke2.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
{
22
"version" : 2,
33
"testCases" : [ {
4-
"id" : "GetQueueFailure_AccessDeniedException",
5-
"operationName" : "GetQueue",
4+
"id" : "ListClustersSuccess",
5+
"operationName" : "ListClusters",
6+
"input" : { },
7+
"expectation" : {
8+
"success" : { }
9+
},
10+
"config" : {
11+
"region" : "us-west-2",
12+
"useFips" : false,
13+
"useDualstack" : false,
14+
"useAccountIdRouting" : true
15+
}
16+
}, {
17+
"id" : "ListComputeNodeGroups_AccessDeniedException",
18+
"operationName" : "ListComputeNodeGroups",
619
"input" : {
7-
"clusterIdentifier" : "pcs_donotexist",
8-
"queueIdentifier" : "pcs_donotexist"
20+
"clusterIdentifier" : "pcs_donotexist"
921
},
1022
"expectation" : {
1123
"failure" : {
@@ -54,21 +66,8 @@
5466
"useAccountIdRouting" : true
5567
}
5668
}, {
57-
"id" : "ListClustersSuccess",
58-
"operationName" : "ListClusters",
59-
"input" : { },
60-
"expectation" : {
61-
"success" : { }
62-
},
63-
"config" : {
64-
"region" : "us-west-2",
65-
"useFips" : false,
66-
"useDualstack" : false,
67-
"useAccountIdRouting" : true
68-
}
69-
}, {
70-
"id" : "ListComputeNodeGroups_AccessDeniedException",
71-
"operationName" : "ListComputeNodeGroups",
69+
"id" : "GetCluster_AccessDeniedException",
70+
"operationName" : "GetCluster",
7271
"input" : {
7372
"clusterIdentifier" : "pcs_donotexist"
7473
},
@@ -84,10 +83,11 @@
8483
"useAccountIdRouting" : true
8584
}
8685
}, {
87-
"id" : "GetCluster_AccessDeniedException",
88-
"operationName" : "GetCluster",
86+
"id" : "GetQueueFailure_AccessDeniedException",
87+
"operationName" : "GetQueue",
8988
"input" : {
90-
"clusterIdentifier" : "pcs_donotexist"
89+
"clusterIdentifier" : "pcs_donotexist",
90+
"queueIdentifier" : "pcs_donotexist"
9191
},
9292
"expectation" : {
9393
"failure" : {

sdk/code-analysis/ServiceAnalysis/PCS/Generated/PropertyValueRules.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</property-value-rule>
3333
<property-value-rule>
3434
<property>Amazon.PCS.Model.CreateComputeNodeGroupRequest.IamInstanceProfileArn</property>
35-
<pattern>arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/.{1,128}</pattern>
35+
<pattern>arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/[\w+=,.@-]{1,128}</pattern>
3636
</property-value-rule>
3737
<property-value-rule>
3838
<property>Amazon.PCS.Model.CreateQueueRequest.ClientToken</property>
@@ -131,7 +131,7 @@
131131
<property>Amazon.PCS.Model.ListTagsForResourceRequest.ResourceArn</property>
132132
<min>1</min>
133133
<max>1011</max>
134-
<pattern>arn:aws*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\-]+</pattern>
134+
<pattern>arn:aws.*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\-]+</pattern>
135135
</property-value-rule>
136136
<property-value-rule>
137137
<property>Amazon.PCS.Model.RegisterComputeNodeGroupInstanceRequest.BootstrapId</property>
@@ -147,13 +147,13 @@
147147
<property>Amazon.PCS.Model.TagResourceRequest.ResourceArn</property>
148148
<min>1</min>
149149
<max>1011</max>
150-
<pattern>arn:aws*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\-]+</pattern>
150+
<pattern>arn:aws.*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\-]+</pattern>
151151
</property-value-rule>
152152
<property-value-rule>
153153
<property>Amazon.PCS.Model.UntagResourceRequest.ResourceArn</property>
154154
<min>1</min>
155155
<max>1011</max>
156-
<pattern>arn:aws*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\-]+</pattern>
156+
<pattern>arn:aws.*:pcs:.*:[0-9]{12}:.*/[a-z0-9_\-]+</pattern>
157157
</property-value-rule>
158158
<property-value-rule>
159159
<property>Amazon.PCS.Model.UpdateComputeNodeGroupRequest.AmiId</property>
@@ -174,7 +174,7 @@
174174
</property-value-rule>
175175
<property-value-rule>
176176
<property>Amazon.PCS.Model.UpdateComputeNodeGroupRequest.IamInstanceProfileArn</property>
177-
<pattern>arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/.{1,128}</pattern>
177+
<pattern>arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/[\w+=,.@-]{1,128}</pattern>
178178
</property-value-rule>
179179
<property-value-rule>
180180
<property>Amazon.PCS.Model.UpdateQueueRequest.ClientToken</property>
@@ -213,7 +213,7 @@
213213
</property-value-rule>
214214
<property-value-rule>
215215
<property>Amazon.PCS.Model.ComputeNodeGroup.IamInstanceProfileArn</property>
216-
<pattern>arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/.{1,128}</pattern>
216+
<pattern>arn:aws([a-zA-Z-]{0,10})?:iam::[0-9]{12}:instance-profile/[\w+=,.@-]{1,128}</pattern>
217217
</property-value-rule>
218218
<property-value-rule>
219219
<property>Amazon.PCS.Model.ComputeNodeGroup.Name</property>

0 commit comments

Comments
 (0)