Merge pull request Azure#4360 from ferno-ms/preview

make Data Sync schema parsing case insensitive

Author: markcowl

src/ResourceManager/Sql/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Schema file parsing for Update-AzureRmSqlSyncGroup is now case insensitive.
 
 ## Version 3.2.1
 

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

@@ -313,6 +313,7 @@
     <Compile Include="UnitTests\AzureSqlDatabaseServerAttributeTests.cs" />
     <Compile Include="UnitTests\AzureSqlDatabaseIndexRecommendationAttributeTests.cs" />
     <Compile Include="UnitTests\AzureSqlCapabilityAttributeTests.cs" />
+    <Compile Include="UnitTests\AzureSqlDataSyncTests.cs" />
     <Compile Include="UnitTests\AzureSqlServerUpgradeAttributeTests.cs" />
     <Compile Include="UnitTests\AzureSqlServerDisasterRecoveryConfigurationTests.cs" />
     <Compile Include="UnitTests\AzureSqlServiceTierAdvisorAttributeTests.cs" />
@@ -828,7 +829,7 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestDatabaseTransparentDataEncryptionUpdate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestServerTransparentDataEncryptionProtectorGet.json">
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestServerTransparentDataEncryptionProtectorGet.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestServerTransparentDataEncryptionProtectorSet.json">

src/ResourceManager/Sql/Commands.Sql.Test/UnitTests/AzureSqlDataSyncTests.cs

@@ -0,0 +1,61 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 Microsoft.Azure.Commands.Sql.DataSync.Cmdlet;
+using Microsoft.Azure.Commands.Sql.DataSync.Model;
+using Microsoft.Azure.Commands.Sql.Test.Utilities;
+using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Newtonsoft.Json.Linq;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.Sql.Test.UnitTests
+{
+    public class AzureSqlDataSyncTests
+    {
+        public AzureSqlDataSyncTests(ITestOutputHelper output)
+        {
+            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ParseSyncGroupSchema()
+        {
+            string schema = @"{
+                ""mastersyncMemberNAME"": ""masterMember"",
+                ""Tables"": [
+                    {
+                        ""QUOTEDNAME"": ""testTable"",
+                        ""columns"": [
+                            {
+                                ""QuotedName"": ""testColumn""
+                            }
+                        ]
+                    }
+                ]
+            }";
+
+            var cmdlet = new UpdateAzureSqlSyncGroup();
+            AzureSqlSyncGroupSchemaModel schemaModel = AzureSqlSyncGroupCmdletBase.ConstructSchemaFromJObject(JObject.Parse(schema));
+
+            Assert.Equal("masterMember", schemaModel.MasterSyncMemberName);
+            Assert.Equal(1, schemaModel.Tables.Count);
+            Assert.Equal("testTable", schemaModel.Tables[0].QuotedName);
+            Assert.Equal(1, schemaModel.Tables[0].Columns.Count);
+            Assert.Equal("testColumn", schemaModel.Tables[0].Columns[0].QuotedName);
+        }
+    }
+}

