Changed Get-Extension response to get values from SQL config, not public settings in response. Fixed tests.

Author: Anil Kumar Yelam

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/SqlIaaSExtensionTests.ps1

@@ -89,7 +89,8 @@ function Test-SetAzureRmVMSqlServerAKVExtension
 
         # 3) Verifies settings are correct given input
 
-        Assert-AreEqual $extension.KeyVaultCredentialSettings.CredentialName "CredentialTesting";
+        Assert-AreEqual $extension.KeyVaultCredentialSettings.Credentials.Count 1;
+		Assert-AreEqual $extension.KeyVaultCredentialSettings.Credentials[0].CredentialName "CredentialTesting"
 
         # 4) Update extension values
 
@@ -98,8 +99,9 @@ function Test-SetAzureRmVMSqlServerAKVExtension
 
         # 5) Verify changes
         $extension = Get-AzureRmVMSqlServerExtension -ResourceGroupName $rgname -VmName $vmName -Name $extensionName;
-
-        Assert-AreEqual $extension.KeyVaultCredentialSettings.CredentialName "CredentialTest"
+		
+        Assert-AreEqual $extension.KeyVaultCredentialSettings.Credentials.Count 2;
+		Assert-AreEqual $extension.KeyVaultCredentialSettings.Credentials[1].CredentialName "CredentialTest"
 
         # 6) Test with correct Name and Version
 

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.SqlIaaSExtensionTests/TestSqlIaaSExtensionWith2016Image.json

@@ -271,14 +271,16 @@
     <Compile Include="Extension\SqlServer\AzureVMSqlServerAutoBackupSettings.cs" />
     <Compile Include="Extension\SqlServer\AzureVMSqlServerAutoPatchingSettings.cs" />
     <Compile Include="Extension\SqlServer\AzureVMSqlServerAutoTelemetrySettings.cs" />
+    <Compile Include="Extension\SqlServer\AzureVMSqlServerConfiguration.cs" />
+    <Compile Include="Extension\SqlServer\AzureVMSqlServerKeyVaultCredential.cs" />
     <Compile Include="Extension\SqlServer\NewAzureRmVMSqlServerAutoBackupConfig.cs" />
     <Compile Include="Extension\SqlServer\NewAzureRmVMSqlServerAutoPatchingConfig.cs" />
     <Compile Include="Extension\SqlServer\NewAzureRmVMSqlServerKeyVaultCredentialConfig.cs" />
     <Compile Include="Extension\SqlServer\PrivateKeyVaultCredentialSettings.cs" />
     <Compile Include="Extension\SqlServer\AzureVMSqlServerPrivateSettings.cs" />
     <Compile Include="Extension\SqlServer\AzureVMSqlServerPublicSettings.cs" />
     <Compile Include="Extension\SqlServer\GetAzureVMSqlServerExtensionCommand.cs" />
-    <Compile Include="Extension\SqlServer\KeyVaultCredentialSettings.cs" />
+    <Compile Include="Extension\SqlServer\AzureVMSqlServerKeyVaultCredentialSettings.cs" />
     <Compile Include="Extension\SqlServer\NewAzureVMSqlServerAutoBackupConfig.cs" />
     <Compile Include="Extension\SqlServer\NewAzureVMSqlServerAutoPatchingConfig.cs" />
     <Compile Include="Extension\SqlServer\NewAzureVMSqlServerKeyVaultCredentialConfig.cs" />

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

@@ -0,0 +1,100 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Compute
+{
+    /// <summary>
+    /// SQL Server Configuration object that is returned by extension as a substatus.
+    /// </summary>
+    public class AzureVMSqlServerConfiguration
+    {
+        /// <summary>
+        /// Auto Patching report object
+        /// </summary>
+        public class AutoPatchingReport
+        { 
+            public string Name { get; set; }
+            public int Status { get; set; }
+            public bool Enable { get; set; }
+            public string DayOfWeek { get; set; }
+            public int MaintenanceWindowStartingHour { get; set; }
+            public int MaintenanceWindowDuration { get; set; }
+            public string PatchCategory { get; set; }
+        }
+
+        /// <summary>
+        /// Auto Backup report object
+        /// </summary>
+        public class AutoBackupReport
+        {
+            public string Name { get; set; }
+            public int Status { get; set; }
+            public bool Enable { get; set; }
+            public bool EnableEncryption { get; set; }
+            public string StorageAccountUrl { get; set; }
+            public int RetentionPeriod { get; set; }
+            public string BackupScheduleType { get; set; }
+            public bool? BackupSystemDbs { get; set; }
+            public string FullBackupFrequency { get; set; }
+            public int? FullBackupStartTime { get; set; }
+            public int? FullBackupWindowHours { get; set; }
+            public int? LogBackupFrequency { get; set; }
+        }
+
+        /// <summary>
+        /// Azure Key Vault report object
+        /// </summary>
+        public class AzureKeyVaultReport
+        {
+            public string Name { get; set; }
+            public int Status { get; set; }
+            public bool Enable { get; set; }
+            public bool EnableEncryption { get; set; }
+            public List<AzureVMSqlServerKeyVaultCredential> CredentialsList { get; set; }
+        }
+        
+        /// <summary>
+        /// Auto telemetry report object
+        /// </summary>
+        public class AutoTelemetrySettingsReport
+        {
+            public string Name { get; set; }
+            public int Status { get; set; }
+            public string Location { get; set; }
+            public string PerformanceCollectorStatus { get; set; }
+        }
+
+        /// <summary>
+        /// Auto patching settings
+        /// </summary>
+        public AutoPatchingReport AutoPatching { get; set; }
+
+        /// <summary>
+        /// Auto-backup settings
+        /// </summary>
+        public AutoBackupReport AutoBackup { get; set; }
+
+        /// <summary>
+        /// AkV settings
+        /// </summary>
+        public AzureKeyVaultReport AzureKeyVault { get; set; }
+
+        /// <summary>
+        /// Auto-telemetry settings
+        /// </summary>
+        public AutoTelemetrySettingsReport AutoTelemetryReport { get; set; }
+    }
+}

src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/AzureVMSqlServerConfiguration.cs

@@ -0,0 +1,32 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Compute
+{
+    /// <summary>
+    /// AKV Credential
+    /// </summary>
+    public class AzureVMSqlServerKeyVaultCredential
+    {
+        /// <summary>
+        /// Name of the credential
+        /// </summary>
+        public string CredentialName { get; set; }
+
+        /// <summary>
+        /// Key vault that this credential provides access to.
+        /// </summary>
+        public string KeyVaultName { get; set; }
+    }
+}

src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/AzureVMSqlServerKeyVaultCredential.cs

@@ -12,8 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System.Security;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.Compute
 {
@@ -43,7 +43,7 @@ public class KeyVaultCredentialSettings
         /// <value>
         /// The azure key vault URL for Credential Management.
         /// </value>
-        [JsonIgnoreAttribute()]
+        [JsonIgnore]
         public string AzureKeyVaultUrl { get; set; }
 
         /// <summary>
@@ -52,7 +52,7 @@ public class KeyVaultCredentialSettings
         /// <value>
         /// The name of the service principal to access the Azure Key Vault.
         /// </value>
-        [JsonIgnoreAttribute()]
+        [JsonIgnore]
         public string ServicePrincipalName { get; set; }
 
         /// <summary>
@@ -61,7 +61,16 @@ public class KeyVaultCredentialSettings
         /// <value>
         /// The service principal secret to access the Azure Key Vault.
         /// </value>
-        [JsonIgnoreAttribute()]
+        [JsonIgnore]
         public string ServicePrincipalSecret { get; set; }
+
+        /// <summary>
+        /// Gets the credentials
+        /// </summary>
+        /// <value>
+        /// The list of existing credentials for AKV.
+        /// </value>
+        [JsonIgnore]
+        public List<AzureVMSqlServerKeyVaultCredential> Credentials { get; set; }
     }
 }

src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/KeyVaultCredentialSettings.cs renamed to src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/AzureVMSqlServerKeyVaultCredentialSettings.cs

@@ -18,6 +18,7 @@
 using Microsoft.Azure.Management.Compute.Models;
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
@@ -33,6 +34,22 @@ namespace Microsoft.Azure.Commands.Compute
     public class GetAzureVMSqlServerExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         protected const string GetSqlServerExtensionParamSetName = "GetSqlServerExtension";
