From 52cae5662f41a2defd4a2d8cbe6687447eba4156 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 23 May 2024 13:45:05 -0700
Subject: [PATCH] Update to use AZ cli instead

---
 .../templates/release-MakeBlobPublic.yml      | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/.pipelines/templates/release-MakeBlobPublic.yml b/.pipelines/templates/release-MakeBlobPublic.yml
index a6528bd4b8..414bb37667 100644
--- a/.pipelines/templates/release-MakeBlobPublic.yml
+++ b/.pipelines/templates/release-MakeBlobPublic.yml
@@ -61,27 +61,15 @@ jobs:
       Install-Module -Name Az.Storage -Force -AllowClobber -Scope CurrentUser -Verbose
     displayName: Remove AzRM modules
 
-  - task: AzurePowerShell@5
-    displayName: Set blob permissions
+  - task: AzureCLI@2
+    displayName: 'Set blob permissions'
     inputs:
       azureSubscription: az-blob-cicd-infra
-      scriptType: inlineScript
-      azurePowerShellVersion: LatestVersion
-      pwsh: true
-      inline: |
-        $storageAccount = "$(StorageAccount)"
-        $containerName = "$(azureVersion)"
-        $publicAccess = "blob"
-
-        Set-AzStorageContainerAcl `
-          -Context (New-AzStorageContext -StorageAccountName $storageAccount) `
-          -Container $containerName `
-          -PublicAccess $publicAccess
-
-        Set-AzStorageContainerAcl `
-          -Context (New-AzStorageContext -StorageAccountName $storageAccount) `
-          -Container "$containerName-gc" `
-          -PublicAccess $publicAccess
+      scriptType: 'pscore'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az storage container set-permission --account-name $(StorageAccount) --name $(azureVersion) --public-access blob
+        az storage container set-permission --account-name $(StorageAccount) --name $(azureVersion)-gc --public-access blob
 
 - template: /.pipelines/templates/approvalJob.yml@self
   parameters: