Skip to content

Commit 9d74e9d

Browse files
committed
Bring back app.yaml env generation
1 parent f8e51ab commit 9d74e9d

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

cmd/apps/init.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ type templateVars struct {
292292
WorkspaceHost string
293293
Bundle tmplBundle
294294
DotEnv dotEnvVars
295+
AppEnv string
295296
// Plugins maps plugin name to its metadata
296297
// Missing keys return nil, enabling {{if .plugins.analytics}} conditionals.
297298
Plugins map[string]*pluginVar
@@ -803,6 +804,7 @@ func runCreate(ctx context.Context, opts createOptions) error {
803804
Content: generator.GenerateDotEnv(selectedPluginList, genConfig),
804805
Example: generator.GenerateDotEnvExample(selectedPluginList),
805806
},
807+
AppEnv: generator.GenerateAppEnv(selectedPluginList, genConfig),
806808
Plugins: plugins,
807809
}
808810

@@ -1213,6 +1215,7 @@ func templateData(vars templateVars) map[string]any {
12131215
"content": vars.DotEnv.Content,
12141216
"example": vars.DotEnv.Example,
12151217
},
1218+
"appEnv": vars.AppEnv,
12161219

12171220
// backward compatibility (deprecated)
12181221
"variables": vars.Bundle.Variables,
@@ -1225,6 +1228,7 @@ func templateData(vars templateVars) map[string]any {
12251228
"workspace_host": vars.WorkspaceHost,
12261229
"plugin_imports": pluginImports,
12271230
"plugin_usages": pluginUsages,
1231+
"app_env": vars.AppEnv,
12281232
}
12291233
}
12301234

cmd/apps/init_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ func testVars() templateVars {
8585
Content: "WH_ID=abc123",
8686
Example: "WH_ID=your_sql_warehouse_id",
8787
},
88+
AppEnv: "- name: SQL_WAREHOUSE_ID\n valueFrom: sql_warehouse",
8889
Plugins: map[string]*pluginVar{"analytics": {}},
8990
}
9091
}
@@ -148,6 +149,11 @@ func TestExecuteTemplateBackwardCompat(t *testing.T) {
148149
input: "{{.plugin_usages}}",
149150
expected: "analytics()",
150151
},
152+
{
153+
name: "app_env",
154+
input: "{{.app_env}}",
155+
expected: "- name: SQL_WAREHOUSE_ID\n valueFrom: sql_warehouse",
156+
},
151157
}
152158

153159
for _, tt := range tests {
@@ -218,6 +224,11 @@ func TestExecuteTemplateNewKeys(t *testing.T) {
218224
input: `{{if .plugins.nonexistent}}yes{{end}}`,
219225
expected: "",
220226
},
227+
{
228+
name: "appEnv",
229+
input: "{{.appEnv}}",
230+
expected: "- name: SQL_WAREHOUSE_ID\n valueFrom: sql_warehouse",
231+
},
221232
}
222233

223234
for _, tt := range tests {

0 commit comments

Comments
 (0)