+        protected const string SqlConfigurationSubStatusCode = "ComponentStatus/SQL Configuration/succeeded";
+
+        // These maps are needed due to mismatch in the values while we set/get these parameters.
+        protected static readonly Dictionary<string, string> AutoBackupScheduleTypeMap =
+            new Dictionary<string, string>() 
+            {
+                { "NOTSET" , null },
+                { "SYSTEM" , "Automated" },
+                { "CUSTOM" , "Manual" }
+            };
+        protected static readonly Dictionary<string, string> AutoPatchingCategoryMap =
+            new Dictionary<string, string>() 
+            {
+                { "WindowsMandatoryUpdates" , "Important" },
+            };
+
 
         [Parameter(
            Mandatory = true,
@@ -102,11 +119,29 @@ private VirtualMachineSqlServerExtensionContext GetSqlServerExtensionContext(PSV
         {
             SqlServerPublicSettings extensionPublicSettings = null;
             VirtualMachineSqlServerExtensionContext context = null;
+            
+            // Extract sql configuration information from one of the sub statuses
+            if (extension.SubStatuses == null
+                || extension.SubStatuses.FirstOrDefault(s =>
+                    s.Code.Equals(SqlConfigurationSubStatusCode, StringComparison.InvariantCultureIgnoreCase)) == null)
+            {
+                ThrowTerminatingError(
+                   new ErrorRecord(
+                       new Exception(
+                           String.Format(
+                               CultureInfo.CurrentUICulture,
+                               Properties.Resources.AzureVMSqlServerSqlConfigurationNotFound,
+                               extension.SubStatuses)),
+                   string.Empty,
+                   ErrorCategory.ParserError,
+                   null));
+            }
 
+            string sqlConfiguration = extension.SubStatuses.First(s => s.Code.Equals(SqlConfigurationSubStatusCode, StringComparison.InvariantCultureIgnoreCase)).Message;
+            
             try
             {
-                extensionPublicSettings = string.IsNullOrEmpty(extension.PublicSettings) ? null
-                                  : JsonConvert.DeserializeObject<SqlServerPublicSettings>(extension.PublicSettings);
+                AzureVMSqlServerConfiguration settings = JsonConvert.DeserializeObject<AzureVMSqlServerConfiguration>(sqlConfiguration);
 
                 // #$ISSUE- extension.Statuses is always null, follow up with Azure team
                 context = new VirtualMachineSqlServerExtensionContext
@@ -122,12 +157,38 @@ private VirtualMachineSqlServerExtensionContext GetSqlServerExtensionContext(PSV
                     PublicSettings = JsonConvert.SerializeObject(extensionPublicSettings),
                     ProtectedSettings = extension.ProtectedSettings,
                     ProvisioningState = extension.ProvisioningState,
-                    AutoBackupSettings = extensionPublicSettings.AutoBackupSettings,
-                    AutoPatchingSettings = extensionPublicSettings.AutoPatchingSettings,
-                    KeyVaultCredentialSettings = extensionPublicSettings.KeyVaultCredentialSettings,
+                    AutoBackupSettings = settings.AutoBackup == null ? null : new AutoBackupSettings()
+                    {
+                        Enable = settings.AutoBackup.Enable,
+                        EnableEncryption = settings.AutoBackup.EnableEncryption,
+                        RetentionPeriod = settings.AutoBackup.RetentionPeriod,
+                        StorageUrl = settings.AutoBackup.StorageAccountUrl,
+                        BackupSystemDbs = settings.AutoBackup.BackupSystemDbs,
+                        BackupScheduleType = string.IsNullOrEmpty(settings.AutoBackup.BackupScheduleType) ? null : AutoBackupScheduleTypeMap[settings.AutoBackup.BackupScheduleType],
+                        FullBackupFrequency = settings.AutoBackup.FullBackupFrequency,
+                        FullBackupStartTime = settings.AutoBackup.FullBackupStartTime,
+                        FullBackupWindowHours = settings.AutoBackup.FullBackupWindowHours,
+                        LogBackupFrequency = settings.AutoBackup.LogBackupFrequency
+                    },
+                    AutoPatchingSettings = settings.AutoPatching == null ? null : new AutoPatchingSettings()
+                    {
+                        Enable = settings.AutoPatching.Enable,
+                        DayOfWeek = settings.AutoPatching.DayOfWeek,
+                        MaintenanceWindowDuration = settings.AutoPatching.MaintenanceWindowDuration,
+                        MaintenanceWindowStartingHour = settings.AutoPatching.MaintenanceWindowStartingHour,
+                        PatchCategory = string.IsNullOrEmpty(settings.AutoPatching.PatchCategory) ? null : AutoPatchingCategoryMap[settings.AutoPatching.PatchCategory]
+                    },
+                    KeyVaultCredentialSettings = settings.AzureKeyVault == null ? null : new KeyVaultCredentialSettings()
+                    {
+                        Enable = settings.AzureKeyVault.Enable,
+                        Credentials = settings.AzureKeyVault.CredentialsList
+                    },
+                    AutoTelemetrySettings = settings.AutoTelemetryReport == null ? null : new AutoTelemetrySettings()
+                    {
+                        Region = settings.AutoTelemetryReport.Location,
+                    },
                     Statuses = extension.Statuses
                 };
-
             }
             catch (JsonException e)
             {
@@ -136,8 +197,8 @@ private VirtualMachineSqlServerExtensionContext GetSqlServerExtensionContext(PSV
                         new JsonException(
                             String.Format(
                                 CultureInfo.CurrentUICulture,
-                                Properties.Resources.AzureVMSqlServerWrongSettingsFormat,
-                                extension.PublicSettings),
+                                Properties.Resources.AzureVMSqlServerWrongConfigFormat,
+                                sqlConfiguration),
                             e),
                         string.Empty,
                         ErrorCategory.ParserError,

src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/GetAzureVMSqlServerExtensionCommand.cs

@@ -55,5 +55,10 @@ public class VirtualMachineSqlServerExtensionContext : PSVirtualMachineExtension
         /// Key Vault Credential settings
         /// </summary>
         public KeyVaultCredentialSettings KeyVaultCredentialSettings;
+
+        /// <summary>
+        /// Auto Telemetry settings
+        /// </summary>
+        public AutoTelemetrySettings AutoTelemetrySettings;
     }
 }