Merge branch 'master' of github.com:org-formation/org-formation-cli

org-formation · Jun 23, 2022 · 074e206 · 074e206
2 parents 5076200 + 7a39815
commit 074e206
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-organization-formation",
-  "version": "1.0.1-beta.1",
+  "version": "1.0.0",
   "description": "Infrastructure as code solution for AWS Organizations",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "@types/nunjucks": "^3.1.4",
     "@types/rc": "^1.1.0",
     "archiver": "^5.3.1",
-    "aws-sdk": "^2.895.0",
+    "aws-sdk": "^2.1160.0",
     "commander": "^2.20.0",
     "ini": "^1.3.5",
     "js-yaml": "^4.0.0",

diff --git a/src/org-binder/org-tasks-provider.ts b/src/org-binder/org-tasks-provider.ts
@@ -42,7 +42,6 @@ export class TaskProvider {
     public createRootCreateTasks(resource: OrganizationRootResource, hash: string, mirror?: boolean): IBuildTask[] {
         const that = this;
         const tasks: IBuildTask[] = [];
-        let partitionId: string;
         let createPartitionOrganizationRootTask: IBuildTask;
         const createOrganizationRootTask: IBuildTask = {
             type: resource.type,
@@ -53,7 +52,6 @@ export class TaskProvider {
             },
         };
         tasks.push(createOrganizationRootTask);
-        const physicalId = createOrganizationRootTask.result;
         if (mirror) {
             createPartitionOrganizationRootTask = {
                 type: resource.type,
@@ -64,15 +62,14 @@ export class TaskProvider {
                 },
             };
             tasks.push(createPartitionOrganizationRootTask);
-            partitionId = createPartitionOrganizationRootTask.result;
         }
 
         for (const attachedSCP of resource.serviceControlPolicies) {
-            const attachSCPTask: IBuildTask = this.createAttachSCPTask(resource, attachedSCP, that, () => physicalId, IS_COMMERCIAL);
+            const attachSCPTask: IBuildTask = this.createAttachSCPTask(resource, attachedSCP, that, () => createOrganizationRootTask.result, IS_COMMERCIAL);
             attachSCPTask.dependentTasks = [createOrganizationRootTask];
             tasks.push(attachSCPTask);
             if (mirror) {
-                const attachPartitionSCPTask: IBuildTask = this.createAttachSCPTask(resource, attachedSCP, that, () => partitionId, IS_PARTITION);
+                const attachPartitionSCPTask: IBuildTask = this.createAttachSCPTask(resource, attachedSCP, that, () => createPartitionOrganizationRootTask.result, IS_PARTITION);
                 attachPartitionSCPTask.dependentTasks = [createPartitionOrganizationRootTask];
                 tasks.push(attachPartitionSCPTask);
             }
@@ -88,8 +85,8 @@ export class TaskProvider {
                     type: resource.type,
                     logicalId: resource.logicalId,
                     lastCommittedHash: hash,
-                    physicalId,
-                    partitionId,
+                    physicalId: createOrganizationRootTask.result,
+                    partitionId: createPartitionOrganizationRootTask.result,
                 });
             },
         };

diff --git a/src/parser/validator.ts b/src/parser/validator.ts
@@ -136,7 +136,7 @@ export class Validator {
             throw new OrgFormationError(`expected Region to be a string or string[], found ${typeof binding.Region} (${binding.Region})`);
 
         }
-        Validator.ThrowForUnknownAttribute(binding, id, 'OrganizationalUnit', 'Account', 'ExcludeAccount', 'Region', 'IncludeMasterAccount', 'AccountsWithTag');
+        Validator.ThrowForUnknownAttribute(binding, id, 'OrganizationalUnit', 'Account', 'ExcludeAccount', 'ExcludeOrganizationalUnit', 'Region', 'IncludeMasterAccount', 'AccountsWithTag');
     }
 
     public static ThrowForUnknownAttribute(obj: any, id: string, ...knownAttributes: string[]): void {