chore: streamline logging across modules 2 (#352)

stijnmoreels · pim-simons · web-flow · commit 9186497d9ab4 · 2022-12-27T09:04:58.000+01:00
Co-authored-by: Pim Simons &lt;32359437+pim-simons@users.noreply.github.com&gt;
diff --git a/docs/preview/03-Features/powershell/azure-management.md b/docs/preview/03-Features/powershell/azure-management.md
@@ -33,10 +33,7 @@ For more information on API Management and soft deletion see [here](https://docs
 **Example**
 ```powershell
 PS> Remove-AzApiManagementSoftDeletedService -Name "my-apim"
-# Checking if the API Management instance with name 'my-apim' is listed as a soft deleted service
-# API Management instance has been found for name 'my-apim' as a soft deleted service
-# Removing the soft deleted API Management instance 'my-apim'
-# Successfully removed the soft deleted API Management instance 'my-apim'
+# Successfully removed the soft deleted Azure API Management service 'my-apim'
 ```
 
 ## Restoring a soft deleted API Management instance
@@ -59,8 +56,5 @@ For more information on API Management and soft deletion see [here](https://docs
 **Example**
 ```powershell
 PS> Restore-AzApiManagementSoftDeletedService -Name "my-apim"
-# Checking if the API Management instance with name 'my-apim' is listed as a soft deleted service
-# API Management instance has been found for name 'my-apim' as a soft deleted service
-# Restoring the soft deleted API Management instance 'my-apim'
-# Successfully restored the soft deleted API Management instance 'my-apim'
+# Successfully restored the soft deleted API Management service 'my-apim'
 ```
diff --git a/docs/preview/03-Features/powershell/azure-security.md b/docs/preview/03-Features/powershell/azure-security.md
@@ -103,6 +103,5 @@ PS> New-AzResourceGroupRoleAssignment `
 -ResourceGroupName "to-assign-role-resource-group" `
 -ResourceName "to-assign-resource" `
 -RoleAssignmentDefinition "Contributor"
-# Assigning Contributor-rights to the 'to-assign-role-resource' in the resource group 'to-assign-resource-group to gain access to the 'to-gain-access-resource-group'
-# Contributor access granted!
+# Granted Contributor-rights to the 'to-assign-role-resource' in the resource group 'to-assign-resource-group to gain access to the 'to-gain-access-resource-group'!
 ```
diff --git a/docs/preview/03-Features/powershell/azure-sql.md b/docs/preview/03-Features/powershell/azure-sql.md
@@ -44,7 +44,8 @@ PS> Invoke-AzSqlDatabaseMigration `
 -DatabaseName "my-database-name" `
 -Username "my-sql-username" `
 -Password "my-sql-password"
-# Looking for SQL scripts in folder: ./sqlScripts
+# DB migration 1.0.0 applied!
+# Done migrating database. Current Database version is 1.0.0
 ```
 
 **Example with custom values**
@@ -58,7 +59,8 @@ PS> Invoke-AzSqlDatabaseMigration `
 -ScriptsFolder "$PSScriptRoot/sql-scripts" `
 -ScriptsFileFilter "*.MyScript.sql" `
 -DatabaseSchema "custom"
-# Looking for SQL scripts in folder: ./sql-scripts
+# DB migration 1.0.0 applied!
+# Done migrating database. Current Database version is 1.0.0
 ```
 
 ### Adding SQL scripts so they can be picked up by the script
diff --git a/docs/preview/03-Features/powershell/azure-storage/azure-storage-blob.md b/docs/preview/03-Features/powershell/azure-storage/azure-storage-blob.md
@@ -39,10 +39,7 @@ PS> Upload-AzFilesToBlobStorage `
 -StorageAccountName "account-name" `
 -TargetFolderPath "./directory" `
 -ContainerName "blob-container"
-# Try using existing Azure Storage Container blob-container...
-# Using existing Azure Storage Container blob-container
-# Uploading files from ./directory
-# Uploaded the file to Azure Blob Storage: [file]
+# Uploaded the file [file] to Azure Blob storage container: [Blob URL]
 ```
 
 With non-existing blob container:
@@ -53,8 +50,5 @@ PS> Upload-AzFilesToBlobStorage `
 -StorageAccountName "account-name" `
 -TargetFolderPath "./directory" `
 -ContainerName "blob-container"
-# Try using existing Azure Storage Container blob-container...
-# Creating Storage Container blob-container
-# Uploading files from ./directory
-# Uploaded the file to Azure Blob Storage: [file]
+# Uploaded the file [file\ to Azure Blob storage container: [Blob URL]
 ```
diff --git a/docs/preview/03-Features/powershell/azure-storage/azure-storage-fileshare.md b/docs/preview/03-Features/powershell/azure-storage/azure-storage-fileshare.md
@@ -32,7 +32,6 @@ PS> Create-AzFileShareStorageFolder `
 -ResourceGroupName "shipping-resources" `
 -StorageAccountName "tracking-account-storage" `
 -FileShareName "returned" -FolderName "containers"
-# Creating Azure FileShare storage folder 'containers' in file share 'returned'..
 # Created Azure FileShare storage folder 'containers' in file share 'returned'
 ```
 
@@ -57,8 +56,7 @@ PS> Upload-AzFileShareStorageFiles `
 -StorageAccountName "tracking-account-storage" `
 -FileShareName "returned" -SourceFolderPath "containers" `
 -DestinationFolderName "containers"
-# Upload files to Azure FileShare storage 'returned'...
 # Uploaded the '[fileName]' file to Azure FileShare 'returned'
 # Uploaded the '[fileName]' file to Azure FileShare 'returned'
-# Files have been uploaded to Azure FileShare storage 'returned'
+# Files have been uploaded to Azure FileShare storage 'returned' 
 ```
diff --git a/docs/preview/03-Features/powershell/azure-storage/azure-storage-table.md b/docs/preview/03-Features/powershell/azure-storage/azure-storage-table.md
@@ -35,9 +35,8 @@ PS> Create-AzStorageTable `
 -ResourceGroupName "stock" `
 -StorageAccountName "admin" `
 -TableName "products"
-# Azure storage account context has been retrieved
-# Azure storage table 'products' does not exist yet in the Azure storage account, so will create one
-# Azure storage table 'products' created
+# Azure storage table 'products' does not exist yet in the Azure storage account 'admin', so will create one
+# Azure storage table 'products' created in Azure storage account 'admin'
 ```
 
 With existing table and re-create:
@@ -49,9 +48,8 @@ PS> Create-AzStorageTable `
 -TableName "products" `
 -Recreate `
 -RetryIntervalSeconds 3
-# Azure storage account context has been retrieved
-# Azure storage table 'products' has been removed
-# Failed to re-create the Azure storage table 'products', retrying in 5 seconds...
-# Failed to re-create the Azure storage table 'products', retrying in 5 seconds...
-# Azure storage table 'products' created
+# Azure storage table 'products' has been removed from Azure storage account 'admin'
+# Failed to re-create the Azure storage table 'products' in Azure storage account 'admin', retrying in 5 seconds...
+# Failed to re-create the Azure storage table 'products' in Azure storage account 'admin', retrying in 5 seconds...
+# Azure storage table 'products' created in Azure storage account 'admin'
 ```
diff --git a/src/Arcus.Scripting.ActiveDirectory/Scripts/Add-AzADAppRoleAssignment.ps1 b/src/Arcus.Scripting.ActiveDirectory/Scripts/Add-AzADAppRoleAssignment.ps1
@@ -51,7 +51,7 @@ try {
         $updatedAdServicePrincipal = Get-MgServicePrincipal -ServicePrincipalId $adServicePrincipal.Id
 
         while ($updatedAdServicePrincipal.AppRoles.Value -notcontains $Role -and $counter -lt 10) {
-            Write-Versbose "Role '$Role' has been added to Active Directory Application '$($adApplication.DisplayName)' but not yet available for use, waiting 10 seconds to retry..."
+            Write-Verbose "Role '$Role' has been added to Active Directory Application '$($adApplication.DisplayName)' but not yet available for use, waiting 10 seconds to retry..."
             Start-Sleep -Seconds 10
             $counter++
             $updatedAdServicePrincipal = Get-MgServicePrincipal -ServicePrincipalId $adServicePrincipal.Id
diff --git a/src/Arcus.Scripting.Management/Scripts/Get-AzApiManagementResourceManagementUrl.ps1 b/src/Arcus.Scripting.Management/Scripts/Get-AzApiManagementResourceManagementUrl.ps1
@@ -3,7 +3,7 @@ param(
 )
 
 try {
-    $resourceManagerUrl = ""   
+    $resourceManagerUrl = ""
     
     $environments = (Get-AzEnvironment).Name
     if ($EnvironmentName -notin $environments) {
@@ -28,5 +28,5 @@ try {
 catch {
     Write-Warning "Failed to retrieve the resource management endpoint"
     $ErrorMessage = $_.Exception.Message
-    Write-Warning "Error: $ErrorMessage"
+    Write-Debug "Error: $ErrorMessage"
 }
diff --git a/src/Arcus.Scripting.Management/Scripts/Get-AzApiManagementSoftDeletedResources.ps1 b/src/Arcus.Scripting.Management/Scripts/Get-AzApiManagementSoftDeletedResources.ps1
@@ -6,15 +6,15 @@ param(
     [Parameter(Mandatory = $true)][string] $ApiVersion
 )
 
-Write-Verbose "Checking if the API Management instance with name '$Name' is listed as a soft deleted service"
+Write-Verbose "Checking if the Azure API Management service '$Name' is listed as a soft deleted service..."
 $getUri = "$ResourceManagerUrl" + "subscriptions/$SubscriptionId/providers/Microsoft.ApiManagement/deletedservices" + "?api-version=$ApiVersion"
 
 $deletedServices = (Invoke-RestMethod -Method GET -Uri $getUri -Headers $AuthHeader)
 
 if ($deletedServices.value.count -eq 0 -or ($deletedServices.value | Where-Object name -eq $Name).count -eq 0) {
-    throw "API Management instance with name '$Name' is not listed as a soft deleted service and therefore it cannot be removed or restored"
+    throw "Azure API Management service '$Name' is not listed as a soft deleted service and therefore it cannot be removed or restored"
 }
 
-Write-Host "API Management instance has been found for name '$Name' as a soft deleted service"
+Write-Host "Found Azure API Management service '$Name' as a soft deleted service" -ForegroundColor Green
 
 return $deletedServices
diff --git a/src/Arcus.Scripting.Management/Scripts/Remove-AzApiManagementSoftDeletedService.ps1 b/src/Arcus.Scripting.Management/Scripts/Remove-AzApiManagementSoftDeletedService.ps1
@@ -22,13 +22,13 @@ $resourceManagerUrl = . $PSScriptRoot\Get-AzApiManagementResourceManagementUrl.p
 
 $deletedServices = . $PSScriptRoot\Get-AzApiManagementSoftDeletedResources.ps1 -Name $Name -SubscriptionId $SubscriptionId -ResourceManagerUrl $resourceManagerUrl -AuthHeader $authHeader -ApiVersion $ApiVersion
 
-Write-Host "Removing the soft deleted API Management instance '$Name'"
+Write-Verbose "Removing the soft deleted Azure API Management instance '$Name'..."
 try {
     $serviceId = ($deletedServices.value | Where-Object name -eq $Name).id
     $deleteUri = "$resourceManagerUrl" + "$serviceId" + "?api-version=$ApiVersion"
     $removeService = Invoke-RestMethod -Method DELETE -Uri $deleteUri -Headers $authHeader
 } catch {
-    throw "The soft deleted API Management instance '$Name' could not be removed. Details: $($_.Exception.Message)"
+    throw "Soft deleted Azure API Management service '$Name' could not be removed. Details: $($_.Exception.Message)"
 }
 
-Write-Host "Successfully removed the soft deleted API Management instance '$Name'"
+Write-Host "Successfully removed the soft deleted Azure API Management service '$Name'" -ForegroundColor Green
diff --git a/src/Arcus.Scripting.Management/Scripts/Restore-AzApiManagementSoftDeletedService.ps1 b/src/Arcus.Scripting.Management/Scripts/Restore-AzApiManagementSoftDeletedService.ps1
@@ -22,7 +22,7 @@ $resourceManagerUrl = . $PSScriptRoot\Get-AzApiManagementResourceManagementUrl.p
 
 $deletedServices = . $PSScriptRoot\Get-AzApiManagementSoftDeletedResources.ps1 -Name $Name -SubscriptionId $SubscriptionId -ResourceManagerUrl $resourceManagerUrl -AuthHeader $authHeader -ApiVersion $ApiVersion
 
-Write-Host "Restoring the soft deleted API Management instance '$Name'"
+Write-Verbose "Restoring the soft deleted Azure API Management service '$Name'..."
 try {
     $location = ($deletedServices.value | Where-Object name -eq $Name).location
     $serviceId = ($deletedServices.value | Where-Object name -eq $Name).properties.serviceId
@@ -36,7 +36,7 @@ try {
     $putUri = "$resourceManagerUrl" + "$serviceId" + "?api-version=$ApiVersion"
     $restoreService = Invoke-RestMethod -Method PUT -Uri $putUri -ContentType 'application/json' -Headers $authHeader -Body $body
 } catch {
-    throw "The soft deleted API Management instance '$Name' could not be restored. Details: $($_.Exception.Message)"
+    throw "Soft deleted Azure API Management service '$Name' could not be restored. Details: $($_.Exception.Message)"
 }
 
-Write-Host "Successfully restored the soft deleted API Management instance '$Name'"
+Write-Host "Successfully restored the soft deleted API Management service '$Name'" -ForegroundColor Green
diff --git a/src/Arcus.Scripting.Security/Scripts/Get-AzCachedAccessToken.ps1 b/src/Arcus.Scripting.Security/Scripts/Get-AzCachedAccessToken.ps1
@@ -21,5 +21,5 @@ if($AssignGlobalVariables) {
     Write-Host "Global variable 'accessToken' assigned"
 }
 
-Write-Host "Azure access token and subscription ID retrieved from current active Azure authenticated session"
+Write-Host "Azure access token and subscription ID retrieved from current active Azure authenticated session" -ForegroundColor Green
 return New-Object psobject -Property @{ SubscriptionId = $currentAzureContext.Subscription.Id; AccessToken = $token.AccessToken }
diff --git a/src/Arcus.Scripting.Security/Scripts/New-AzResourceGroupRoleAssignment.ps1 b/src/Arcus.Scripting.Security/Scripts/New-AzResourceGroupRoleAssignment.ps1
@@ -5,20 +5,20 @@ param (
     [Parameter(Mandatory = $true)][string] $RoleDefinitionName = $(throw "Name of the role definition is required")
 )
 
-Write-Host "Assigning $RoleDefinitionName-rights to the '$ResourceName' in the resource group '$ResourceGroupName' to gain access to the '$TargetResourceGroupName'"
+Write-Verbose "Assigning $RoleDefinitionName-rights to the '$ResourceName' in the resource group '$ResourceGroupName' to gain access to the resource group '$TargetResourceGroupName'..."
 
 try {
     $resource = Get-AzResource -ResourceGroupName $ResourceGroupName -Name $ResourceName
     [guid] $resourcePrincipalId = $resource.identity.PrincipalId
     
     New-AzRoleAssignment -ObjectId $resourcePrincipalId -RoleDefinitionName $RoleDefinitionName -ResourceGroupName $TargetResourceGroupName -ErrorAction Stop
-    Write-Host "$RoleDefinitionName access granted!"
+    Write-Host "Granted $RoleDefinitionName-rights to the '$ResourceName' in the resource group '$ResourceGroupName' to gain access to the resource group '$TargetResourceGroupName'" -ForegroundColor Green
 } catch {
     $ErrorMessage = $_.Exception.Message
     if ($ErrorMessage.Contains("already exists")) {
-        Write-Host "Access has already been granted"
+        Write-Warning "Access of $RoleDefinition-rights has already been granted to the '$ResourceName' in the resource group '$ResourceGroupName' to gain access to the resource group '$TargetResourceGroupName'"
     } else {
-        Write-Warning "Failed to grant access!"
-        Write-Warning $ErrorMessage
+        Write-Warning "Failed to grant access of $RoleDefinition-rights to the '$ResourceName' in the resource group '$ResourceGroupName' to gain access to the resource group '$TargetResourceGroupName'"
+        Write-Debug $ErrorMessage
     }
 }
diff --git a/src/Arcus.Scripting.Sql/Scripts/Invoke-AzSqlDatabaseMigration.ps1 b/src/Arcus.Scripting.Sql/Scripts/Invoke-AzSqlDatabaseMigration.ps1
@@ -8,9 +8,8 @@ param(
     [Parameter(Mandatory=$false)][string] $DatabaseSchema = "dbo"
 )
 
-Write-Host "Looking for SQL scripts in folder: $ScriptsFolder"
+Write-Verbose "Looking for SQL scripts in folder: $ScriptsFolder..."
 
-#Functions for repeated use
 function Execute-DbCommand($params, [string]$query) {
     $result = Invoke-Sqlcmd @params -Query $query -Verbose -QueryTimeout 180 -ErrorAction Stop -ErrorVariable err
     
@@ -29,9 +28,9 @@ function Execute-DbCommandWithResult($params, [string] $query) {
 }
 
 function Create-DbParams([string] $DatabaseName, [string] $serverInstance, [string] $UserName, [string] $Password) {
-    Write-Host "databasename = $DatabaseName"
-    Write-Host "serverinstance = $serverInstance"
-    Write-Host "username = $UserName"
+    Write-Debug "databasename = $DatabaseName"
+    Write-Debug "serverinstance = $serverInstance"
+    Write-Debug "username = $UserName"
     
     return $params = @{
       'Database' = $DatabaseName
@@ -48,22 +47,20 @@ function Get-SqlScriptFileText([string] $scriptPath, [string] $fileName) {
     return $query = Get-Content $currentfilepath
 }
 
-#Group params needed to connect to database for ease of use
 $params = Create-DbParams $DatabaseName $ServerName $UserName $Password
 
-# Create the DatabaseVersion table if it doesn't exist yet
 $createDatabaseVersionTable = "IF NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'DatabaseVersion' AND TABLE_SCHEMA = '$DatabaseSchema' ) " +
                               "BEGIN " +
-	                          "CREATE TABLE [$DatabaseSchema].[DatabaseVersion] " +
-	                          "( " +
-	                          "   [MajorVersionNumber] INT NOT NULL, " +
-		                      "   [MinorVersionNumber] INT NOT NULL, " +
-		                      "   [PatchVersionNumber] INT NOT NULL, " +
-		                      "   [MigrationDescription] [nvarchar](256) NOT NULL, " +
+                              "CREATE TABLE [$DatabaseSchema].[DatabaseVersion] " +
+                              "( " +
+                              "   [MajorVersionNumber] INT NOT NULL, " +
+                              "   [MinorVersionNumber] INT NOT NULL, " +
+                              "   [PatchVersionNumber] INT NOT NULL, " +
+                              "   [MigrationDescription] [nvarchar](256) NOT NULL, " +
                               "   [MigrationDate] DATETIME NOT NULL " +
-		                      "   CONSTRAINT [PK_DatabaseVersion] PRIMARY KEY CLUSTERED  ([MajorVersionNumber],[MinorVersionNumber],[PatchVersionNumber]) " +
-                              "				WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) " +
-	                          ") " +
+                              "   CONSTRAINT [PK_DatabaseVersion] PRIMARY KEY CLUSTERED  ([MajorVersionNumber],[MinorVersionNumber],[PatchVersionNumber]) " +
+                              "                WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) " +
+                              ") " +
                               "END " +
                               "ELSE " +
                               "BEGIN " +
@@ -107,13 +104,13 @@ for ($i = 0; $i -lt $files.Count; $i++) {
     $fileNameParts = $fileName.Split('_')
 
     if ($fileNameParts.Length -lt 2) {
-        Write-Host "File $fileName skipped for not having all required name sections (version and description)."
+        Write-Warning "File $fileName skipped for not having all required name sections (version and description)"
         continue;
     }
 
     # The version number in the 'version' part of the filename should be one integer number or a semantic version number.
     if ( ($fileNameParts[0] -match "^\d+.\d+.\d+$" -eq $false) -and  ($fileNameParts[0] -match "^\d+$" -eq $false)) {
-        Write-Host "File $fileName skipped because version is not valid."
+        Write-Warning "File $fileName skipped because version is not valid"
         continue;
     }
 
@@ -136,21 +133,21 @@ for ($i = 0; $i -lt $files.Count; $i++) {
     Execute-DbCommand $params $migrationScript
 
     if ($migrationDescription.Length -gt 256) {
-		Write-Host "Need to truncate the migration description because its size is" $scriptVersionDescription.Length "while the maximum size is 256"
+        Write-Warning "Need to truncate the migration description because its size is" $scriptVersionDescription.Length "while the maximum size is 256"
         $migrationDescription = $migrationDescription.Substring(0, 256)
     }
-	
+    
     $updateVersionQuery = "INSERT INTO [$DatabaseSchema].[DatabaseVersion] ([MajorVersionNumber], [MinorVersionNumber], [PatchVersionNumber], [MigrationDescription], [MigrationDate]) " +
                           "SELECT $($scriptVersionNumber.MajorVersionNumber), $($scriptVersionNumber.MinorVersionNumber), $($scriptVersionNumber.PatchVersionNumber), '$migrationDescription', getdate()"
     
     Execute-DbCommand $params $updateVersionQuery
 
-    Write-Host "DB migration " $scriptVersionNumber " applied!"
+    Write-Host "DB migration " $scriptVersionNumber " applied!" -ForegroundColor Green
 
     $databaseVersion = $scriptVersionNumber    
 }
 
-#Get New Database Version Number
+# Get New Database Version Number
 $databaseVersionNumberDataRow = Execute-DbCommandWithResult $params $getCurrentDbVersionQuery  
 $databaseVersionNumber = [DatabaseVersion]::new([convert]::ToInt32($databaseVersionNumberDataRow.ItemArray[0]), [convert]::ToInt32($databaseVersionNumberDataRow.ItemArray[1]), [convert]::ToInt32($databaseVersionNumberDataRow.ItemArray[2]))    
-Write-Host "Done migrating database. Current Database version is $databaseVersionNumber."
+Write-Host "Done migrating database. Current Database version is $databaseVersionNumber" -ForegroundColor Green
diff --git a/src/Arcus.Scripting.Storage.Blob/Scripts/Upload-AzFilesToBlobStorage.ps1 b/src/Arcus.Scripting.Storage.Blob/Scripts/Upload-AzFilesToBlobStorage.ps1
diff --git a/src/Arcus.Scripting.Storage.FileShare/Scripts/Create-AzFileShareStorageFolder.ps1 b/src/Arcus.Scripting.Storage.FileShare/Scripts/Create-AzFileShareStorageFolder.ps1
diff --git a/src/Arcus.Scripting.Storage.FileShare/Scripts/Upload-AzFileShareStorageFiles.ps1 b/src/Arcus.Scripting.Storage.FileShare/Scripts/Upload-AzFileShareStorageFiles.ps1
diff --git a/src/Arcus.Scripting.Storage.Table/Scripts/Create-AzTableStorageAccountTable.ps1 b/src/Arcus.Scripting.Storage.Table/Scripts/Create-AzTableStorageAccountTable.ps1
diff --git a/src/Arcus.Scripting.Tests.Integration/Arcus.Scripting.Management.tests.ps1 b/src/Arcus.Scripting.Tests.Integration/Arcus.Scripting.Management.tests.ps1
diff --git a/src/Arcus.Scripting.Tests.Unit/Arcus.Scripting.Management.tests.ps1 b/src/Arcus.Scripting.Tests.Unit/Arcus.Scripting.Management.tests.ps1

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ param(`
`3`	`3`	`)`
`4`	`4`
`5`	`5`	`try {`
`6`		`- $resourceManagerUrl = ""`
	`6`	`+ $resourceManagerUrl = ""`
`7`	`7`
`8`	`8`	`$environments = (Get-AzEnvironment).Name`
`9`	`9`	`if ($EnvironmentName -notin $environments) {`
`@@ -28,5 +28,5 @@ try {`
`28`	`28`	`catch {`
`29`	`29`	`Write-Warning "Failed to retrieve the resource management endpoint"`
`30`	`30`	`$ErrorMessage = $_.Exception.Message`
`31`		`- Write-Warning "Error: $ErrorMessage"`
	`31`	`+ Write-Debug "Error: $ErrorMessage"`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@ param(`
`6`	`6`	`[Parameter(Mandatory = $true)][string] $ApiVersion`
`7`	`7`	`)`
`8`	`8`
`9`		`-Write-Verbose "Checking if the API Management instance with name '$Name' is listed as a soft deleted service"`
	`9`	`+Write-Verbose "Checking if the Azure API Management service '$Name' is listed as a soft deleted service..."`
`10`	`10`	`$getUri = "$ResourceManagerUrl" + "subscriptions/$SubscriptionId/providers/Microsoft.ApiManagement/deletedservices" + "?api-version=$ApiVersion"`
`11`	`11`
`12`	`12`	`$deletedServices = (Invoke-RestMethod -Method GET -Uri $getUri -Headers $AuthHeader)`
`13`	`13`
`14`	`14`	`if ($deletedServices.value.count -eq 0 -or ($deletedServices.value \| Where-Object name -eq $Name).count -eq 0) {`
`15`		`- throw "API Management instance with name '$Name' is not listed as a soft deleted service and therefore it cannot be removed or restored"`
	`15`	`+ throw "Azure API Management service '$Name' is not listed as a soft deleted service and therefore it cannot be removed or restored"`
`16`	`16`	`}`
`17`	`17`
`18`		`-Write-Host "API Management instance has been found for name '$Name' as a soft deleted service"`
	`18`	`+Write-Host "Found Azure API Management service '$Name' as a soft deleted service" -ForegroundColor Green`
`19`	`19`
`20`	`20`	`return $deletedServices`