Fix Issue 902: Values from Leaf node is not copied over (#206)

Author: dennisseah

src/commands/infra/generate.test.ts

@@ -24,6 +24,126 @@ afterAll(() => {
   disableVerboseLogging();
 });
 
+describe("test dirIteration", () => {
+  it("parentObject and leafObject are undefined", () => {
+    const result = dirIteration(undefined, undefined);
+    expect(result).toEqual({});
+  });
+  it("parentObject is undefined", () => {
+    const leafObject = {
+      "custerName": "cluster1"
+    };
+    const result = dirIteration(undefined, leafObject);
+    expect(result).toEqual(leafObject);
+  });
+  it("leafObject is undefined", () => {
+    const parentObject = {
+      "custerName": "cluster1"
+    };
+    const result = dirIteration(parentObject, undefined);
+    expect(result).toEqual(parentObject);
+  });
+  it("one variable test", () => {
+    const parentObject = {
+      "custerName": "parent"
+    };
+    const leafObject = {
+      "custerName": "left"
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(leafObject);
+  });
+  it("one variable test, parentObject without the variable", () => {
+    const parentObject = {
+    };
+    const leafObject = {
+      "custerName": "leaf"
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(leafObject);
+  });
+  it("one variable test, leafObject without the variable", () => {
+    const parentObject = {
+      "custerName": "leaf"
+    };
+    const leafObject = {
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(parentObject);
+  });
+  it("multiple variables test", () => {
+    const parentObject = {
+      "custerName": "parent",
+      "variable1": "parent1",
+      "variable2": "parent2"
+    };
+    const leafObject = {
+      "custerName": "leaf",
+      "variable1": "leaf1",
+      "variable2": "leaf2"
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(leafObject);
+  });
+  it("multiple variables test, leafObject does not values", () => {
+    const parentObject = {
+      "custerName": "parent",
+      "variable1": "parent1",
+      "variable2": "parent2"
+    };
+    const leafObject = {
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(parentObject);
+  });
+  it("multiple variables test, parentObject does not values", () => {
+    const parentObject = {
+    };
+    const leafObject = {
+      "custerName": "leaf",
+      "variable1": "leaf1",
+      "variable2": "leaf2"
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(leafObject);
+  });
+  it("multiple variables test, parentObject has more values", () => {
+    const parentObject = {
+      "custerName": "parent",
+      "variable1": "parent1",
+      "variable2": "parent2",
+      "xextra": "xextra"
+    };
+    const leafObject = {
+      "custerName": "leaf",
+      "variable1": "leaf1",
+      "variable2": "leaf2"
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual({
+      "custerName": "leaf",
+      "variable1": "leaf1",
+      "variable2": "leaf2",
+      "xextra": "xextra"
+    });
+  });
+  it("multiple variables test, leafObject has more values", () => {
+    const parentObject = {
+      "custerName": "parent",
+      "variable1": "parent1",
+      "variable2": "parent2"
+    };
+    const leafObject = {
+      "custerName": "leaf",
+      "variable1": "leaf1",
+      "variable2": "leaf2",
+      "xextra": "xextra"
+    };
+    const result = dirIteration(parentObject, leafObject);
+    expect(result).toEqual(leafObject);
+  });
+})
+
 describe("Validate sources in definition.yaml files", () => {
   test("Validating that a provided project folder contains definition.yaml files with valid source, version, and template", async () => {
     let mockParentPath = "src/commands/infra/mocks/discovery-service";

src/commands/infra/generate.ts

@@ -329,7 +329,7 @@ export const generateConfig = async (
       }
       if (typeof parentInfraConfig !== "undefined") {
         if (leafInfraConfig) {
-          const finalDefinition = await dirIteration(
+          const finalDefinition = dirIteration(
             parentInfraConfig.variables,
             leafInfraConfig.variables
           );
@@ -345,7 +345,7 @@ export const generateConfig = async (
 
           // Create a backend.tfvars for remote backend configuration
           if (parentInfraConfig.backend && leafInfraConfig.backend) {
-            const finalBackendDefinition = await dirIteration(
+            const finalBackendDefinition = dirIteration(
               parentInfraConfig.backend,
               leafInfraConfig.backend
             );
@@ -480,24 +480,28 @@ export const singleDefinitionGeneration = async (
  * @param parentObject parent definition object
  * @param leafObject leaf definition object
  */
-export const dirIteration = async (
-  parentObject: any,
-  leafObject: any
-): Promise<string[]> => {
-  for (const parentKey in parentObject) {
-    if (parentKey) {
-      for (const leafKey in leafObject) {
-        if (parentKey === leafKey) {
-          let parentVal = parentObject[parentKey];
-          parentVal = leafObject[leafKey];
-        } else {
-          // Append to parent variables block
-          const leafVal = leafObject[leafKey];
-          parentObject[leafKey] = leafVal;
-        }
-      }
+export const dirIteration = (
+  parentObject: { [key: string]: any } | undefined,
+  leafObject: { [key: string]: any } | undefined,
+): { [key: string]: any } => {
+  if (!parentObject) {
+    if (!leafObject) {
+      return {};
     }
+    // poor man clone. can we use lodash?
+    return JSON.parse(JSON.stringify(leafObject));
+  }
+  if (!leafObject) {
+    return parentObject;
   }
+
+  // parent take leaf's value
+  Object.keys(leafObject).forEach(k => {
+    if (leafObject[k]) {
+      parentObject[k] = leafObject[k];
+    }
+  });
+
   return parentObject;
 };