diff --git a/.azure/applications/web-api-eu/main.bicep b/.azure/applications/web-api-eu/main.bicep index 2d3692d7c..dac67b98d 100644 --- a/.azure/applications/web-api-eu/main.bicep +++ b/.azure/applications/web-api-eu/main.bicep @@ -1,13 +1,22 @@ targetScope = 'resourceGroup' +@minLength(3) param imageTag string +@minLength(3) param environment string +@minLength(3) param location string +@minLength(3) +@secure() param containerAppEnvironmentId string +@minLength(3) +@secure() param appInsightConnectionString string +@minLength(3) +@secure() param appConfigurationName string - +@minLength(3) @secure() param environmentKeyVaultName string diff --git a/.azure/applications/web-api-eu/staging.bicepparam b/.azure/applications/web-api-eu/staging.bicepparam index 8b099bc74..589cc8ceb 100644 --- a/.azure/applications/web-api-eu/staging.bicepparam +++ b/.azure/applications/web-api-eu/staging.bicepparam @@ -2,10 +2,10 @@ using './main.bicep' param environment = 'staging' param location = 'norwayeast' -param imageTag = readEnvironmentVariable('IMAGE_TAG', '') +param imageTag = readEnvironmentVariable('IMAGE_TAG') // secrets -param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME', '') -param containerAppEnvironmentId = readEnvironmentVariable('CONTAINTER_APP_ENVIRONMENT_ID', '') -param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING', '') -param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME', '') +param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME') +param containerAppEnvironmentId = readEnvironmentVariable('CONTAINER_APP_ENVIRONMENT_ID') +param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING') +param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME') diff --git a/.azure/applications/web-api-eu/test.bicepparam b/.azure/applications/web-api-eu/test.bicepparam index 543e3121a..efe327b64 100644 --- a/.azure/applications/web-api-eu/test.bicepparam +++ b/.azure/applications/web-api-eu/test.bicepparam @@ -2,10 +2,10 @@ using './main.bicep' param environment = 'test' param location = 'norwayeast' -param imageTag = readEnvironmentVariable('IMAGE_TAG', '') +param imageTag = readEnvironmentVariable('IMAGE_TAG') // secrets -param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME', '') -param containerAppEnvironmentId = readEnvironmentVariable('CONTAINTER_APP_ENVIRONMENT_ID', '') -param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING', '') -param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME', '') +param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME') +param containerAppEnvironmentId = readEnvironmentVariable('CONTAINER_APP_ENVIRONMENT_ID') +param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING') +param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME') diff --git a/.azure/applications/web-api-migration-job/main.bicep b/.azure/applications/web-api-migration-job/main.bicep index ce0bd6219..f5ac3b3d1 100644 --- a/.azure/applications/web-api-migration-job/main.bicep +++ b/.azure/applications/web-api-migration-job/main.bicep @@ -1,12 +1,16 @@ targetScope = 'resourceGroup' +@minLength(3) param imageTag string - +@minLength(3) param environment string +@minLength(3) param location string +@minLength(3) +@secure() param containerAppEnvironmentId string - +@minLength(3) @secure() param adoConnectionStringSecretUri string diff --git a/.azure/applications/web-api-migration-job/staging.bicepparam b/.azure/applications/web-api-migration-job/staging.bicepparam index dd25e8e08..d4705b812 100644 --- a/.azure/applications/web-api-migration-job/staging.bicepparam +++ b/.azure/applications/web-api-migration-job/staging.bicepparam @@ -3,7 +3,7 @@ using './main.bicep' param environment = 'staging' param location = 'norwayeast' param imageTag = readEnvironmentVariable('IMAGE_TAG', '') -param containerAppEnvironmentId = readEnvironmentVariable('CONTAINTER_APP_ENVIRONMENT_ID', '') +param containerAppEnvironmentId = readEnvironmentVariable('CONTAINER_APP_ENVIRONMENT_ID', '') //secrets param adoConnectionStringSecretUri = readEnvironmentVariable('ADO_CONNECTION_STRING_SECRET_URI', '') diff --git a/.azure/applications/web-api-migration-job/test.bicepparam b/.azure/applications/web-api-migration-job/test.bicepparam index 985fd6e78..005a0c089 100644 --- a/.azure/applications/web-api-migration-job/test.bicepparam +++ b/.azure/applications/web-api-migration-job/test.bicepparam @@ -2,8 +2,8 @@ using './main.bicep' param environment = 'test' param location = 'norwayeast' -param imageTag = readEnvironmentVariable('IMAGE_TAG', '') -param containerAppEnvironmentId = readEnvironmentVariable('CONTAINTER_APP_ENVIRONMENT_ID', '') //secrets -param adoConnectionStringSecretUri = readEnvironmentVariable('ADO_CONNECTION_STRING_SECRET_URI', '') +param imageTag = readEnvironmentVariable('IMAGE_TAG') +param containerAppEnvironmentId = readEnvironmentVariable('CONTAINER_APP_ENVIRONMENT_ID') +param adoConnectionStringSecretUri = readEnvironmentVariable('ADO_CONNECTION_STRING_SECRET_URI') diff --git a/.azure/applications/web-api-so/main.bicep b/.azure/applications/web-api-so/main.bicep index ac73e5e53..bbd0007f6 100644 --- a/.azure/applications/web-api-so/main.bicep +++ b/.azure/applications/web-api-so/main.bicep @@ -1,13 +1,22 @@ targetScope = 'resourceGroup' +@minLength(1) param imageTag string +@minLength(1) param environment string +@minLength(1) param location string +@minLength(1) +@secure() param containerAppEnvironmentId string +@minLength(1) +@secure() param appInsightConnectionString string +@minLength(1) +@secure() param appConfigurationName string - +@minLength(1) @secure() param environmentKeyVaultName string diff --git a/.azure/applications/web-api-so/staging.bicepparam b/.azure/applications/web-api-so/staging.bicepparam index 8b099bc74..589cc8ceb 100644 --- a/.azure/applications/web-api-so/staging.bicepparam +++ b/.azure/applications/web-api-so/staging.bicepparam @@ -2,10 +2,10 @@ using './main.bicep' param environment = 'staging' param location = 'norwayeast' -param imageTag = readEnvironmentVariable('IMAGE_TAG', '') +param imageTag = readEnvironmentVariable('IMAGE_TAG') // secrets -param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME', '') -param containerAppEnvironmentId = readEnvironmentVariable('CONTAINTER_APP_ENVIRONMENT_ID', '') -param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING', '') -param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME', '') +param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME') +param containerAppEnvironmentId = readEnvironmentVariable('CONTAINER_APP_ENVIRONMENT_ID') +param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING') +param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME') diff --git a/.azure/applications/web-api-so/test.bicepparam b/.azure/applications/web-api-so/test.bicepparam index 543e3121a..efe327b64 100644 --- a/.azure/applications/web-api-so/test.bicepparam +++ b/.azure/applications/web-api-so/test.bicepparam @@ -2,10 +2,10 @@ using './main.bicep' param environment = 'test' param location = 'norwayeast' -param imageTag = readEnvironmentVariable('IMAGE_TAG', '') +param imageTag = readEnvironmentVariable('IMAGE_TAG') // secrets -param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME', '') -param containerAppEnvironmentId = readEnvironmentVariable('CONTAINTER_APP_ENVIRONMENT_ID', '') -param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING', '') -param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME', '') +param environmentKeyVaultName = readEnvironmentVariable('ENVIRONMENT_KEY_VAULT_NAME') +param containerAppEnvironmentId = readEnvironmentVariable('CONTAINER_APP_ENVIRONMENT_ID') +param appInsightConnectionString = readEnvironmentVariable('APP_INSIGHTS_CONNECTION_STRING') +param appConfigurationName = readEnvironmentVariable('APP_CONFIGURATION_NAME') diff --git a/.azure/infrastructure/main.bicep b/.azure/infrastructure/main.bicep index 60b8a3c05..78e8e5570 100644 --- a/.azure/infrastructure/main.bicep +++ b/.azure/infrastructure/main.bicep @@ -1,16 +1,22 @@ targetScope = 'subscription' @minLength(3) param environment string +@minLength(3) param location string + param keyVaultSourceKeys array @secure() +@minLength(3) param dialogportenPgAdminPassword string @secure() +@minLength(3) param sourceKeyVaultSubscriptionId string @secure() +@minLength(3) param sourceKeyVaultResourceGroup string @secure() +@minLength(3) param sourceKeyVaultName string @allowed( diff --git a/.azure/infrastructure/production.bicepparam b/.azure/infrastructure/production.bicepparam index 7a915942c..ec213e81d 100644 --- a/.azure/infrastructure/production.bicepparam +++ b/.azure/infrastructure/production.bicepparam @@ -5,10 +5,10 @@ param location = 'norwayeast' 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 dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') +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 00b5f04a1..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 dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') +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 7fc58ba73..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 dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') +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 0c8051eb9..72915de7c 100644 --- a/.azure/infrastructure/test.bicepparam +++ b/.azure/infrastructure/test.bicepparam @@ -2,13 +2,13 @@ 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', '') -param sourceKeyVaultSubscriptionId = readEnvironmentVariable('SOURCE_KEY_VAULT_SUBSCRIPTION_ID', '') -param sourceKeyVaultResourceGroup = readEnvironmentVariable('SOURCE_KEY_VAULT_RESOURCE_GROUP', '') -param sourceKeyVaultName = readEnvironmentVariable('SOURCE_KEY_VAULT_NAME', '') +param dialogportenPgAdminPassword = readEnvironmentVariable('PG_ADMIN_PASSWORD') +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/.github/workflows/action-build-and-test.yml b/.github/workflows/action-build-and-test.yml index b6c571d35..033f7d0c8 100644 --- a/.github/workflows/action-build-and-test.yml +++ b/.github/workflows/action-build-and-test.yml @@ -1,4 +1,4 @@ -name: BuildAndTest +name: Build and test .NET on: workflow_dispatch: diff --git a/.github/workflows/ci-cd-pull-request.yml b/.github/workflows/ci-cd-pull-request.yml index 7f6bf4eaf..462910caf 100644 --- a/.github/workflows/ci-cd-pull-request.yml +++ b/.github/workflows/ci-cd-pull-request.yml @@ -1,4 +1,4 @@ -name: CI/CD PullRequest +name: CI/CD Pull Request on: pull_request: