From 9769790f6b26168215d010660dbdad948df79118 Mon Sep 17 00:00:00 2001 From: Jeffrey Chen Date: Mon, 13 Jan 2025 23:45:23 +0000 Subject: [PATCH] Export secrets only when there's a service to bind to --- cli/azd/internal/scaffold/scaffold.go | 7 +++---- cli/azd/resources/scaffold/templates/resources.bicept | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/azd/internal/scaffold/scaffold.go b/cli/azd/internal/scaffold/scaffold.go index f9ce4752ea9..aedbe2d3c06 100644 --- a/cli/azd/internal/scaffold/scaffold.go +++ b/cli/azd/internal/scaffold/scaffold.go @@ -68,11 +68,10 @@ func Execute( func supportingFiles(spec InfraSpec) []string { files := []string{"/abbreviations.json"} - if spec.DbRedis != nil { - files = append(files, "/modules/set-redis-conn.bicep") - } - if len(spec.Services) > 0 { + if spec.DbRedis != nil { + files = append(files, "/modules/set-redis-conn.bicep") + } files = append(files, "/modules/fetch-container-image.bicep") } diff --git a/cli/azd/resources/scaffold/templates/resources.bicept b/cli/azd/resources/scaffold/templates/resources.bicept index 26180abdc28..a22399694f6 100644 --- a/cli/azd/resources/scaffold/templates/resources.bicept +++ b/cli/azd/resources/scaffold/templates/resources.bicept @@ -91,10 +91,12 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.8.1' = { } ] {{- end}} + {{- if .Services}} secretsExportConfiguration: { keyVaultResourceId: keyVault.outputs.resourceId primaryWriteConnectionStringSecretName: 'MONGODB-URL' } + {{- end}} capabilitiesToAdd: [ 'EnableServerless' ] } } @@ -398,6 +400,7 @@ module redis 'br/public:avm/res/cache/redis:0.3.2' = { } } +{{- if .Services}} module redisConn './modules/set-redis-conn.bicep' = { name: 'redisConn' params: { @@ -408,6 +411,7 @@ module redisConn './modules/set-redis-conn.bicep' = { } } {{- end}} +{{- end}} {{- if .Services}} // Create a keyvault to store secrets