Fixing template source to correct Condition role arn (#1069)

* Fixing template source to correct Condition role arn

* Rolling back to original two template approach for seperating mgmt and additional accounts

Author: rycerrat

src/core/cdk/src/assets/execution-role.template.json

@@ -92,7 +92,7 @@
                                         {
                                           "Ref": "AWS::AccountId"
                                         },
-                                        ":aws:role/",
+                                        ":role/",
                                         {
                                           "Ref": "RoleName"
                                         }

src/core/cdk/src/assets/management-execution-role.template.json

@@ -55,54 +55,7 @@
                             "Principal": {
                                 "Service": "fms.amazonaws.com"
                             }
-                        },
-                        {
-                            "Action": "sts:AssumeRole",
-                            "Effect": "Allow",
-                            "Principal": {
-                              "AWS": {
-                                "Fn::Join": [
-                                  "",
-                                  [
-                                    "arn:",
-                                    {
-                                      "Ref": "AWS::Partition"
-                                    },
-                                    ":iam::",
-                                    {
-                                      "Ref": "AWS::AccountId"
-                                    },
-                                    ":root"
-                                  ]
-                                ]
-                              }
-                            },
-                            "Condition": {
-                              "StringEquals": {
-                                "AWS:PrincipalArn": [
-                                  {
-                                    "Fn::Join": [
-                                      "",
-                                      [
-                                        "arn:",
-                                        {
-                                          "Ref": "AWS::Partition"
-                                        },
-                                        ":iam::",
-                                        {
-                                          "Ref": "AWS::AccountId"
-                                        },
-                                        ":aws:role/",
-                                        {
-                                          "Ref": "RoleName"
-                                        }
-                                      ]
-                                    ]
-                                  }
-                                ]
-                              }
-                            }
-                          }
+                        }
                     ],
                     "Version": "2012-10-17"
                 },

src/core/runtime/src/create-stack/create.ts

@@ -61,19 +61,19 @@ export const handler = async (input: CreateStackInput) => {
   console.debug(stackTemplate);
 
   // Load the template body from the given location
-  const templateBody = await getTemplateBody(stackTemplate);
+  let templateBody = await getTemplateBody(stackTemplate);
 
   /** Checks Parameters Table in DDB to see if we are in management account.
    * If so, our PBMM Pipeline role has different permissions and we use
    * a different template.
    */
 
-  // if(parametersTableName){
-  //   const accounts = await loadAccounts(parametersTableName!, dynamodb);
-  //   if((accounts.find(acc => acc.id === accountId)?.key!) === 'management'){
-  //     templateBody = await getTemplateBody(managementAccountTemplate!);
-  //   }
-  // }
+  if (parametersTableName) {
+    const accounts = await loadAccounts(parametersTableName!, dynamodb);
+    if (accounts.find(acc => acc.id === accountId)?.key! === 'management') {
+      templateBody = await getTemplateBody(managementAccountTemplate!);
+    }
+  }
 
   let cfn: CloudFormation;
   if (accountId && assumeRoleName) {