fix: fix

genstackio · Sep 21, 2024 · 47c1e1e · 47c1e1e
1 parent 244bfb8
commit 47c1e1e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/generators/v2.ts b/src/generators/v2.ts
@@ -7,12 +7,10 @@ export default async (
         regions,
         defaultRegion,
         format,
-        vars: layerVars,
     }: {
         regions: Record<string, layer_region_config>;
         defaultRegion: string;
         format: string;
-        vars?: Record<string, unknown>;
     },
     vars: Record<string, unknown>,
     _: enriched_layer_config,
@@ -40,7 +38,7 @@ export default async (
         rsuffix: '',
         rsuffix_explicit: '',
     };
-    vars = {...vars, ...layerVars, ...defaultVars};
+    vars = {...vars, ...defaultVars};
     return [
         [
             `terraform.tf`,

diff --git a/src/types.ts b/src/types.ts
@@ -38,6 +38,7 @@ export type enriched_layer_config = {
     regions?: Record<string, layer_region_config>;
     format?: string;
     version?: string;
+    vars?: Record<string, unknown>;
 };
 
 export type loggable = {

diff --git a/src/utils/generateEnvLayerFromFile.ts b/src/utils/generateEnvLayerFromFile.ts
@@ -33,7 +33,7 @@ export const generateEnvLayerFromFile = async (
             defaultRegion,
             format,
         },
-        vars,
+        {...vars, ...(layerConfig.vars || {})},
         layerConfig,
     );