fix: static method Configurator.getEnvConfig() (#282)

* fixing static method getEnvConfig * fixing test
awslabs · Mar 21, 2023 · b2dc1f7 · b2dc1f7
1 parent dbc8bfc
commit b2dc1f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/src/config/configurator.ts b/src/config/configurator.ts
@@ -129,7 +129,8 @@ export interface GetEnvConfigProps {
 
 export class Configurator {
   public static getEnvConfig(props: GetEnvConfigProps): any {
-    return getConfig({ config: props.configPath })[props.environmentId];
+    const config = getConfig({ config: props.configPath });
+    return config.environments ? config.environments[props.environmentId] : undefined;
   }
   public readonly config: any;
   public readonly environmentId?: string;

diff --git a/test/config.test.ts b/test/config.test.ts
@@ -381,34 +381,18 @@ test("Get Env Config", () => {
 
 test("Get Env Config Static Method", () => {
   const config = Configurator.getEnvConfig({ configPath: "./test/test-config.yaml", environmentId: "dev" });
+  const nullConfig = Configurator.getEnvConfig({ configPath: "./ddk.json", environmentId: "dev" });
   const expectedDevConfig = {
-    tags: {
-      "global:foo": "bar",
-    },
-    environments: {
-      dev: {
-        account: "222222222222",
-        region: "us-east-1",
-        resources: {
-          "AWS::Lambda::Function": {
-            MemorySize: 128,
-            Runtime: "python3.8",
-          },
-        },
-        tags: { CostCenter: "2014" },
-      },
-      prod: {
-        account: "222222222222",
-        region: "us-east-1",
-        resources: {
-          "AWS::Lambda::Function": {
-            MemorySize: 1024,
-            Runtime: "python3.8",
-          },
-        },
-        tags: { CostCenter: "2015" },
+    account: "222222222222",
+    region: "us-east-1",
+    resources: {
+      "AWS::Lambda::Function": {
+        MemorySize: 128,
+        Runtime: "python3.8",
       },
     },
+    tags: { CostCenter: "2014" },
   };
   assert(config === expectedDevConfig);
+  assert(nullConfig === undefined);
 });