src/ResourceManager/Sql/Commands.Sql/Data Sync/Cmdlet/AzureSqlSyncGroupCmdletBase.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Management.Automation;
@@ -45,43 +46,63 @@ protected override AzureSqlDataSyncAdapter InitModelAdapter(IAzureSubscription s
         /// </summary>
         /// <param name="filePath">The path of the schema file</param>
         /// <returns>A schema object of member database</returns>
-        protected AzureSqlSyncGroupSchemaModel ConstructSchemaFromFile(string filePath)
+        protected static AzureSqlSyncGroupSchemaModel ConstructSchemaFromFile(string filePath)
         {
-            AzureSqlSyncGroupSchemaModel schema = new AzureSqlSyncGroupSchemaModel();
             try
             {
                 JObject jSchema = JObject.Parse(File.ReadAllText(filePath));
-                schema.MasterSyncMemberName = jSchema["masterSyncMemberName"] == null ? null : jSchema["masterSyncMemberName"].ToString();
-                List<AzureSqlSyncGroupSchemaTableModel> tables = new List<AzureSqlSyncGroupSchemaTableModel>();
-                JArray jTables = (JArray)jSchema["tables"];
-                if (jTables != null)
+                return ConstructSchemaFromJObject(jSchema);
+            }
+            catch (Newtonsoft.Json.JsonReaderException)
+            {
+                throw new PSArgumentException("The schema file is empty or invalid!", "SchemaFile");
+            }
+        }
+
+        /// <summary>
+        /// Construct schema for schema object
+        /// </summary>
+        /// <param name="jSchema">JObject containing description of the schema</param>
+        /// <returns>A schema object of member database</returns>
+        public static AzureSqlSyncGroupSchemaModel ConstructSchemaFromJObject(JObject jSchema)
+        {
+            AzureSqlSyncGroupSchemaModel schema = new AzureSqlSyncGroupSchemaModel();
+            JToken masterSyncMemberName = jSchema.GetValue("masterSyncMemberName", StringComparison.InvariantCultureIgnoreCase);
+            schema.MasterSyncMemberName = masterSyncMemberName == null ? null : masterSyncMemberName.ToString();
+            List<AzureSqlSyncGroupSchemaTableModel> tables = new List<AzureSqlSyncGroupSchemaTableModel>();
+            JArray jTables = (JArray)jSchema.GetValue("tables", StringComparison.InvariantCultureIgnoreCase);
+            if (jTables != null)
+            {
+                foreach (var jTableToken in jTables.Children())
                 {
-                    foreach (var jTable in jTables.Children())
+                    if (jTableToken.Type == JTokenType.Object)
                     {
+                        JObject jTable = (JObject)jTableToken;
                         AzureSqlSyncGroupSchemaTableModel table = new AzureSqlSyncGroupSchemaTableModel();
-                        table.QuotedName = jTable["quotedName"] == null ? null : jTable["quotedName"].ToString();
+                        JToken tableQuotedNameToken = jTable.GetValue("quotedName", StringComparison.InvariantCultureIgnoreCase);
+                        table.QuotedName = tableQuotedNameToken == null ? null : tableQuotedNameToken.ToString();
                         List<AzureSqlSyncGroupSchemaColumnModel> columns = new List<AzureSqlSyncGroupSchemaColumnModel>();
-                        JArray jColumns = (JArray)jTable["columns"];
+                        JArray jColumns = (JArray)jTable.GetValue("columns", StringComparison.InvariantCultureIgnoreCase);
                         if (jColumns != null)
                         {
-                            foreach (var jColumn in jColumns.Children())
+                            foreach (var jColumnToken in jColumns.Children())
                             {
-                                AzureSqlSyncGroupSchemaColumnModel column = new AzureSqlSyncGroupSchemaColumnModel();
-                                column.QuotedName = jColumn["quotedName"] == null ? null : jColumn["quotedName"].ToString();
-                                columns.Add(column);
+                                if (jColumnToken.Type == JTokenType.Object)
+                                {
+                                    AzureSqlSyncGroupSchemaColumnModel column = new AzureSqlSyncGroupSchemaColumnModel();
+                                    JToken columnQuotedNameToken = ((JObject)jColumnToken).GetValue("quotedName", StringComparison.InvariantCultureIgnoreCase);
+                                    column.QuotedName = columnQuotedNameToken == null ? null : columnQuotedNameToken.ToString();
+                                    columns.Add(column);
+                                }
                             }
                         }
                         table.Columns = columns;
                         tables.Add(table);
                     }
                 }
-                schema.Tables = tables;
-                return schema;
-            }
-            catch (Newtonsoft.Json.JsonReaderException)
-            {
-                throw new PSArgumentException("The schema file is empty or invalid!", "SchemaFile");
             }
+            schema.Tables = tables;
+            return schema;
         }
     }
 }