awslabs / aws-bootstrap-kit

Apache License 2.0
104 stars 22 forks source link

Fix execution ordering #18

Closed flochaz closed 3 years ago

flochaz commented 3 years ago

Description

Calling Organizations.createOrganizationalUnit can't be run at the same time as Organizations.EnableAWSServiceAccess.

This PR enforce sequential call.

CDK diff

[~] AWS::IAM::Policy orgStack/SharedServices-OU/OUCustomResource/CustomResourcePolicy SharedServicesOUOUCustomResourceCustomResourcePolicyC1D4EF7A 
 ├─ [~] DependsOn
 │   └─ @@ -1,10 +1,10 @@
 │      [ ] [
 │      [-]   "OrganizationEnableMultiAccountsSetupCustomResourcePolicy7029FCCB",
 │      [-]   "OrganizationEnableMultiAccountsSetup904A48F4",
 │      [-]   "OrganizationEnableSSMAWSServiceAccessCustomResourcePolicy98992817",
 │      [-]   "OrganizationEnableSSMAWSServiceAccess032F165F",
 │      [-]   "OrganizationorgCustomResourceCustomResourcePolicy9F017A5C",
 │      [-]   "OrganizationorgCustomResource63E35F37",
 │      [-]   "OrganizationRootCustomResourceCustomResourcePolicyC9B8B67A",
 │      [-]   "OrganizationRootCustomResource9416950B"
 │      [+]   "OrganizationTrailEnableAWSServiceAccessCustomResourcePolicy11A32EEC",
 │      [+]   "OrganizationTrailEnableAWSServiceAccessA9BA486B",
 │      [+]   "OrganizationTrailOrganizationTrailBucketPolicy427FC147",
 │      [+]   "OrganizationTrailOrganizationTrailBucket31446F20",
 │      [+]   "OrganizationTrailOrganizationTrailCreateCustomResourcePolicyA8E212DA",
 │      [+]   "OrganizationTrailOrganizationTrailCreate61482CB5",
 │      [+]   "OrganizationTrailOrganizationTrailStartLoggingCustomResourcePolicyF222534F",
 │      [+]   "OrganizationTrailOrganizationTrailStartLoggingFE28E066"
 │      [ ] ]
[~] Custom::AWS orgStack/SharedServices-OU/OUCustomResource/Resource SharedServicesOUOUCustomResource6F12B6BA 
 ├─ [~] DependsOn
 │   └─ @@ -1,11 +1,11 @@
 │      [ ] [
 │      [-]   "OrganizationEnableMultiAccountsSetupCustomResourcePolicy7029FCCB",
 │      [-]   "OrganizationEnableMultiAccountsSetup904A48F4",
 │      [-]   "OrganizationEnableSSMAWSServiceAccessCustomResourcePolicy98992817",
 │      [-]   "OrganizationEnableSSMAWSServiceAccess032F165F",
 │      [-]   "OrganizationorgCustomResourceCustomResourcePolicy9F017A5C",
 │      [-]   "OrganizationorgCustomResource63E35F37",
 │      [-]   "OrganizationRootCustomResourceCustomResourcePolicyC9B8B67A",
 │      [-]   "OrganizationRootCustomResource9416950B",
 │      [+]   "OrganizationTrailEnableAWSServiceAccessCustomResourcePolicy11A32EEC",
 │      [+]   "OrganizationTrailEnableAWSServiceAccessA9BA486B",
 │      [+]   "OrganizationTrailOrganizationTrailBucketPolicy427FC147",
 │      [+]   "OrganizationTrailOrganizationTrailBucket31446F20",
 │      [+]   "OrganizationTrailOrganizationTrailCreateCustomResourcePolicyA8E212DA",
 │      [+]   "OrganizationTrailOrganizationTrailCreate61482CB5",
 │      [+]   "OrganizationTrailOrganizationTrailStartLoggingCustomResourcePolicyF222534F",
 │      [+]   "OrganizationTrailOrganizationTrailStartLoggingFE28E066",
 │      [ ]   "SharedServicesOUOUCustomResourceCustomResourcePolicyC1D4EF7A"
 │      [ ] ]

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.