From 2809c9d9552ea019dd9d0432a332e865d83ab04c Mon Sep 17 00:00:00 2001 From: Are Almaas Date: Tue, 6 Feb 2024 12:46:06 +0100 Subject: [PATCH] cleanup --- .azure/infrastructure/main.bicep | 2 +- .azure/infrastructure/production.bicepparam | 6 +++--- .azure/infrastructure/soak.bicepparam | 8 ++++---- .azure/infrastructure/staging.bicepparam | 8 ++++---- .azure/infrastructure/test.bicepparam | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.azure/infrastructure/main.bicep b/.azure/infrastructure/main.bicep index 90cbc0c99..78e8e5570 100644 --- a/.azure/infrastructure/main.bicep +++ b/.azure/infrastructure/main.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' param environment string @minLength(3) param location string -@minLength(3) + param keyVaultSourceKeys array @secure() diff --git a/.azure/infrastructure/production.bicepparam b/.azure/infrastructure/production.bicepparam index 28cdaddb2..ec213e81d 100644 --- a/.azure/infrastructure/production.bicepparam +++ b/.azure/infrastructure/production.bicepparam @@ -6,9 +6,9 @@ param keyVaultSourceKeys = json(readEnvironmentVariable('KEY_VAULT_SOURCE_KEYS', // secrets param dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') -param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEYVAULT_SUBSCRIPTION_ID') -param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEYVAULT_RESOURCE_GROUP') -param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEYVAULT_NAME') +param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEY_VAULT_SUBSCRIPTION_ID') +param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEY_VAULT_RESOURCE_GROUP') +param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEY_VAULT_NAME') // SKUs param keyVaultSKUName = 'standard' diff --git a/.azure/infrastructure/soak.bicepparam b/.azure/infrastructure/soak.bicepparam index ee2824455..effbfebd5 100644 --- a/.azure/infrastructure/soak.bicepparam +++ b/.azure/infrastructure/soak.bicepparam @@ -2,13 +2,13 @@ using './main.bicep' param environment = 'soak' param location = 'norwayeast' -param keyVaultSourceKeys = json(readEnvironmentVariable('KEYVAULT_SOURCE_KEYS')) +param keyVaultSourceKeys = json(readEnvironmentVariable('KEY_VAULT_SOURCE_KEYS')) // secrets param dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') -param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEYVAULT_SUBSCRIPTION_ID') -param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEYVAULT_RESOURCE_GROUP') -param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEYVAULT_NAME') +param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEY_VAULT_SUBSCRIPTION_ID') +param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEY_VAULT_RESOURCE_GROUP') +param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEY_VAULT_NAME') // SKUs param keyVaultSKUName = 'standard' diff --git a/.azure/infrastructure/staging.bicepparam b/.azure/infrastructure/staging.bicepparam index 43d1b0305..301897e84 100644 --- a/.azure/infrastructure/staging.bicepparam +++ b/.azure/infrastructure/staging.bicepparam @@ -2,13 +2,13 @@ using './main.bicep' param environment = 'staging' param location = 'norwayeast' -param keyVaultSourceKeys = json(readEnvironmentVariable('KEYVAULT_SOURCE_KEYS')) +param keyVaultSourceKeys = json(readEnvironmentVariable('KEY_VAULT_SOURCE_KEYS')) // secrets param dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') -param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEYVAULT_SUBSCRIPTION_ID') -param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEYVAULT_RESOURCE_GROUP') -param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEYVAULT_NAME') +param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEY_VAULT_SUBSCRIPTION_ID') +param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEY_VAULT_RESOURCE_GROUP') +param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEY_VAULT_NAME') // SKUs param keyVaultSKUName = 'standard' diff --git a/.azure/infrastructure/test.bicepparam b/.azure/infrastructure/test.bicepparam index ee239275b..72915de7c 100644 --- a/.azure/infrastructure/test.bicepparam +++ b/.azure/infrastructure/test.bicepparam @@ -2,7 +2,7 @@ using './main.bicep' param environment = 'test' param location = 'norwayeast' -param keyVaultSourceKeys = json(readEnvironmentVariable('KEYVAULT_SOURCE_KEYS', '[]')) +param keyVaultSourceKeys = json(readEnvironmentVariable('KEY_VAULT_SOURCE_KEYS', '[]')) // secrets param dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD')