chore(azure): restructure bicep files

Altinn · Mar 14, 2024 · 838aacf · 838aacf
1 parent 86567b3
commit 838aacf
Show file tree

Hide file tree

Showing 28 changed files with 22 additions and 143 deletions.
diff --git a/.azure/applications/.gitkeep b/.azure/applications/.gitkeep
@@ -0,0 +1 @@
+# Applications will be added here
diff --git a/.azure/deployBicep.ps1 b/.azure/deployBicep.ps1
diff --git a/.azure/main.bicep → .azure/infrastructure/main.bicep b/.azure/main.bicep → .azure/infrastructure/main.bicep
@@ -18,7 +18,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = {
     location: location
 }
 
-module keyVaultModule 'keyvault/create.bicep' = {
+module keyVaultModule '../modules/keyvault/create.bicep' = {
     scope: resourceGroup
     name: 'keyVault'
     params: {
@@ -28,7 +28,7 @@ module keyVaultModule 'keyvault/create.bicep' = {
     }
 }
 
-module appConfiguration 'appConfiguration/create.bicep' = {
+module appConfiguration '../modules/appConfiguration/create.bicep' = {
     scope: resourceGroup
     name: 'appConfiguration'
     params: {
@@ -37,7 +37,7 @@ module appConfiguration 'appConfiguration/create.bicep' = {
     }
 }
 
-module appInsights 'applicationInsights/create.bicep' = {
+module appInsights '../modules/applicationInsights/create.bicep' = {
     scope: resourceGroup
     name: 'appInsights'
     params: {
@@ -53,7 +53,7 @@ resource srcKeyVaultResource 'Microsoft.KeyVault/vaults@2022-11-01' existing = {
 }
 
 // Create resources with dependencies to other resources
-module postgresql 'postgreSql/create.bicep' = {
+module postgresql '../modules/postgreSql/create.bicep' = {
     scope: resourceGroup
     name: 'postgresql'
     params: {
@@ -66,7 +66,7 @@ module postgresql 'postgreSql/create.bicep' = {
     }
 }
 
-module copySecret 'keyvault/copySecrets.bicep' = {
+module copySecret '../modules/keyvault/copySecrets.bicep' = {
     scope: resourceGroup
     name: 'copySecrets'
     params: {
@@ -79,7 +79,7 @@ module copySecret 'keyvault/copySecrets.bicep' = {
     }
 }
 
-module migrationJob 'migrationJob/create.bicep' = {
+module migrationJob '../modules/migrationJob/create.bicep' = {
     scope: resourceGroup
     name: 'migrationJob'
     params: {
@@ -129,7 +129,7 @@ module migrationJob 'migrationJob/create.bicep' = {
     }
 }
 
-module appConfigConfigurations 'appConfiguration/upsertKeyValue.bicep' = {
+module appConfigConfigurations '../modules/appConfiguration/upsertKeyValue.bicep' = {
     scope: resourceGroup
     name: 'AppConfig_Add_DialogDbConnectionString'
     params: {
@@ -150,7 +150,7 @@ module appConfigConfigurations 'appConfiguration/upsertKeyValue.bicep' = {
 //     }
 // }
 
-module keyVaultReaderAccessPolicy 'keyvault/addReaderRoles.bicep' = {
+module keyVaultReaderAccessPolicy '../modules/keyvault/addReaderRoles.bicep' = {
     scope: resourceGroup
     name: 'keyVaultReaderAccessPolicy'
     params: {
@@ -169,7 +169,7 @@ module keyVaultReaderAccessPolicy 'keyvault/addReaderRoles.bicep' = {
 //     }
 // }
 
-module initContainerApp 'containerApp/init.bicep' = {
+module initContainerApp '../modules/containerApp/init.bicep' = {
     scope: resourceGroup
     name: 'initContainerApp'
     params: {
@@ -180,7 +180,7 @@ module initContainerApp 'containerApp/init.bicep' = {
     }
 
 }
-module createMECertificate 'containerApp/createMECertificate.bicep' = {
+module createMECertificate '../modules/containerApp/createMECertificate.bicep' = {
     dependsOn: [ initContainerApp ]
     scope: resourceGroup
     name: 'createMECertificate'
@@ -189,7 +189,7 @@ module createMECertificate 'containerApp/createMECertificate.bicep' = {
         location: location
     }
 }
-module containerApp 'containerApp/addNECertufucateToContainer.bicep' = {
+module containerApp '../modules/containerApp/addNECertufucateToContainer.bicep' = {
     dependsOn: [ createMECertificate ]
     scope: resourceGroup
     name: 'containerApp'
@@ -245,15 +245,15 @@ module containerApp 'containerApp/addNECertufucateToContainer.bicep' = {
 
 }
 
-module customContainerAppRole 'customRoles/create.bicep' = {
+module customContainerAppRole '../modules/customRoles/create.bicep' = {
     scope: resourceGroup
     name: 'customContainerAppRole'
     params: {
         assignableScope: resourceGroup.id
     }
 }
 
-module assignContainerAppJobRoles 'customRoles/assign.bicep' = {
+module assignContainerAppJobRoles '../modules/customRoles/assign.bicep' = {
     scope: resourceGroup
     name: 'assignContainerAppJobRoles'
     params: {
@@ -262,7 +262,7 @@ module assignContainerAppJobRoles 'customRoles/assign.bicep' = {
     }
 }
 
-module assignConfigReaderRole 'customRoles/assign.bicep' = {
+module assignConfigReaderRole '../modules/customRoles/assign.bicep' = {
     scope: resourceGroup
     name: 'assignConfigReaderRole'
     params: {
@@ -271,7 +271,7 @@ module assignConfigReaderRole 'customRoles/assign.bicep' = {
     }
 }
 
-module appConfigReaderAccessPolicy 'appConfiguration/addReaderRoles.bicep' = {
+module appConfigReaderAccessPolicy '../modules/appConfiguration/addReaderRoles.bicep' = {
     scope: resourceGroup
     name: 'appConfigReaderAccessPolicy'
     params: {

diff --git a/.azure/main.parameters.json → .azure/infrastructure/main.parameters.json b/.azure/main.parameters.json → .azure/infrastructure/main.parameters.json
diff --git a/.azure/appConfiguration/addReaderRoles.bicep → ...les/appConfiguration/addReaderRoles.bicep b/.azure/appConfiguration/addReaderRoles.bicep → ...les/appConfiguration/addReaderRoles.bicep
diff --git a/.azure/appConfiguration/addWriterRoles.bicep → ...les/appConfiguration/addWriterRoles.bicep b/.azure/appConfiguration/addWriterRoles.bicep → ...les/appConfiguration/addWriterRoles.bicep
diff --git a/.azure/appConfiguration/create.bicep → .azure/modules/appConfiguration/create.bicep b/.azure/appConfiguration/create.bicep → .azure/modules/appConfiguration/create.bicep
diff --git a/.azure/appConfiguration/upsertKeyValue.bicep → ...les/appConfiguration/upsertKeyValue.bicep b/.azure/appConfiguration/upsertKeyValue.bicep → ...les/appConfiguration/upsertKeyValue.bicep
diff --git a/.azure/applicationInsights/create.bicep → .../modules/applicationInsights/create.bicep b/.azure/applicationInsights/create.bicep → .../modules/applicationInsights/create.bicep
diff --git a/...inerApp/addNECertufucateToContainer.bicep → ...inerApp/addNECertufucateToContainer.bicep b/...inerApp/addNECertufucateToContainer.bicep → ...inerApp/addNECertufucateToContainer.bicep
diff --git a/...re/containerApp/createMECertificate.bicep → ...es/containerApp/createMECertificate.bicep b/...re/containerApp/createMECertificate.bicep → ...es/containerApp/createMECertificate.bicep
diff --git a/.azure/containerApp/init.bicep → .azure/modules/containerApp/init.bicep b/.azure/containerApp/init.bicep → .azure/modules/containerApp/init.bicep
diff --git a/.azure/containerApp/upsertAppsettings.bicep → ...ules/containerApp/upsertAppsettings.bicep b/.azure/containerApp/upsertAppsettings.bicep → ...ules/containerApp/upsertAppsettings.bicep
diff --git a/.azure/customRoles/assign.bicep → .azure/modules/customRoles/assign.bicep b/.azure/customRoles/assign.bicep → .azure/modules/customRoles/assign.bicep
diff --git a/.azure/customRoles/create.bicep → .azure/modules/customRoles/create.bicep b/.azure/customRoles/create.bicep → .azure/modules/customRoles/create.bicep
diff --git a/.azure/dnsZones/create.bicep → .azure/modules/dnsZones/create.bicep b/.azure/dnsZones/create.bicep → .azure/modules/dnsZones/create.bicep
diff --git a/.azure/keyvault/addReaderRoles.bicep → .azure/modules/keyvault/addReaderRoles.bicep b/.azure/keyvault/addReaderRoles.bicep → .azure/modules/keyvault/addReaderRoles.bicep
diff --git a/.azure/keyvault/copySecrets.bicep → .azure/modules/keyvault/copySecrets.bicep b/.azure/keyvault/copySecrets.bicep → .azure/modules/keyvault/copySecrets.bicep
diff --git a/.azure/keyvault/create.bicep → .azure/modules/keyvault/create.bicep b/.azure/keyvault/create.bicep → .azure/modules/keyvault/create.bicep
diff --git a/.azure/keyvault/upsertSecret.bicep → .azure/modules/keyvault/upsertSecret.bicep b/.azure/keyvault/upsertSecret.bicep → .azure/modules/keyvault/upsertSecret.bicep
diff --git a/.azure/migrationJob/create.bicep → .azure/modules/migrationJob/create.bicep b/.azure/migrationJob/create.bicep → .azure/modules/migrationJob/create.bicep
diff --git a/.azure/postgreSql/create.bicep → .azure/modules/postgreSql/create.bicep b/.azure/postgreSql/create.bicep → .azure/modules/postgreSql/create.bicep
diff --git a/.azure/powershell/fetchKeyvaultSecret.ps1 → ...odules/powershell/fetchKeyvaultSecret.ps1 b/.azure/powershell/fetchKeyvaultSecret.ps1 → ...odules/powershell/fetchKeyvaultSecret.ps1
diff --git a/.azure/powershell/jsonMerge.ps1 → .azure/modules/powershell/jsonMerge.ps1 b/.azure/powershell/jsonMerge.ps1 → .azure/modules/powershell/jsonMerge.ps1
diff --git a/.azure/powershell/pwdGenerator.ps1 → .azure/modules/powershell/pwdGenerator.ps1 b/.azure/powershell/pwdGenerator.ps1 → .azure/modules/powershell/pwdGenerator.ps1
diff --git a/.azure/website/create.bicep → .azure/modules/website/create.bicep b/.azure/website/create.bicep → .azure/modules/website/create.bicep
diff --git a/.azure/website/upsertAppsettings.bicep → ...e/modules/website/upsertAppsettings.bicep b/.azure/website/upsertAppsettings.bicep → ...e/modules/website/upsertAppsettings.bicep
diff --git a/.github/workflows/ci-cd-pull-request.yml b/.github/workflows/ci-cd-pull-request.yml
@@ -12,4 +12,9 @@ jobs:
       environment: test
 
   playwright-test:
-    uses: ./.github/workflows/workflow-playwright-test.yml
+    uses: ./.github/workflows/workflow-playwright-test.yml
+
+  dry-run-infrastructure:
+    uses: ./.github/workflows/workflow-deploy-infrastructure.yml
+    with:
+      environment: test