[Az.ScVmm] Use ErrorAction Stop for Get Machine operations to fix exception being logged on console

src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMDisk.ps1

@@ -253,23 +253,23 @@ function Add-AzScVmmVMDisk {
           }
 
           try {
-            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
             if ($null -eq $machineObj) {
               throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
             }
           }
           catch {
-            throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
           }
 
           try {
-            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-            if ($null -eq $machineObj) {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+            if ($null -eq $vmObj) {
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
             }
           }
           catch {
-            throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+            throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
           }
 
           $newDiskObject = @()

src/ScVmm/ScVmm.Autorest/custom/Add-AzScVmmVMNic.ps1

@@ -262,23 +262,23 @@ function Add-AzScVmmVMNic {
             }
 
             try {
-              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
               if ($null -eq $machineObj) {
                 throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
               }
             }
             catch {
-              throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+              throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
             }
 
             try {
-              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-              if ($null -eq $machineObj) {
-                throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+              if ($null -eq $vmObj) {
+                throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
             }
 
             $newNicObject = @()

src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVM.ps1

@@ -143,9 +143,14 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
 
         $PSBoundParameters['MachineId'] = $machineObj.Id

src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMDisk.ps1

@@ -70,23 +70,23 @@ function Get-AzScVmmVMDisk {
 
   process {
     try {
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
         if ($null -eq $machineObj) {
           throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
         }
       }
       catch {
-        throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
       }
 
       try {
-        $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-        if ($null -eq $machineObj) {
-          throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+        $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+        if ($null -eq $vmObj) {
+          throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
         }
       }
       catch {
-        throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+        throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
       }
 
       $disks = $vmObj | Select-Object -ExpandProperty StorageProfileDisk

src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMGuestAgent.ps1

@@ -143,10 +143,16 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
         foreach ($key in @('Name', 'ResourceGroupName', 'SubscriptionId')) {
             [void]$PSBoundParameters.Remove($key)

src/ScVmm/ScVmm.Autorest/custom/Get-AzScVmmVMNic.ps1

@@ -76,17 +76,17 @@ function Get-AzScVmmVMNic {
       }
     }
     catch {
-      throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+      throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId). Exception: $($_.Exception.Message)"
     }
 
     try {
       $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-      if ($null -eq $machineObj) {
-        throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+      if ($null -eq $vmObj) {
+        throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
       }
     }
     catch {
-      throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+      throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
     }
 
     $nics = $vmObj | Select-Object -ExpandProperty NetworkProfileNetworkInterface

src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVM.ps1

@@ -516,7 +516,7 @@ begin {
         # Check if Hybrid Compute machine resource exists or create a new one
 
         try {
-            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
             if ($null -eq $machineObj) {
                 throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
             }
@@ -538,18 +538,32 @@ begin {
                 if ($null -eq $Location) {
                     throw "The parent Machine resource does not exist. Location is required while creating a new machine."
                 }
-                if ($Tag) {
-                    $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -Location $Location -Tag $Tag -Kind $MACHINE_KIND_SCVMM
-                } else {
-                    $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -Location $Location -Kind $MACHINE_KIND_SCVMM
+                try {
+                    if ($Tag) {
+                        $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name `
+                            -ResourceGroupName $ResourceGroupName `
+                            -SubscriptionId $SubscriptionId `
+                            -Location $Location -Tag $Tag -Kind $MACHINE_KIND_SCVMM `
+                            -ErrorAction Stop
+                    }
+                    else {
+                        $machineObj = Az.ScVmm.internal\New-AzScVmmMachine -Name $Name `
+                            -ResourceGroupName $ResourceGroupName `
+                            -SubscriptionId $SubscriptionId `
+                            -Location $Location -Kind $MACHINE_KIND_SCVMM `
+                            -ErrorAction Stop
+                    }
+                }
+                catch {
+                    throw "Machine creation failed for VM '$Name'. Exception: $($_.Exception.Message)"
                 }
 
                 if ($null -eq $machineObj) {
-                    throw "Failed to create the machine resource for the new virtual machine."
+                    throw "Failed to create the machine resource for the new virtual machine '$Name'."
                 }
             }
             else {
-                throw $_
+                throw
             }
         }
 

src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMCheckpoint.ps1

@@ -187,10 +187,16 @@ begin {
 
         # Custom Logic Begin
 
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
         foreach ($key in @('Name', 'ResourceGroupName', 'SubscriptionId')) {
             [void]$PSBoundParameters.Remove($key)

src/ScVmm/ScVmm.Autorest/custom/New-AzScVmmVMGuestAgent.ps1

@@ -187,7 +187,16 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+            throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
+        }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
         if (($null -eq $machineObj.Identity) -or $machineObj.Identity.Type -ne 'SystemAssigned') {
             $machineObj = Az.ScVmm.internal\Update-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -IdentityType 'SystemAssigned'

src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVM.ps1

@@ -212,10 +212,16 @@ begin {
         }
 
         # Fetch machine details
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
+
         $PSBoundParameters['MachineId'] = $machineObj.Id
 
         if ($PSBoundParameters.ContainsKey('DeleteFromHost')) {

src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMCheckpoint.ps1

@@ -197,9 +197,14 @@ begin {
 
         # Custom Logic Begin
 
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
 
         $PSBoundParameters['MachineId'] = $machineObj.Id

src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMDisk.ps1

@@ -172,23 +172,23 @@ function Remove-AzScVmmVMDisk {
           }
 
           try {
-            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
             if ($null -eq $machineObj) {
               throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
             }
           }
           catch {
-            throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
           }
 
           try {
-            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-            if ($null -eq $machineObj) {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+            $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+            if ($null -eq $vmObj) {
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
             }
           }
           catch {
-            throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+            throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
           }
 
           $newDiskObject = @()

src/ScVmm/ScVmm.Autorest/custom/Remove-AzScVmmVMNic.ps1

@@ -172,23 +172,23 @@ function Remove-AzScVmmVMNic {
             }
 
             try {
-              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
+              $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $vmName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
               if ($null -eq $machineObj) {
                 throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
               }
             }
             catch {
-              throw "Virtual Machine $vmName not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+              throw "Failed to get VM '$vmName' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
             }
 
             try {
-              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id
-              if ($null -eq $machineObj) {
-                throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              $vmObj = Az.ScVmm.internal\Get-AzScVmmVM -MachineId $machineObj.Id -ErrorAction Stop
+              if ($null -eq $vmObj) {
+                throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'."
               }
             }
             catch {
-              throw "Failed to fetch Virtual Machine Object for Virtual Machine $vmName"
+              throw "Failed to fetch Virtual Machine Object using MachineId $($machineObj.Id) for Virtual Machine '$vmName'. Exception: $($_.Exception.Message)"
             }
 
           if (-not $diskFound) {

src/ScVmm/ScVmm.Autorest/custom/Restart-AzScVmmVM.ps1

@@ -160,9 +160,14 @@ begin {
         }
 
         # Custom Logic Begin
-        $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-        if ($null -eq $machineObj) {
-            throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+        try {
+            $machineObj = Az.ScVmm.internal\Get-AzScVmmMachine -Name $Name -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId -ErrorAction Stop
+            if ($null -eq $machineObj) {
+                throw "Virtual Machine $Name not found in Resource Group $ResourceGroupName (SubscriptionId $SubscriptionId)"
+            }
+        }
+        catch {
+          throw "Failed to get VM '$Name' in Resource Group '$ResourceGroupName' (SubscriptionId '$SubscriptionId'). Exception: $($_.Exception.Message)"
         }
 
         $PSBoundParameters['MachineId'] = $machineObj.Id