From 75c75b66e05c9f43d2f19713e15dcea7845e4a3d Mon Sep 17 00:00:00 2001
From: Hammerbeck <andreas.hammerbeck@digdir.no>
Date: Mon, 17 Jun 2024 10:41:35 +0200
Subject: [PATCH] fix database access for migration job

---
 .azure/applications/migration/main.bicep | 13 +++++++++++++
 .azure/modules/migrationJob/main.bicep   |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.azure/applications/migration/main.bicep b/.azure/applications/migration/main.bicep
index 9647a012..39cd6d5c 100644
--- a/.azure/applications/migration/main.bicep
+++ b/.azure/applications/migration/main.bicep
@@ -26,6 +26,19 @@ module addKeyvaultRead '../../modules/keyvault/addReaderRoles.bicep' = {
   }
 }
 
+module databaseAccess '../../modules/postgreSql/AddAdministrationAccess.bicep' = {
+  name: 'databaseAccess'
+  dependsOn: [
+    addKeyvaultRead // Timing issue
+  ]
+  params: {
+    tenantId: userAssignedIdentity.properties.tenantId
+    principalId: userAssignedIdentity.properties.principalId
+    appName: userAssignedIdentity.name
+    namePrefix: namePrefix
+  }
+}
+
 var secrets = [
   {
     name: migrationConnectionStringName
diff --git a/.azure/modules/migrationJob/main.bicep b/.azure/modules/migrationJob/main.bicep
index ab34a86d..a0e4cd20 100644
--- a/.azure/modules/migrationJob/main.bicep
+++ b/.azure/modules/migrationJob/main.bicep
@@ -5,7 +5,7 @@ param containerAppEnvId string
 param command string[]
 param environmentVariables { name: string, value: string?, secretRef: string? }[] = []
 param secrets { name: string, keyVaultUrl: string, identity: string }[] = []
-param volumes { name: string, storageName: string, storageType: string, mountOptions: string}[] = []
+param volumes { name: string, storageName: string, storageType: string, mountOptions: string }[] = []
 param volumeMounts { mountPath: string, subPath: string, volumeName: string }[] = []
 param principalId string
 
@@ -44,5 +44,4 @@ resource job 'Microsoft.App/jobs@2024-03-01' = {
     }
   }
 }
-
 output name string = job.name