fix database access for migration job

Altinn · Jun 17, 2024 · 75c75b6 · 75c75b6
1 parent 70cdab4
commit 75c75b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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