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.

Sign up for GitHub

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

fix(janitor): ensure Redis is configured correctly #1182

Merged
merged 3 commits into from
Sep 24, 2024
Merged

fix(janitor): ensure Redis is configured correctly #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
170b862
chore: remove unused redis property
arealmaas Sep 24, 2024
d302929
chore: remove unused redis property
arealmaas Sep 24, 2024
c6e9ae8
cleanup
arealmaas Sep 24, 2024
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
14 changes: 12 additions & 2 deletions .azure/applications/sync-subject-resource-mappings-job/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ var containerAppEnvVars = [
name: 'Infrastructure__DialogDbConnectionString'
secretRef: 'dbconnectionstring'
}
{
name: 'Infrastructure__Redis__ConnectionString'
secretRef: 'redisconnectionstring'
}
{
name: 'DOTNET_ENVIRONMENT'
value: environment
Expand All @@ -61,13 +65,19 @@ var containerAppEnvVars = [
}
]

// Base URL for accessing secrets in the Key Vault
// https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/bicep-functions-deployment#example-1
var keyVaultUrl = 'https://${environmentKeyVaultName}${az.environment().suffixes.keyvaultDns}/secrets/dialogportenAdoConnectionString'
var keyVaultBaseUrl = 'https://${environmentKeyVaultName}${az.environment().suffixes.keyvaultDns}/secrets'

var secrets = [
{
name: 'dbconnectionstring'
keyVaultUrl: keyVaultUrl
keyVaultUrl: '${keyVaultBaseUrl}/dialogportenAdoConnectionString'
identity: 'System'
}
{
name: 'redisconnectionstring'
keyVaultUrl: '${keyVaultBaseUrl}/dialogportenRedisConnectionString'
identity: 'System'
}
arealmaas marked this conversation as resolved.
Show resolved Hide resolved
]
Expand Down
2 changes: 1 addition & 1 deletion src/Digdir.Domain.Dialogporten.Janitor/appsettings.Development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Infrastructure": {
"Redis": {
"Enabled": false
"ConnectionString": "localhost:6379"
},
"DialogDbConnectionString": "TODO: Add to local secrets",
oskogstad marked this conversation as resolved.
Show resolved Hide resolved
"Maskinporten": {
Expand Down
2 changes: 1 addition & 1 deletion src/Digdir.Domain.Dialogporten.Janitor/appsettings.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Infrastructure": {
"Redis": {
"Enabled": false
"ConnectionString": "TODO: Add to local secrets"
},
"DialogDbConnectionString": "TODO: Add to local secrets",
"Maskinporten": {
Expand Down
2 changes: 1 addition & 1 deletion src/Digdir.Domain.Dialogporten.Janitor/appsettings.staging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Infrastructure": {
"Redis": {
"Enabled": false
"ConnectionString": "TODO: Add to local secrets"
elsand marked this conversation as resolved.
Show resolved Hide resolved
},
"DialogDbConnectionString": "TODO: Add to local secrets",
"Maskinporten": {
Expand Down
2 changes: 1 addition & 1 deletion src/Digdir.Domain.Dialogporten.Janitor/appsettings.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Infrastructure": {
"Redis": {
"Enabled": false
"ConnectionString": "TODO: Add to local secrets"
},
"DialogDbConnectionString": "TODO: Add to local secrets",
"Maskinporten": {
Expand Down
Loading