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

chore: wrapped appsettings object with secure() decorator #465

Closed
wants to merge 5 commits into from
Closed

chore: wrapped appsettings object with secure() decorator #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1c8353
Added @secure() for container app settings
juliamuiruri4 Jun 3, 2024
71604a3
chore: Update Azure resource versions to latest stable releases
juliamuiruri4 Jun 25, 2024
584b004
Merge pull request #1 from juliamuiruri4/bicep-updates
juliamuiruri4 Jun 26, 2024
c6afc9b
Update Azure resource versions to latest stable releases 2
juliamuiruri4 Jun 27, 2024
f4350b0
Merge pull request #2 from juliamuiruri4/bicep-updates
juliamuiruri4 Jun 27, 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
12 changes: 6 additions & 6 deletions infra/app/apim-api.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ param apiBackendUrl string

var apiPolicyContent = replace(loadTextContent('apim-api-policy.xml'), '{origin}', webFrontendUrl)

resource restApi 'Microsoft.ApiManagement/service/apis@2021-12-01-preview' = {
resource restApi 'Microsoft.ApiManagement/service/apis@2023-05-01-preview' = {
name: apiName
parent: apimService
properties: {
Expand All @@ -41,7 +41,7 @@ resource restApi 'Microsoft.ApiManagement/service/apis@2021-12-01-preview' = {
}
}

resource apiPolicy 'Microsoft.ApiManagement/service/apis/policies@2021-12-01-preview' = {
resource apiPolicy 'Microsoft.ApiManagement/service/apis/policies@2023-05-01-preview' = {
name: 'policy'
parent: restApi
properties: {
Expand All @@ -50,7 +50,7 @@ resource apiPolicy 'Microsoft.ApiManagement/service/apis/policies@2021-12-01-pre
}
}

resource apiDiagnostics 'Microsoft.ApiManagement/service/apis/diagnostics@2021-12-01-preview' = {
resource apiDiagnostics 'Microsoft.ApiManagement/service/apis/diagnostics@2023-05-01-preview' = {
name: 'applicationinsights'
parent: restApi
properties: {
Expand Down Expand Up @@ -91,7 +91,7 @@ resource apiDiagnostics 'Microsoft.ApiManagement/service/apis/diagnostics@2021-1
}
}

resource apimProduct 'Microsoft.ApiManagement/service/products@2022-08-01' = {
resource apimProduct 'Microsoft.ApiManagement/service/products@2023-05-01-preview' = {
name: 'apim-api-product'
parent: apimService
properties: {
Expand All @@ -104,11 +104,11 @@ resource apimProduct 'Microsoft.ApiManagement/service/products@2022-08-01' = {
}
}

resource apimService 'Microsoft.ApiManagement/service@2021-08-01' existing = {
resource apimService 'Microsoft.ApiManagement/service@2023-05-01-preview' existing = {
name: name
}

resource apimLogger 'Microsoft.ApiManagement/service/loggers@2021-12-01-preview' existing = {
resource apimLogger 'Microsoft.ApiManagement/service/loggers@2023-05-01-preview' existing = {
name: 'app-insights-logger'
parent: apimService
}
Expand Down
12 changes: 6 additions & 6 deletions infra/app/apim-stripe.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ param apiBackendUrl string

var apiPolicyContent = replace(loadTextContent('apim-api-policy.xml'), '{origin}', webFrontendUrl)

resource restApi 'Microsoft.ApiManagement/service/apis@2021-12-01-preview' = {
resource restApi 'Microsoft.ApiManagement/service/apis@2023-05-01-preview' = {
name: apiName
parent: apimService
properties: {
Expand All @@ -41,7 +41,7 @@ resource restApi 'Microsoft.ApiManagement/service/apis@2021-12-01-preview' = {
}
}

resource apiPolicy 'Microsoft.ApiManagement/service/apis/policies@2021-12-01-preview' = {
resource apiPolicy 'Microsoft.ApiManagement/service/apis/policies@2023-05-01-preview' = {
name: 'policy'
parent: restApi
properties: {
Expand All @@ -50,7 +50,7 @@ resource apiPolicy 'Microsoft.ApiManagement/service/apis/policies@2021-12-01-pre
}
}

resource apiDiagnostics 'Microsoft.ApiManagement/service/apis/diagnostics@2021-12-01-preview' = {
resource apiDiagnostics 'Microsoft.ApiManagement/service/apis/diagnostics@2023-05-01-preview' = {
name: 'applicationinsights'
parent: restApi
properties: {
Expand Down Expand Up @@ -91,7 +91,7 @@ resource apiDiagnostics 'Microsoft.ApiManagement/service/apis/diagnostics@2021-1
}
}

resource apimProduct 'Microsoft.ApiManagement/service/products@2022-08-01' = {
resource apimProduct 'Microsoft.ApiManagement/service/products@2023-05-01-preview' = {
name: 'apim-product'
parent: apimService
properties: {
Expand All @@ -102,11 +102,11 @@ resource apimProduct 'Microsoft.ApiManagement/service/products@2022-08-01' = {
}
}

resource apimService 'Microsoft.ApiManagement/service@2021-08-01' existing = {
resource apimService 'Microsoft.ApiManagement/service@2023-05-01-preview' existing = {
name: name
}

resource apimLogger 'Microsoft.ApiManagement/service/loggers@2021-12-01-preview' existing = {
resource apimLogger 'Microsoft.ApiManagement/service/loggers@2023-05-01-preview' existing = {
name: 'app-insights-logger'
parent: apimService
}
2 changes: 1 addition & 1 deletion infra/app/blog.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' existing
name: applicationInsightsName
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: keyVaultName
}

Expand Down
4 changes: 2 additions & 2 deletions infra/app/cms.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' existing
name: applicationInsightsName
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-11-01' existing = {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: keyVaultName
}

resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' existing = {
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' existing = {
name: storageAccountName
}

Expand Down
2 changes: 1 addition & 1 deletion infra/app/events.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ module events '../core/pubsub/event-grid.bicep' = {
}
}

resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' existing = {
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' existing = {
name: storageAccountName
}
4 changes: 2 additions & 2 deletions infra/app/notifications-backend.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' existing
name: applicationInsightsName
}

resource awps 'Microsoft.SignalRService/webPubSub@2023-02-01' existing = {
resource awps 'Microsoft.SignalRService/webPubSub@2023-08-01-preview' existing = {
name: notificationsServiceName
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: keyVaultName
}

Expand Down
6 changes: 3 additions & 3 deletions infra/app/portal-backend.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ param useAPIM bool
param portalName string
param apiServiceName string

resource portalApimProperties 'Microsoft.Web/staticSites/linkedBackends@2022-03-01' = {
resource portalApimProperties 'Microsoft.Web/staticSites/linkedBackends@2022-09-01' = {
parent: portal
name: name

Expand All @@ -20,11 +20,11 @@ resource portalApimProperties 'Microsoft.Web/staticSites/linkedBackends@2022-03-
}
}

resource portal 'Microsoft.Web/staticSites@2022-03-01' existing = {
resource portal 'Microsoft.Web/staticSites@2022-09-01' existing = {
name: portalName
}

resource apimService 'Microsoft.ApiManagement/service@2021-08-01' existing = {
resource apimService 'Microsoft.ApiManagement/service@2023-05-01-preview' existing = {
name: name
}

Expand Down
6 changes: 3 additions & 3 deletions infra/core/database/cosmos/cosmos-account.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param keyVaultName string
@allowed([ 'GlobalDocumentDB', 'MongoDB', 'Parse' ])
param kind string

resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-08-15' = {
resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
name: name
kind: kind
location: location
Expand All @@ -30,15 +30,15 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-08-15' = {
}
}

resource cosmosConnectionString 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
resource cosmosConnectionString 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
parent: keyVault
name: connectionStringKey
properties: {
value: connectionString
}
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: keyVaultName
}

Expand Down
2 changes: 1 addition & 1 deletion infra/core/database/cosmos/mongo/cosmos-mongo-db.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module cosmos 'cosmos-mongo-account.bicep' = {
}
}

resource database 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2022-08-15' = {
resource database 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2024-05-15' = {
name: '${accountName}/${databaseName}'
tags: tags
properties: {
Expand Down
1 change: 1 addition & 0 deletions infra/core/database/cosmos/sql/cosmos-sql-account.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module cosmos '../../cosmos/cosmos-account.bicep' = {
tags: tags
keyVaultName: keyVaultName
kind: 'GlobalDocumentDB'
connectionStringKey: ''
}
}

Expand Down
2 changes: 1 addition & 1 deletion infra/core/database/cosmos/sql/cosmos-sql-db.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module cosmos 'cosmos-sql-account.bicep' = {
}
}

resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2022-05-15' = {
resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2024-05-15' = {
name: '${accountName}/${databaseName}'
properties: {
resource: { id: databaseName }
Expand Down
4 changes: 2 additions & 2 deletions infra/core/database/cosmos/sql/cosmos-sql-role-assign.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ param accountName string
param roleDefinitionId string
param principalId string = ''

resource role 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2022-05-15' = {
resource role 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2024-05-15' = {
parent: cosmos
name: guid(roleDefinitionId, principalId, cosmos.id)
properties: {
Expand All @@ -13,6 +13,6 @@ resource role 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2022-05-
}
}

resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-08-15' existing = {
resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' existing = {
name: accountName
}
4 changes: 2 additions & 2 deletions infra/core/database/cosmos/sql/cosmos-sql-role-def.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
param accountName string

resource roleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2022-08-15' = {
resource roleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2024-05-15' = {
parent: cosmos
name: guid(cosmos.id, accountName, 'sql-role')
properties: {
Expand All @@ -22,7 +22,7 @@ resource roleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinition
}
}

resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-08-15' existing = {
resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' existing = {
name: accountName
}

Expand Down
6 changes: 3 additions & 3 deletions infra/core/database/postgresql/flexibleserver.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ param keyVaultName string
param version string

// Latest official version 2022-12-01 does not have Bicep types available
resource postgresServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = {
resource postgresServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-03-01-preview' = {
location: location
tags: tags
name: name
Expand Down Expand Up @@ -63,15 +63,15 @@ resource postgresServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' =

}

resource postgresPassword 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
resource postgresPassword 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
parent: keyVault
name: administratorLoginPasswordKey
properties: {
value: administratorLoginPassword
}
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: keyVaultName
}

Expand Down
12 changes: 6 additions & 6 deletions infra/core/database/sqlserver/sqlserver.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ param sqlAdminPassword string
@secure()
param appUserPassword string

resource sqlServer 'Microsoft.Sql/servers@2022-05-01-preview' = {
resource sqlServer 'Microsoft.Sql/servers@2023-05-01-preview' = {
name: name
location: location
tags: tags
Expand Down Expand Up @@ -42,7 +42,7 @@ resource sqlServer 'Microsoft.Sql/servers@2022-05-01-preview' = {
}
}

resource sqlDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
resource sqlDeploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
name: '${name}-deployment-script'
location: location
kind: 'AzureCLI'
Expand Down Expand Up @@ -96,31 +96,31 @@ SCRIPT_END
}
}

resource sqlAdminPasswordSecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
resource sqlAdminPasswordSecret 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
parent: keyVault
name: 'sqlAdminPassword'
properties: {
value: sqlAdminPassword
}
}

resource appUserPasswordSecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
resource appUserPasswordSecret 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
parent: keyVault
name: 'appUserPassword'
properties: {
value: appUserPassword
}
}

resource sqlAzureConnectionStringSercret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
resource sqlAzureConnectionStringSercret 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
parent: keyVault
name: connectionStringKey
properties: {
value: '${connectionString}; Password=${appUserPassword}'
}
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: keyVaultName
}

