Skip to content

Commit b7604ab

Browse files
Changed the minimum length of clusterIdentifier, computeNodeGroupIdentifier, and queueIdentifier to 3.
1 parent 44c046c commit b7604ab

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
},
372372
"ClusterIdentifier":{
373373
"type":"string",
374-
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})"
374+
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})"
375375
},
376376
"ClusterList":{
377377
"type":"list",
@@ -487,7 +487,7 @@
487487
},
488488
"ComputeNodeGroupIdentifier":{
489489
"type":"string",
490-
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})"
490+
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})"
491491
},
492492
"ComputeNodeGroupList":{
493493
"type":"list",
@@ -938,7 +938,7 @@
938938
},
939939
"QueueIdentifier":{
940940
"type":"string",
941-
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})"
941+
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})"
942942
},
943943
"QueueList":{
944944
"type":"list",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
},
422422
"ClusterIdentifier":{
423423
"type":"string",
424-
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})"
424+
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})"
425425
},
426426
"ClusterList":{
427427
"type":"list",
@@ -617,7 +617,7 @@
617617
},
618618
"ComputeNodeGroupIdentifier":{
619619
"type":"string",
620-
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})"
620+
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})"
621621
},
622622
"ComputeNodeGroupList":{
623623
"type":"list",
@@ -1329,7 +1329,7 @@
13291329
},
13301330
"QueueIdentifier":{
13311331
"type":"string",
1332-
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})"
1332+
"pattern":"(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})"
13331333
},
13341334
"QueueList":{
13351335
"type":"list",

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
{
22
"version" : 2,
33
"testCases" : [ {
4-
"id" : "ListClustersSuccess",
5-
"operationName" : "ListClusters",
6-
"input" : { },
4+
"id" : "GetCluster_AccessDeniedException",
5+
"operationName" : "GetCluster",
6+
"input" : {
7+
"clusterIdentifier" : "pcs_donotexist"
8+
},
79
"expectation" : {
8-
"success" : { }
10+
"failure" : {
11+
"errorId" : "AccessDeniedException"
12+
}
913
},
1014
"config" : {
1115
"region" : "us-west-2",
@@ -14,11 +18,11 @@
1418
"useAccountIdRouting" : true
1519
}
1620
}, {
17-
"id" : "GetComputeNodeGroup_AccessDeniedException",
18-
"operationName" : "GetComputeNodeGroup",
21+
"id" : "GetQueueFailure_AccessDeniedException",
22+
"operationName" : "GetQueue",
1923
"input" : {
2024
"clusterIdentifier" : "pcs_donotexist",
21-
"computeNodeGroupIdentifier" : "pcs_donotexist"
25+
"queueIdentifier" : "pcs_donotexist"
2226
},
2327
"expectation" : {
2428
"failure" : {
@@ -32,10 +36,11 @@
3236
"useAccountIdRouting" : true
3337
}
3438
}, {
35-
"id" : "ListComputeNodeGroups_AccessDeniedException",
36-
"operationName" : "ListComputeNodeGroups",
39+
"id" : "GetComputeNodeGroup_AccessDeniedException",
40+
"operationName" : "GetComputeNodeGroup",
3741
"input" : {
38-
"clusterIdentifier" : "pcs_donotexist"
42+
"clusterIdentifier" : "pcs_donotexist",
43+
"computeNodeGroupIdentifier" : "pcs_donotexist"
3944
},
4045
"expectation" : {
4146
"failure" : {
@@ -66,16 +71,11 @@
6671
"useAccountIdRouting" : true
6772
}
6873
}, {
69-
"id" : "GetQueueFailure_AccessDeniedException",
70-
"operationName" : "GetQueue",
71-
"input" : {
72-
"clusterIdentifier" : "pcs_donotexist",
73-
"queueIdentifier" : "pcs_donotexist"
74-
},
74+
"id" : "ListClustersSuccess",
75+
"operationName" : "ListClusters",
76+
"input" : { },
7577
"expectation" : {
76-
"failure" : {
77-
"errorId" : "AccessDeniedException"
78-
}
78+
"success" : { }
7979
},
8080
"config" : {
8181
"region" : "us-west-2",
@@ -84,8 +84,8 @@
8484
"useAccountIdRouting" : true
8585
}
8686
}, {
87-
"id" : "GetCluster_AccessDeniedException",
88-
"operationName" : "GetCluster",
87+
"id" : "ListComputeNodeGroups_AccessDeniedException",
88+
"operationName" : "ListComputeNodeGroups",
8989
"input" : {
9090
"clusterIdentifier" : "pcs_donotexist"
9191
},

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</property-value-rule>
2323
<property-value-rule>
2424
<property>Amazon.PCS.Model.CreateComputeNodeGroupRequest.ClusterIdentifier</property>
25-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
25+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
2626
</property-value-rule>
2727
<property-value-rule>
2828
<property>Amazon.PCS.Model.CreateComputeNodeGroupRequest.ComputeNodeGroupName</property>
@@ -41,7 +41,7 @@
4141
</property-value-rule>
4242
<property-value-rule>
4343
<property>Amazon.PCS.Model.CreateQueueRequest.ClusterIdentifier</property>
44-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
44+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
4545
</property-value-rule>
4646
<property-value-rule>
4747
<property>Amazon.PCS.Model.CreateQueueRequest.QueueName</property>
@@ -56,7 +56,7 @@
5656
</property-value-rule>
5757
<property-value-rule>
5858
<property>Amazon.PCS.Model.DeleteClusterRequest.ClusterIdentifier</property>
59-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
59+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
6060
</property-value-rule>
6161
<property-value-rule>
6262
<property>Amazon.PCS.Model.DeleteComputeNodeGroupRequest.ClientToken</property>
@@ -65,11 +65,11 @@
6565
</property-value-rule>
6666
<property-value-rule>
6767
<property>Amazon.PCS.Model.DeleteComputeNodeGroupRequest.ClusterIdentifier</property>
68-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
68+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
6969
</property-value-rule>
7070
<property-value-rule>
7171
<property>Amazon.PCS.Model.DeleteComputeNodeGroupRequest.ComputeNodeGroupIdentifier</property>
72-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})</pattern>
72+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})</pattern>
7373
</property-value-rule>
7474
<property-value-rule>
7575
<property>Amazon.PCS.Model.DeleteQueueRequest.ClientToken</property>
@@ -78,31 +78,31 @@
7878
</property-value-rule>
7979
<property-value-rule>
8080
<property>Amazon.PCS.Model.DeleteQueueRequest.ClusterIdentifier</property>
81-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
81+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
8282
</property-value-rule>
8383
<property-value-rule>
8484
<property>Amazon.PCS.Model.DeleteQueueRequest.QueueIdentifier</property>
85-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})</pattern>
85+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})</pattern>
8686
</property-value-rule>
8787
<property-value-rule>
8888
<property>Amazon.PCS.Model.GetClusterRequest.ClusterIdentifier</property>
89-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
89+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
9090
</property-value-rule>
9191
<property-value-rule>
9292
<property>Amazon.PCS.Model.GetComputeNodeGroupRequest.ClusterIdentifier</property>
93-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
93+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
9494
</property-value-rule>
9595
<property-value-rule>
9696
<property>Amazon.PCS.Model.GetComputeNodeGroupRequest.ComputeNodeGroupIdentifier</property>
97-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})</pattern>
97+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})</pattern>
9898
</property-value-rule>
9999
<property-value-rule>
100100
<property>Amazon.PCS.Model.GetQueueRequest.ClusterIdentifier</property>
101-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
101+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
102102
</property-value-rule>
103103
<property-value-rule>
104104
<property>Amazon.PCS.Model.GetQueueRequest.QueueIdentifier</property>
105-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})</pattern>
105+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})</pattern>
106106
</property-value-rule>
107107
<property-value-rule>
108108
<property>Amazon.PCS.Model.ListClustersRequest.MaxResults</property>
@@ -111,7 +111,7 @@
111111
</property-value-rule>
112112
<property-value-rule>
113113
<property>Amazon.PCS.Model.ListComputeNodeGroupsRequest.ClusterIdentifier</property>
114-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
114+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
115115
</property-value-rule>
116116
<property-value-rule>
117117
<property>Amazon.PCS.Model.ListComputeNodeGroupsRequest.MaxResults</property>
@@ -120,7 +120,7 @@
120120
</property-value-rule>
121121
<property-value-rule>
122122
<property>Amazon.PCS.Model.ListQueuesRequest.ClusterIdentifier</property>
123-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
123+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
124124
</property-value-rule>
125125
<property-value-rule>
126126
<property>Amazon.PCS.Model.ListQueuesRequest.MaxResults</property>
@@ -141,7 +141,7 @@
141141
</property-value-rule>
142142
<property-value-rule>
143143
<property>Amazon.PCS.Model.RegisterComputeNodeGroupInstanceRequest.ClusterIdentifier</property>
144-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
144+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
145145
</property-value-rule>
146146
<property-value-rule>
147147
<property>Amazon.PCS.Model.TagResourceRequest.ResourceArn</property>
@@ -166,11 +166,11 @@
166166
</property-value-rule>
167167
<property-value-rule>
168168
<property>Amazon.PCS.Model.UpdateComputeNodeGroupRequest.ClusterIdentifier</property>
169-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
169+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
170170
</property-value-rule>
171171
<property-value-rule>
172172
<property>Amazon.PCS.Model.UpdateComputeNodeGroupRequest.ComputeNodeGroupIdentifier</property>
173-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})</pattern>
173+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})</pattern>
174174
</property-value-rule>
175175
<property-value-rule>
176176
<property>Amazon.PCS.Model.UpdateComputeNodeGroupRequest.IamInstanceProfileArn</property>
@@ -183,11 +183,11 @@
183183
</property-value-rule>
184184
<property-value-rule>
185185
<property>Amazon.PCS.Model.UpdateQueueRequest.ClusterIdentifier</property>
186-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})</pattern>
186+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})</pattern>
187187
</property-value-rule>
188188
<property-value-rule>
189189
<property>Amazon.PCS.Model.UpdateQueueRequest.QueueIdentifier</property>
190-
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})</pattern>
190+
<pattern>(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})</pattern>
191191
</property-value-rule>
192192
<property-value-rule>
193193
<property>Amazon.PCS.Model.ClusterSlurmConfiguration.ScaleDownIdleTimeInSeconds</property>

0 commit comments

Comments
 (0)