Skip to content

Commit 7adb21d

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Update IAM Role ARN Validation to Support Role Paths
1 parent 9db7b09 commit 7adb21d

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎generator/ServiceModels/neptune-graph/neptune-graph-2023-11-29.api.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,7 @@
21042104
},
21052105
"RoleArn":{
21062106
"type":"string",
2107-
"pattern":"arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]*"
2107+
"pattern":"arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)(/[\\w+=,.@-]+)+"
21082108
},
21092109
"SecurityGroupId":{
21102110
"type":"string",

‎generator/ServiceModels/neptune-graph/neptune-graph-2023-11-29.normal.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3104,7 +3104,7 @@
31043104
},
31053105
"RoleArn":{
31063106
"type":"string",
3107-
"pattern":"arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]*"
3107+
"pattern":"arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)(/[\\w+=,.@-]+)+"
31083108
},
31093109
"SecurityGroupId":{
31103110
"type":"string",

‎sdk/code-analysis/ServiceAnalysis/NeptuneGraph/Generated/PropertyValueRules.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</property-value-rule>
2222
<property-value-rule>
2323
<property>Amazon.NeptuneGraph.Model.CancelExportTaskResponse.RoleArn</property>
24-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
24+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
2525
</property-value-rule>
2626
<property-value-rule>
2727
<property>Amazon.NeptuneGraph.Model.CancelExportTaskResponse.TaskId</property>
@@ -37,7 +37,7 @@
3737
</property-value-rule>
3838
<property-value-rule>
3939
<property>Amazon.NeptuneGraph.Model.CancelImportTaskResponse.RoleArn</property>
40-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
40+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
4141
</property-value-rule>
4242
<property-value-rule>
4343
<property>Amazon.NeptuneGraph.Model.CancelImportTaskResponse.TaskId</property>
@@ -158,15 +158,15 @@
158158
</property-value-rule>
159159
<property-value-rule>
160160
<property>Amazon.NeptuneGraph.Model.CreateGraphUsingImportTaskRequest.RoleArn</property>
161-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
161+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
162162
</property-value-rule>
163163
<property-value-rule>
164164
<property>Amazon.NeptuneGraph.Model.CreateGraphUsingImportTaskResponse.GraphId</property>
165165
<pattern>g-[a-z0-9]{10}</pattern>
166166
</property-value-rule>
167167
<property-value-rule>
168168
<property>Amazon.NeptuneGraph.Model.CreateGraphUsingImportTaskResponse.RoleArn</property>
169-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
169+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
170170
</property-value-rule>
171171
<property-value-rule>
172172
<property>Amazon.NeptuneGraph.Model.CreateGraphUsingImportTaskResponse.TaskId</property>
@@ -287,7 +287,7 @@
287287
</property-value-rule>
288288
<property-value-rule>
289289
<property>Amazon.NeptuneGraph.Model.GetExportTaskResponse.RoleArn</property>
290-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
290+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
291291
</property-value-rule>
292292
<property-value-rule>
293293
<property>Amazon.NeptuneGraph.Model.GetExportTaskResponse.TaskId</property>
@@ -365,7 +365,7 @@
365365
</property-value-rule>
366366
<property-value-rule>
367367
<property>Amazon.NeptuneGraph.Model.GetImportTaskResponse.RoleArn</property>
368-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
368+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
369369
</property-value-rule>
370370
<property-value-rule>
371371
<property>Amazon.NeptuneGraph.Model.GetImportTaskResponse.TaskId</property>
@@ -589,7 +589,7 @@
589589
</property-value-rule>
590590
<property-value-rule>
591591
<property>Amazon.NeptuneGraph.Model.StartExportTaskRequest.RoleArn</property>
592-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
592+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
593593
</property-value-rule>
594594
<property-value-rule>
595595
<property>Amazon.NeptuneGraph.Model.StartExportTaskResponse.Destination</property>
@@ -608,7 +608,7 @@
608608
</property-value-rule>
609609
<property-value-rule>
610610
<property>Amazon.NeptuneGraph.Model.StartExportTaskResponse.RoleArn</property>
611-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
611+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
612612
</property-value-rule>
613613
<property-value-rule>
614614
<property>Amazon.NeptuneGraph.Model.StartExportTaskResponse.TaskId</property>
@@ -620,15 +620,15 @@
620620
</property-value-rule>
621621
<property-value-rule>
622622
<property>Amazon.NeptuneGraph.Model.StartImportTaskRequest.RoleArn</property>
623-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
623+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
624624
</property-value-rule>
625625
<property-value-rule>
626626
<property>Amazon.NeptuneGraph.Model.StartImportTaskResponse.GraphId</property>
627627
<pattern>g-[a-z0-9]{10}</pattern>
628628
</property-value-rule>
629629
<property-value-rule>
630630
<property>Amazon.NeptuneGraph.Model.StartImportTaskResponse.RoleArn</property>
631-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
631+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
632632
</property-value-rule>
633633
<property-value-rule>
634634
<property>Amazon.NeptuneGraph.Model.StartImportTaskResponse.TaskId</property>
@@ -711,7 +711,7 @@
711711
</property-value-rule>
712712
<property-value-rule>
713713
<property>Amazon.NeptuneGraph.Model.ExportTaskSummary.RoleArn</property>
714-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
714+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
715715
</property-value-rule>
716716
<property-value-rule>
717717
<property>Amazon.NeptuneGraph.Model.ExportTaskSummary.TaskId</property>
@@ -763,7 +763,7 @@
763763
</property-value-rule>
764764
<property-value-rule>
765765
<property>Amazon.NeptuneGraph.Model.ImportTaskSummary.RoleArn</property>
766-
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)/[\w+=,.@-]*</pattern>
766+
<pattern>arn:aws[^:]*:iam::\d{12}:(role|role/service-role)(/[\w+=,.@-]+)+</pattern>
767767
</property-value-rule>
768768
<property-value-rule>
769769
<property>Amazon.NeptuneGraph.Model.ImportTaskSummary.TaskId</property>

0 commit comments

Comments
 (0)