Nat rule migration improvements (#161)

* add milliseconds to logging

* Remove use of AzJob for LB save to simplify flow

* v2.5.40

* Update AzureBasicLoadBalancerUpgrade/module/AzureBasicLoadBalancerUpgrade/modules/NatRulesMigration/NatRulesMigration.psm1

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>

Author: mbrat2005

AzureBasicLoadBalancerUpgrade/module/AzureBasicLoadBalancerUpgrade/AzureBasicLoadBalancerUpgrade.psd1

@@ -12,7 +12,7 @@
     RootModule = 'AzureBasicLoadBalancerUpgrade'
 
     # Version number of this module.
-    ModuleVersion = '2.5.39'
+    ModuleVersion = '2.5.40'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -107,7 +107,7 @@
             # IconUri = ''
 
             # ReleaseNotes of this module
-            ReleaseNotes = 'Improve NAT Rule migration logging and error handling.'
+            ReleaseNotes = 'Simplify NAT Rule migration.'
 
             # Prerelease string of this module
             # Prerelease = 'beta'

AzureBasicLoadBalancerUpgrade/module/AzureBasicLoadBalancerUpgrade/modules/Log/Log.psm1

@@ -17,7 +17,7 @@ function log {
         $terminateOnError
     )
 
-    $timestamp = Get-Date -Format 'yyyy-MM-ddTHH:mm:sszz'
+    $timestamp = Get-Date -Format 'yyyy-MM-ddTHH:mm:ss.ffzz'
     Add-Content -Path ("Start-AzBasicLoadBalancerUpgrade.log") -Value ($timestamp + " " + "[$Severity] - " + $Message) -Force
     $outputMessage = "{0} [{1}]:{2}" -f $timestamp, $Severity,($Message -replace '\s\s+?','')
     If ($global:FollowLog) {

AzureBasicLoadBalancerUpgrade/module/AzureBasicLoadBalancerUpgrade/modules/NatRulesMigration/NatRulesMigration.psm1

@@ -152,24 +152,14 @@ function NatRulesMigration {
         return
     }
     else {
-        log -Message "[NatRulesMigration] $($StdLoadBalancer.InboundNatRules.Count) NAT Rules migrated. Saving Standard Load Balancer '$($StdLoadBalancer.Name)'..."
+        log -Message "[NatRulesMigration] $($StdLoadBalancer.InboundNatRules.Count) NAT Rules applied to LB config. Saving Standard Load Balancer '$($StdLoadBalancer.Name)'..."
 
         try {
             $ErrorActionPreference = 'Stop'
-
-            $UpdateLBNATRulesJob = Set-AzLoadBalancer -LoadBalancer $StdLoadBalancer -AsJob
-
-            While ($UpdateLBNATRulesJob.State -eq 'Running') {
-                Start-Sleep -Seconds 15
-                log -Message "[NatRulesMigration] Waiting for saving standard load balancer $($StdLoadBalancer.Name) job to complete..."
-            }
-
-            If ($UpdateLBNATRulesJob.Error -or $UpdateLBNATRulesJob.State -eq 'Failed') {
-                log -Severity Error -Message "Saving Standard Load Balancer $($StdLoadBalancer.Name) failed with the following errors: $($UpdateLBNATRulesJob.error; $UpdateLBNATRulesJob | Receive-Job). Migration will continue--to recover, manually add the NAT rules to the load balancer, then correct NAT Rule NIC membership after the script completes."
-            }
+            Set-AzLoadBalancer -LoadBalancer $StdLoadBalancer > $null
         }
         catch {
-            $message = "[NatRulesMigration] Failed to update new standard load balancer '$($stdLoadBalancer.Name)' in resource group '$($StdLoadBalancer.ResourceGroupName)' after attempting to add migrated inbound NAT rule configurations. Migration will continue, INBOUND NAT RULES WILL NEED TO BE MANUALLY ADDED to the load balancer. Error: $_"
+            $message = "[NatRulesMigration] Failed to update new standard load balancer '$($stdLoadBalancer.Name)' in resource group '$($StdLoadBalancer.ResourceGroupName)' after attempting to apply NAT Rules to LB config. Migration will continue, INBOUND NAT RULES WILL NEED TO BE MANUALLY ADDED to the load balancer. Error: $_"
             log "Error" $message
         }
     }