Expand Down
2 changes: 1 addition & 1 deletion infra/core/gateway/apim.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ resource apimService 'Microsoft.ApiManagement/service@2021-08-01' = {
}
}

resource apimLogger 'Microsoft.ApiManagement/service/loggers@2021-12-01-preview' = if (!empty(applicationInsightsName)) {
resource apimLogger 'Microsoft.ApiManagement/service/loggers@2023-05-01-preview' = if (!empty(applicationInsightsName)) {
name: 'app-insights-logger'
parent: apimService
properties: {
Expand Down
4 changes: 2 additions & 2 deletions infra/core/host/aks-agent-pool.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ param name string
@description('The agent pool configuration')
param config object

resource aksCluster 'Microsoft.ContainerService/managedClusters@2022-11-02-preview' existing = {
resource aksCluster 'Microsoft.ContainerService/managedClusters@2024-03-02-preview' existing = {
name: clusterName
}

resource nodePool 'Microsoft.ContainerService/managedClusters/agentPools@2022-11-02-preview' = {
resource nodePool 'Microsoft.ContainerService/managedClusters/agentPools@2024-03-02-preview' = {
parent: aksCluster
name: name
properties: config
Expand Down
2 changes: 1 addition & 1 deletion infra/core/host/aks.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var addOnsConfig = union(
)

// Link to existing log analytics workspace when available
resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2021-12-01-preview' existing = if (!empty(logAnalyticsName)) {
resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = if (!empty(logAnalyticsName)) {
name: logAnalyticsName
}

Expand Down
5 changes: 3 additions & 2 deletions infra/core/host/appservice.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ param kind string = 'app,linux'
param allowedOrigins array = []
param alwaysOn bool = true
param appCommandLine string = ''
@secure()
param appSettings object = {}
param clientAffinityEnabled bool = false
param enableOryxBuild bool = contains(kind, 'linux')
Expand All @@ -35,7 +36,7 @@ param use32BitWorkerProcess bool = false
param ftpsState string = 'FtpsOnly'
param healthCheckPath string = ''

resource appService 'Microsoft.Web/sites@2022-03-01' = {
resource appService 'Microsoft.Web/sites@2022-09-01' = {
name: name
location: location
tags: tags
Expand Down Expand Up @@ -88,7 +89,7 @@ resource appService 'Microsoft.Web/sites@2022-03-01' = {
}
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = if (!(empty(keyVaultName))) {
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = if (!(empty(keyVaultName))) {
name: keyVaultName
}

Expand Down
Loading
Loading