Implemented a first version to allow for custom removal scripts & ret…

…ry (#431) * Implemented a first version to allow for custom removal scripts & retry * Moved the removal scripts to utilities to enable reference by non-GitHub pipelines & custom execution * Cleaned up pipelines & added reference to custom removal for vWan & netApp * Refactored removal scripts to align approaches & reduce code
Azure · Nov 10, 2021 · 49e0d68 · 49e0d68
1 parent 7a8e00e
commit 49e0d68
Show file tree

Hide file tree

Showing 99 changed files with 485 additions and 274 deletions.
diff --git a/.github/actions/sharedScripts/Set-EnvironmentOnAgent.ps1 b/.github/actions/sharedScripts/Set-EnvironmentOnAgent.ps1
@@ -98,6 +98,8 @@ function Set-EnvironmentOnAgent {
         [Hashtable[]] $Modules = @(
             @{ Name = 'Az.Accounts' },
             @{ Name = 'Az.Resources' },
+            @{ Name = 'Az.NetAppFiles' },
+            @{ Name = 'Az.Network' },
             @{ Name = 'Az.ContainerRegistry' }
         )
     )

diff --git a/.github/actions/templates/removeModule/action.yml b/.github/actions/templates/removeModule/action.yml
@@ -10,7 +10,11 @@ inputs:
     required: true
   resourceGroupName:
     description: 'The resource group the module is deployed into'
-    required: true
+    required: false
+  relativePathOfRemovalScript:
+    description: 'The relative path from root to the script that removes the service'
+    required: false
+    default: 'utilities/resourceRemoval/Remove-DeployedModule.ps1'
 
 runs:
   using: 'composite'
@@ -33,15 +37,16 @@ runs:
       shell: pwsh
       run: |
         # Load used functions
-        . "$env:GITHUB_ACTION_PATH/scripts/Remove-DeployedModule.ps1"
+        $functionPath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.relativePathOfRemovalScript }}'
+        . $functionPath
 
         $functionInput = @{
-          moduleName        = '${{ inputs.moduleName }}'
-          resourceGroupName = '${{ inputs.resourceGroupName }}'
-          templateFilePath  = '${{ inputs.templateFilePath }}'
+            moduleName        = '${{ inputs.moduleName }}'
+            resourceGroupName = '${{ inputs.resourceGroupName }}'
+            verbose           = $true
         }
 
-        Write-Verbose "Invoke task with" -Verbose
+        Write-Verbose 'Invoke task with' -Verbose
         Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-        Remove-DeployedModule @functionInput -Verbose
+        Invoke-Expression ('{0} @functionInput' -f (Split-Path $functionPath -LeafBase))
diff --git a/.github/actions/templates/removeModule/scripts/Remove-DeployedModule.ps1 b/.github/actions/templates/removeModule/scripts/Remove-DeployedModule.ps1
diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.apis.yml b/.github/workflows/ms.apimanagement.service.apis.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.authorizationservers.yml b/.github/workflows/ms.apimanagement.service.authorizationservers.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.backends.yml b/.github/workflows/ms.apimanagement.service.backends.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.caches.yml b/.github/workflows/ms.apimanagement.service.caches.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.namedvalues.yml b/.github/workflows/ms.apimanagement.service.namedvalues.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.products.yml b/.github/workflows/ms.apimanagement.service.products.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.subscriptions.yml b/.github/workflows/ms.apimanagement.service.subscriptions.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.automanage.accounts.yml b/.github/workflows/ms.automanage.accounts.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.automation.automationaccounts.softwareupdateconfigurations.yml b/.github/workflows/ms.automation.automationaccounts.softwareupdateconfigurations.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.galleries.images.yml b/.github/workflows/ms.compute.galleries.images.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
@@ -212,5 +212,3 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -212,5 +212,4 @@ jobs:
         uses: ./.github/actions/templates/removeModule
         with:
           moduleName: '${{ env.moduleName }}'
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           resourceGroupName: '${{ env.resourceGroupName }}'