Merge pull request #1770 from yantang-msft/WadCfgBlob

Support WadCfgBlob in the config file

Author: Hovsep

src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs

@@ -36,6 +36,7 @@ public static class DiagnosticsHelper
         private static string XmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration";
         private static string EncodedXmlCfg = "xmlCfg";
         private static string WadCfg = "WadCfg";
+        private static string WadCfgBlob = "WadCfgBlob";
         private static string StorageAccount = "storageAccount";
         private static string Path = "path";
         private static string ExpandResourceDirectory = "expandResourceDirectory";
@@ -163,6 +164,7 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
             var publicConfig = GetPublicConfigJObjectFromJsonFile(configurationPath);
             var properties = publicConfig.Properties().Select(p => p.Name);
             var wadCfgProperty = properties.FirstOrDefault(p => p.Equals(WadCfg, StringComparison.OrdinalIgnoreCase));
+            var wadCfgBlobProperty = properties.FirstOrDefault(p => p.Equals(WadCfgBlob, StringComparison.OrdinalIgnoreCase));
             var xmlCfgProperty = properties.FirstOrDefault(p => p.Equals(EncodedXmlCfg, StringComparison.OrdinalIgnoreCase));
 
             var hashTable = new Hashtable();
@@ -172,13 +174,17 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
             {
                 hashTable.Add(wadCfgProperty, publicConfig[wadCfgProperty]);
             }
+            else if (wadCfgBlobProperty != null)
+            {
+                hashTable.Add(wadCfgBlobProperty, publicConfig[wadCfgBlobProperty]);
+            }
             else if (xmlCfgProperty != null)
             {
                 hashTable.Add(xmlCfgProperty, publicConfig[xmlCfgProperty]);
             }
             else
             {
-                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionConfigNoWadCfgOrXmlCfg);
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefined);
             }
 
             return hashTable;

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

@@ -482,8 +482,8 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip)
   <data name="DiagnosticsExtensionNullStorageAccountEndpoint" xml:space="preserve">
     <value>Storage account endpoint is not defined or can not be retrieved automatically..</value>
   </data>
-  <data name="DiagnosticsExtensionConfigNoWadCfgOrXmlCfg" xml:space="preserve">
-    <value>WadCfg or xmlCfg is not defined in configuration file.</value>
+  <data name="DiagnosticsExtensionIaaSConfigElementNotDefined" xml:space="preserve">
+    <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

@@ -35,6 +35,7 @@ public static class DiagnosticsHelper
         private static string XmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration";
         private static string EncodedXmlCfg = "xmlCfg";
         private static string WadCfg = "WadCfg";
+        private static string WadCfgBlob = "WadCfgBlob";
         private static string StorageAccount = "storageAccount";
         private static string Path = "path";
         private static string ExpandResourceDirectory = "expandResourceDirectory";
@@ -162,6 +163,7 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
             var publicConfig = GetPublicConfigJObjectFromJsonFile(configurationPath);
             var properties = publicConfig.Properties().Select(p => p.Name);
             var wadCfgProperty = properties.FirstOrDefault(p => p.Equals(WadCfg, StringComparison.OrdinalIgnoreCase));
+            var wadCfgBlobProperty = properties.FirstOrDefault(p => p.Equals(WadCfgBlob, StringComparison.OrdinalIgnoreCase));
             var xmlCfgProperty = properties.FirstOrDefault(p => p.Equals(EncodedXmlCfg, StringComparison.OrdinalIgnoreCase));
 
             var hashTable = new Hashtable();
@@ -171,13 +173,17 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
             {
                 hashTable.Add(wadCfgProperty, publicConfig[wadCfgProperty]);
             }
+            else if (wadCfgBlobProperty != null)
+            {
+                hashTable.Add(wadCfgBlobProperty, publicConfig[wadCfgBlobProperty]);
+            }
             else if (xmlCfgProperty != null)
             {
                 hashTable.Add(xmlCfgProperty, publicConfig[xmlCfgProperty]);
             }
             else
             {
-                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionConfigNoWadCfgOrXmlCfg);
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefined);
             }
 
             return hashTable;

src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs

@@ -123,33 +123,43 @@ protected override void ValidateConfiguration()
             publicConfigElem.SetAttributeValue("xmlns", XmlNamespace);
             PublicConfiguration = publicConfigElem.ToString();
 
-            // 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.
             XmlDocument doc = new XmlDocument();
             XmlNamespaceManager ns = new XmlNamespaceManager(doc.NameTable);
             ns.AddNamespace("ns", XmlNamespace);
             doc.Load(DiagnosticsConfigurationPath);
-            var node = doc.SelectSingleNode("//ns:StorageAccount", ns);
-            if(node != null)
+
+            // Make sure the configuration element exist
+            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 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>
-                int wadCfgEndIndex = PublicConfiguration.IndexOf("</WadCfg>");
-                PublicConfiguration = PublicConfiguration.Insert(wadCfgEndIndex + "</WadCfg>".Length, 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

@@ -783,10 +783,13 @@
   <data name="DiagnosticsExtensionXmlConfigWadCfgTagNotMatch" xml:space="preserve">
     <value>WadCfg start element in the config is not matching the end element.</value>
   </data>
-  <data name="DiagnosticsExtensionConfigNoWadCfgOrXmlCfg" xml:space="preserve">
-    <value>WadCfg or xmlCfg is not defined in configuration file.</value>
+  <data name="DiagnosticsExtensionIaaSConfigElementNotDefined" xml:space="preserve">
+    <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 defined in the configuration file.</value>
+  </data>
 </root>