Upgrading extension commands (#20506)

Azure · Dec 26, 2022 · 48c591e · 48c591e
1 parent 08c9663
commit 48c591e
Show file tree

Hide file tree

Showing 8 changed files with 12,944 additions and 9,284 deletions.
diff --git a/src/Compute/Compute.Test/ScenarioTests/SqlIaaSExtensionTests.cs b/src/Compute/Compute.Test/ScenarioTests/SqlIaaSExtensionTests.cs
@@ -40,9 +40,9 @@ public void TestSqlIaaSAKVExtension()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestSqlIaaSExtensionWith2016Image()
+        public void TestSqlIaaSExtensionWith2017Image()
         {
-            TestRunner.RunTestScript("Test-SetAzureRmVMSqlServerExtensionWith2016Image");
+            TestRunner.RunTestScript("Test-SetAzureRmVMSqlServerExtensionWith2017Image");
         }
     }
 }
diff --git a/src/Compute/Compute.Test/ScenarioTests/SqlIaaSExtensionTests.ps1 b/src/Compute/Compute.Test/ScenarioTests/SqlIaaSExtensionTests.ps1
diff --git a/...re.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSAKVExtension.json b/...re.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSAKVExtension.json
diff --git a/...Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtension.json b/...Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtension.json
diff --git a/...s.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtensionWith2016Image.json b/...s.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtensionWith2016Image.json
diff --git a/...s.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtensionWith2017Image.json b/...s.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtensionWith2017Image.json
diff --git a/src/Compute/Compute/Extension/SqlServer/SetAzureVMSqlServerExtensionCommand.cs b/src/Compute/Compute/Extension/SqlServer/SetAzureVMSqlServerExtensionCommand.cs
@@ -103,7 +103,7 @@ public class SetAzureSqlServerExtensionCommand : VirtualMachineExtensionBaseCmdl
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
-
+            bool autoUpgradeMinorVersion = true;
 
             VirtualMachine vm = ComputeClient.ComputeManagementClient.VirtualMachines.Get(this.ResourceGroupName, this.VMName);
             if (vm != null && vm.Resources != null)
@@ -113,6 +113,7 @@ public override void ExecuteCmdlet()
                 {
                     this.Name = extension.Name;
                     this.Version = extension.TypeHandlerVersion;
+                    autoUpgradeMinorVersion = extension.AutoUpgradeMinorVersion ?? autoUpgradeMinorVersion;
                 }
 
                 this.Location = vm.Location;
@@ -124,6 +125,7 @@ public override void ExecuteCmdlet()
                 Publisher = VirtualMachineSqlServerExtensionContext.ExtensionPublishedNamespace,
                 VirtualMachineExtensionType = VirtualMachineSqlServerExtensionContext.ExtensionPublishedType,
                 TypeHandlerVersion = string.IsNullOrEmpty(this.Version) ? VirtualMachineSqlServerExtensionContext.ExtensionDefaultVersion : this.Version,
+                AutoUpgradeMinorVersion = autoUpgradeMinorVersion,
                 Settings = this.GetPublicConfiguration(),
                 ProtectedSettings = this.GetPrivateConfiguration(),
             };

diff --git a/src/Compute/Compute/Extension/SqlServer/VirtualMachineSqlServerExtensionContext.cs b/src/Compute/Compute/Extension/SqlServer/VirtualMachineSqlServerExtensionContext.cs
@@ -39,7 +39,7 @@ public class VirtualMachineSqlServerExtensionContext : PSVirtualMachineExtension
         /// <summary>
         /// SQLVM Extension's default version 
         /// </summary>
-        public const string ExtensionDefaultVersion = "1.2";
+        public const string ExtensionDefaultVersion = "2.0";
 
         /// <summary>
         /// Auto-patching settings