From aadcf2522c6360fcf965df2901ed317618acbfdd Mon Sep 17 00:00:00 2001 From: "Alexander (Sasha) Nosov" Date: Sat, 8 Apr 2023 11:18:28 -0700 Subject: [PATCH] Changed remove resource to async --- .../modify-license-type/modify-license-type.ps1 | 1 + .../uninstall-azure-extension-for-sql-server/README.md | 8 ++++---- .../uninstall-azure-extension-for-sql-server.ps1 | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/samples/manage/azure-arc-enabled-sql-server/modify-license-type/modify-license-type.ps1 b/samples/manage/azure-arc-enabled-sql-server/modify-license-type/modify-license-type.ps1 index 456b9712..d6562570 100644 --- a/samples/manage/azure-arc-enabled-sql-server/modify-license-type/modify-license-type.ps1 +++ b/samples/manage/azure-arc-enabled-sql-server/modify-license-type/modify-license-type.ps1 @@ -108,6 +108,7 @@ Update-AzConfig -DisplayBreakingChangeWarning $false # Load required modules $requiredModules = @( + "AzureAD", "Az.Accounts", "Az.ConnectedMachine", "Az.ResourceGraph" diff --git a/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/README.md b/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/README.md index f53a2015..040efff8 100644 --- a/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/README.md +++ b/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/README.md @@ -84,10 +84,10 @@ This option is recommended because Cloud shell has the Azure PowerShell modules curl https://raw.githubusercontent.com/microsoft/sql-server-samples/master/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/uninstall-azure-extension-for-sql-server.ps1 -o uninstall-azure-extension-for-sql-server.ps1 ``` -1. Run the script. +1. Run the script using the desired scope. For example: ```console - .\uninstall-azure-extension-for-sql-server.ps1 -SubId ALL + .\uninstall-azure-extension-for-sql-server.ps1 -SubId ``` > [!NOTE] @@ -124,8 +124,8 @@ Use the following steps to run the script in a PowerShell session on your PC. Connect-AzAccount -TenantID (Get-AzureADTenantDetail).ObjectId ``` -1. Run the script using the desired scope. +1. Run the script using the desired scope. For example: ```console - .\uninstall-azure-extension-for-sql-server.ps1 -All $True + .\uninstall-azure-extension-for-sql-server.ps1 -SubId -ResourceGroup ``` diff --git a/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/uninstall-azure-extension-for-sql-server.ps1 b/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/uninstall-azure-extension-for-sql-server.ps1 index 9cd07e85..60116a6b 100644 --- a/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/uninstall-azure-extension-for-sql-server.ps1 +++ b/samples/manage/azure-arc-enabled-sql-server/uninstall-azure-extension-for-sql-server/uninstall-azure-extension-for-sql-server.ps1 @@ -88,7 +88,7 @@ foreach ($sub in $subscriptions){ try { Set-AzContext -SubscriptionId $sub.Id }catch { - write-host "[Environment]::NewLine + Invalid subscription: $($sub.Id)" + write-host ([Environment]::NewLine + "Invalid subscription: $($sub.Id)") {continue} } @@ -142,8 +142,9 @@ foreach ($sub in $subscriptions){ $resources = Search-AzGraph -Query "$($query2)" foreach ($r in $resources) { - - Remove-AzResource -ResourceId $r.resourceId -Force | Out-Null + + $job = Remove-AzResource -ResourceId $r.resourceId -Force -AsJob | Out-Null + write-host ([Environment]::NewLine + "Removing resource: $($r.resourceId)") }