Remove Storage Account and VHD refs (#8581)

Author: shamil-mubarakshin

images.CI/linux-and-win/azure-pipelines/image-generation.yml

@@ -74,9 +74,6 @@ jobs:
         $ManagedImageName = "${{ parameters.image_type }}-$(Build.BuildId)"
         Write-Host "##vso[task.setvariable variable=ManagedImageName;]$ManagedImageName"
 
-        $VhdName = "$ManagedImageName.vhd"
-        Write-Host "##vso[task.setvariable variable=VhdName;]$VhdName"
-
         $TempResourceGroupName = "packer-temp-$ManagedImageName"
         Write-Host "##vso[task.setvariable variable=TempResourceGroupName;]$TempResourceGroupName"
 
@@ -146,26 +143,6 @@ jobs:
                         -PrefixToPathTrim "$(TemplateDirectoryPath)" `
                         -PrintTopNLongest 25
 
-  - task: PowerShell@2
-    displayName: 'Convert managed image to VHD'
-    inputs:
-      targetType: filePath
-      filePath: ./images.CI/linux-and-win/convert-to-vhd.ps1
-      arguments: -SubscriptionId $(AZURE_SUBSCRIPTION) `
-                 -Location $(AZURE_LOCATION) `
-                 -ResourceGroupName $(AZURE_RESOURCE_GROUP) `
-                 -ManagedImageName "$(ManagedImageName)" `
-                 -GalleryName "github_imagegeneration_convert_to_vhd" `
-                 -GalleryImageSku "${{ parameters.image_type }}" `
-                 -GalleryImageVersion "0.0.$(Build.BuildId)" `
-                 -StorageAccountName $(AZURE_STORAGE_ACCOUNT) `
-                 -StorageAccountContainerName "images" `
-                 -VhdName "$(VhdName)" `
-                 -ClientId $(CLIENT_ID) `
-                 -ClientSecret $(CLIENT_SECRET) `
-                 -TenantId $(AZURE_TENANT) `
-                 -RemoveManagedImage
-
   - ${{ if eq(parameters.create_release, true) }}:
     - task: PowerShell@2
       displayName: 'Create release for VM deployment'
@@ -176,9 +153,8 @@ jobs:
                    -Organization $(RELEASE_TARGET_ORGANIZATION) `
                    -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) `
                    -Project $(RELEASE_TARGET_PROJECT) `
-                   -ImageName "${{ parameters.image_type }}" `
-                   -StorageAccountContainerName "images" `
-                   -VhdName "$(VhdName)" `
+                   -ImageType "${{ parameters.image_type }}" `
+                   -ManagedImageName "$(ManagedImageName)" `
                    -AccessToken $(RELEASE_TARGET_TOKEN)
 
   - task: PowerShell@2
@@ -188,7 +164,6 @@ jobs:
       targetType: filePath
       filePath: ./images.CI/linux-and-win/cleanup.ps1
       arguments: -TempResourceGroupName "$(TempResourceGroupName)" `
-                 -StorageAccount $(AZURE_STORAGE_ACCOUNT) `
                  -SubscriptionId $(AZURE_SUBSCRIPTION) `
                  -ClientId $(CLIENT_ID) `
                  -ClientSecret $(CLIENT_SECRET) `

images.CI/linux-and-win/cleanup.ps1

@@ -1,23 +1,19 @@
 param(
-    [String] [Parameter (Mandatory=$true)] $TempResourceGroupName,
-    [String] [Parameter (Mandatory=$true)] $StorageAccount,
-    [String] [Parameter (Mandatory=$true)] $SubscriptionId,
-    [String] [Parameter (Mandatory=$true)] $ClientId,
-    [String] [Parameter (Mandatory=$true)] $ClientSecret,
-    [String] [Parameter (Mandatory=$true)] $TenantId
+    [Parameter (Mandatory=$true)] [string] $TempResourceGroupName,
+    [Parameter (Mandatory=$true)] [string] $SubscriptionId,
+    [Parameter (Mandatory=$true)] [string] $ClientId,
+    [Parameter (Mandatory=$true)] [string] $ClientSecret,
+    [Parameter (Mandatory=$true)] [string] $TenantId
 )
 
 az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null
+az account set --subscription $SubscriptionId | Out-Null
 
-$groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId
+$groupExist = az group exists --name $TempResourceGroupName
 if ($groupExist -eq "true") {
-    $osDiskName = az deployment group list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv
     Write-Host "Found a match, deleting temporary files"
-    az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null
+    az group delete --name $TempResourceGroupName --yes | Out-Null
     Write-Host "Temporary group was deleted successfully"
-    Write-Host "Deleting OS disk"
-    az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" --only-show-errors | Out-Null
-    Write-Host "OS disk deleted"
 } else {
     Write-Host "No temporary groups found"
-}
+}

images.CI/linux-and-win/convert-to-vhd.ps1

@@ -1,12 +1,11 @@
 param(
-    [UInt32] [Parameter (Mandatory)] $BuildId,
-    [String] [Parameter (Mandatory)] $Organization,
-    [String] [Parameter (Mandatory)] $Project,
-    [String] [Parameter (Mandatory)] $ImageName,
-    [String] [Parameter (Mandatory)] $StorageAccountContainerName,
-    [String] [Parameter (Mandatory)] $VhdName,
-    [String] [Parameter (Mandatory)] $DefinitionId,
-    [String] [Parameter (Mandatory)] $AccessToken
+    [Parameter (Mandatory)] [UInt32] $BuildId,
+    [Parameter (Mandatory)] [string] $Organization,
+    [Parameter (Mandatory)] [string] $Project,
+    [Parameter (Mandatory)] [string] $ImageType,
+    [Parameter (Mandatory)] [string] $ManagedImageName,
+    [Parameter (Mandatory)] [string] $DefinitionId,
+    [Parameter (Mandatory)] [string] $AccessToken
 )
 
 $Body = @{
@@ -15,14 +14,11 @@ $Body = @{
       ImageBuildId = @{
         value = $BuildId
       }
-      ImageName = @{
-        value = $ImageName
+      ImageType = @{
+        value = $ImageType
       }
-      ImageStorageContainerName = @{
-        value = $StorageAccountContainerName
-      }
-      ImageBlobPath = @{
-        value = $VhdName
+      ManagedImageName = @{
+        value = $ManagedImageName
       }
     }
     isDraft = "false"
@@ -37,4 +33,4 @@ $headers = @{
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13
 $NewRelease = Invoke-RestMethod $URL -Body $Body -Method "POST" -Headers $headers -ContentType "application/json"
 
-Write-Host "Created release: $($NewRelease._links.web.href)"
+Write-Host "Created release: $($NewRelease._links.web.href)"