File tree Expand file tree Collapse file tree 3 files changed +3
-4
lines changed
Expand file tree Collapse file tree 3 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -7,12 +7,10 @@ export default async (
77 regions,
88 defaultRegion,
99 format,
10- vars : layerVars ,
1110 } : {
1211 regions : Record < string , layer_region_config > ;
1312 defaultRegion : string ;
1413 format : string ;
15- vars ?: Record < string , unknown > ;
1614 } ,
1715 vars : Record < string , unknown > ,
1816 _ : enriched_layer_config ,
@@ -40,7 +38,7 @@ export default async (
4038 rsuffix : '' ,
4139 rsuffix_explicit : '' ,
4240 } ;
43- vars = { ...vars , ...layerVars , ... defaultVars } ;
41+ vars = { ...vars , ...defaultVars } ;
4442 return [
4543 [
4644 `terraform.tf` ,
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ export type enriched_layer_config = {
3838 regions ?: Record < string , layer_region_config > ;
3939 format ?: string ;
4040 version ?: string ;
41+ vars ?: Record < string , unknown > ;
4142} ;
4243
4344export type loggable = {
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ export const generateEnvLayerFromFile = async (
3333 defaultRegion,
3434 format,
3535 } ,
36- vars ,
36+ { ... vars , ... ( layerConfig . vars || { } ) } ,
3737 layerConfig ,
3838 ) ;
3939
You can’t perform that action at this time.
0 commit comments