Merge branch 'main' into feat/return-revision-header

Altinn · Jan 7, 2025 · 1c15d04 · 1c15d04
2 parents 19d7fad + 554fc8b
commit 1c15d04
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 293 deletions.
diff --git a/.azure/infrastructure/main.bicep b/.azure/infrastructure/main.bicep
@@ -51,9 +51,6 @@ param appConfigurationSku AppConfigurationSku
 import { Sku as AppInsightsSku } from '../modules/applicationInsights/create.bicep'
 param appInsightsSku AppInsightsSku
 
-import { Sku as SlackNotifierSku } from '../modules/functionApp/slackNotifier.bicep'
-param slackNotifierSku SlackNotifierSku
-
 import { Sku as PostgresSku } from '../modules/postgreSql/create.bicep'
 import { StorageConfiguration as PostgresStorageConfig } from '../modules/postgreSql/create.bicep'
 
@@ -262,19 +259,6 @@ module copyEnvironmentSecrets '../modules/keyvault/copySecrets.bicep' = {
   }
 }
 
-module slackNotifier '../modules/functionApp/slackNotifier.bicep' = {
-  name: 'slackNotifier'
-  scope: resourceGroup
-  params: {
-    location: location
-    keyVaultName: environmentKeyVault.outputs.name
-    namePrefix: namePrefix
-    applicationInsightsName: appInsights.outputs.appInsightsName
-    sku: slackNotifierSku
-    tags: tags
-  }
-}
-
 module containerAppIdentity '../modules/managedIdentity/main.bicep' = {
   scope: resourceGroup
   name: 'containerAppIdentity'
@@ -299,15 +283,6 @@ module containerAppEnv '../modules/containerAppEnv/main.bicep' = {
   }
 }
 
-module appInsightsReaderAccessPolicy '../modules/applicationInsights/addReaderRoles.bicep' = {
-  scope: resourceGroup
-  name: 'appInsightsReaderAccessPolicy'
-  params: {
-    appInsightsName: appInsights.outputs.appInsightsName
-    principalIds: [slackNotifier.outputs.functionAppPrincipalId]
-  }
-}
-
 module postgresConnectionStringAppConfig '../modules/appConfiguration/upsertKeyValue.bicep' = {
   scope: resourceGroup
   name: 'AppConfig_Add_DialogDbConnectionString'
@@ -332,15 +307,6 @@ module redisConnectionStringAppConfig '../modules/appConfiguration/upsertKeyValu
   }
 }
 
-module keyVaultReaderAccessPolicy '../modules/keyvault/addReaderRoles.bicep' = {
-  scope: resourceGroup
-  name: 'keyVaultReaderAccessPolicyFunctions'
-  params: {
-    keyvaultName: environmentKeyVault.outputs.name
-    principalIds: [slackNotifier.outputs.functionAppPrincipalId]
-  }
-}
-
 output resourceGroupName string = resourceGroup.name
 output containerAppEnvId string = containerAppEnv.outputs.containerAppEnvId
 output environmentKeyVaultName string = environmentKeyVault.outputs.name
diff --git a/.azure/infrastructure/prod.bicepparam b/.azure/infrastructure/prod.bicepparam
@@ -24,11 +24,6 @@ param appConfigurationSku = {
 param appInsightsSku = {
   name: 'PerGB2018'
 }
-param slackNotifierSku = {
-  storageAccountName: 'Standard_LRS'
-  applicationServicePlanName: 'Y1'
-  applicationServicePlanTier: 'Dynamic'
-}
 param postgresConfiguration = {
   sku: {
     name: 'Standard_D8ads_v5'

diff --git a/.azure/infrastructure/staging.bicepparam b/.azure/infrastructure/staging.bicepparam
@@ -24,11 +24,6 @@ param appConfigurationSku = {
 param appInsightsSku = {
   name: 'PerGB2018'
 }
-param slackNotifierSku = {
-  storageAccountName: 'Standard_LRS'
-  applicationServicePlanName: 'Y1'
-  applicationServicePlanTier: 'Dynamic'
-}
 param postgresConfiguration = {
   sku: {
     name: 'Standard_D4ads_v5'

diff --git a/.azure/infrastructure/test.bicepparam b/.azure/infrastructure/test.bicepparam
@@ -24,11 +24,6 @@ param appConfigurationSku = {
 param appInsightsSku = {
   name: 'PerGB2018'
 }
-param slackNotifierSku = {
-  storageAccountName: 'Standard_LRS'
-  applicationServicePlanName: 'Y1'
-  applicationServicePlanTier: 'Dynamic'
-}
 param postgresConfiguration = {
   sku: {
     name: 'Standard_B2s'

diff --git a/.azure/infrastructure/yt01.bicepparam b/.azure/infrastructure/yt01.bicepparam
@@ -24,11 +24,6 @@ param appConfigurationSku = {
 param appInsightsSku = {
   name: 'PerGB2018'
 }
-param slackNotifierSku = {
-  storageAccountName: 'Standard_LRS'
-  applicationServicePlanName: 'Y1'
-  applicationServicePlanTier: 'Dynamic'
-}
 param postgresConfiguration = {
   sku: {
     name: 'Standard_D8ads_v5'

diff --git a/.azure/modules/functionApp/appSettings.bicep b/.azure/modules/functionApp/appSettings.bicep
diff --git a/.azure/modules/functionApp/slackNotifier.bicep b/.azure/modules/functionApp/slackNotifier.bicep