Resolve some comments

Author: yantang-msft

src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs

@@ -483,7 +483,7 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip)
     <value>Storage account endpoint is not defined or can not be retrieved automatically..</value>
   </data>
   <data name="DiagnosticsExtensionIaaSConfigElementNotDefined" xml:space="preserve">
-    <value>No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file.</value>
+    <value>No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file.</value>
   </data>
   <data name="DiagnosticsExtensionInvalidConfigFileFormat" xml:space="preserve">
     <value>Invalid diagnostics configuration file. It should be in Invalid diagnostics configuration file. It should be in either xml or json format.either xml or json format.</value>

src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx

@@ -129,38 +129,37 @@ protected override void ValidateConfiguration()
             doc.Load(DiagnosticsConfigurationPath);
 
             // Make sure the configuration element exist
-            var config = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns);
-            if (config == null)
+            var configElement = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns);
+            if (configElement == null)
             {
                 throw new ArgumentException(Resources.DiagnosticsExtensionPaaSConfigElementNotDefined);
             }
 
             // The element <StorageAccount> is not meant to be set by the user in the public config.
             // Make sure it matches the storage account in the private config.
-            var node = doc.SelectSingleNode("//ns:StorageAccount", ns);
-            if(node != null)
+            var storageAccountElement = doc.SelectSingleNode("//ns:StorageAccount", ns);
+            if(storageAccountElement != null)
             {
                 // The StorageAccount is empty, we must set it
-                if (string.IsNullOrEmpty(node.InnerText))
+                if (string.IsNullOrEmpty(storageAccountElement.InnerText))
                 {
-                    var insertIndex = PublicConfiguration.IndexOf("</StorageAccount>");
-                    PublicConfiguration = PublicConfiguration.Insert(insertIndex, StorageAccountName);
+                    storageAccountElement.InnerText = StorageAccountName;
+                    PublicConfiguration = doc.OuterXml;
                 }
-                else if (!string.IsNullOrEmpty(node.InnerText) && string.Compare(node.InnerText, StorageAccountName, true) != 0)
+                else if (!string.IsNullOrEmpty(storageAccountElement.InnerText) && string.Compare(storageAccountElement.InnerText, StorageAccountName, true) != 0)
                 {
                     throw new ArgumentException(Resources.DiagnosticsExtensionNoMatchStorageAccount);
                 }
             }
             else
             {
-                // the StorageAccount is not there. we must set it
-                string storageAccountElem = "\n<StorageAccount>" + StorageAccountName + "</StorageAccount>\n";
-
-                // insert it after </WadCfg> or </WadCfgBlob>
-                int wadCfgEndIndex = PublicConfiguration.IndexOf("</WadCfg>");
-                int wadCfgBlobEndIndex = PublicConfiguration.IndexOf("</WadCfgBlob>");
-                int insertIndex = wadCfgEndIndex >= 0 ? wadCfgEndIndex + "</WadCfg>".Length : wadCfgBlobEndIndex + "</WadCfgBlob>".Length;
-                PublicConfiguration = PublicConfiguration.Insert(insertIndex, storageAccountElem);
+                // The StorageAccount is not there. we must set it
+                storageAccountElement = doc.CreateElement("StorageAccount", XmlNamespace);
+                storageAccountElement.InnerText = StorageAccountName;
+
+                // Insert it after <WadCfg> or <WadCfgBlob>
+                configElement.ParentNode.AppendChild(storageAccountElement);
+                PublicConfiguration = doc.OuterXml;
             }
 
             // Make sure the storage account name in PrivateConfig matches.

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs

@@ -784,12 +784,12 @@
     <value>WadCfg start element in the config is not matching the end element.</value>
   </data>
   <data name="DiagnosticsExtensionIaaSConfigElementNotDefined" xml:space="preserve">
-    <value>No WadCfg, WadCfgBlob or xmlCfg element is defined in the configuration file.</value>
+    <value>No WadCfg, WadCfgBlob or xmlCfg element defined in the configuration file.</value>
   </data>
   <data name="DiagnosticsExtensionInvalidConfigFileFormat" xml:space="preserve">
     <value>Invalid diagnostics configuration file. It should be in either xml or json format.</value>
   </data>
   <data name="DiagnosticsExtensionPaaSConfigElementNotDefined" xml:space="preserve">
-    <value>No WadCfg or WadCfgBlob element is defined in the configuration file.</value>
+    <value>No WadCfg or WadCfgBlob element defined in the configuration file.</value>
   </data>
 </root>