Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Redis AVM's secretsExportConfiguration param to store secrets in Key Vault #4719

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cli/azd/internal/scaffold/scaffold.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ func supportingFiles(spec InfraSpec) []string {
files := []string{"/abbreviations.json"}

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")
}

Expand Down
29 changes: 0 additions & 29 deletions cli/azd/resources/scaffold/base/modules/set-redis-conn.bicep

This file was deleted.

21 changes: 8 additions & 13 deletions cli/azd/resources/scaffold/templates/resources.bicept
Original file line number Diff line number Diff line change
Expand Up @@ -389,28 +389,23 @@ module {{bicepName .Name}} 'br/public:avm/res/app/container-app:0.8.0' = {
{{- end}}

{{- if .DbRedis}}
module redis 'br/public:avm/res/cache/redis:0.3.2' = {
module redis 'br/public:avm/res/cache/redis:0.9.0' = {
name: 'redisDeployment'
params: {
// Required parameters
name: '${abbrs.cacheRedis}${resourceToken}'
// Non-required parameters
location: location
skuName: 'Basic'
{{- if .Services}}
secretsExportConfiguration: {
keyVaultResourceId: keyVault.outputs.resourceId
primaryAccessKeyName: 'REDIS-PASSWORD'
primaryConnectionStringName: 'REDIS-URL'
}
{{- end}}
}
}

{{- if .Services}}
module redisConn './modules/set-redis-conn.bicep' = {
name: 'redisConn'
params: {
name: redis.outputs.name
passwordSecretName: 'REDIS-PASSWORD'
urlSecretName: 'REDIS-URL'
keyVaultName: keyVault.outputs.name
}
}
{{- end}}
{{- end}}

{{- if .Services}}
Expand Down
Loading