Merge branch 'release-2018-11-06' into november

Author: markcowl

src/ResourceManager/Compute/Commands.Compute/ChangeLog.md

@@ -21,6 +21,7 @@
 ## Current Release
 * Add Add-AzureRmVmssVMDataDisk and Remove-AzureRmVmssVMDataDisk cmdlets
 * Get-AzureRmVMImage shows AutomaticOSUpgradeProperties
+* Fixed SetAzureRmVMChefExtension -BootstrapOptions and -JsonAttribute option values are not setting in json format.
 
 ## Version 5.7.2
 * Add EnableUltraSSD switch parameter to New-AzureRmVMConfiig and New-AzureRmVmssConfig.

src/ResourceManager/Compute/Commands.Compute/Extension/Chef/SetAzureVMChefExtension.cs

@@ -22,6 +22,7 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.Commands.Compute.Extension.Chef
 {
@@ -257,6 +258,7 @@ private Hashtable PublicConfiguration
                     bool IsBootstrapOptionsEmpty = string.IsNullOrEmpty(this.BootstrapOptions);
                     bool IsJsonAttributeEmpty = string.IsNullOrEmpty(this.JsonAttribute);
                     bool IsChefDaemonIntervalEmpty = string.IsNullOrEmpty(this.ChefDaemonInterval);
+                    bool IsBootstrapVersionEmpty = string.IsNullOrEmpty(this.BootstrapVersion);
                     string BootstrapVersion = string.IsNullOrEmpty(this.BootstrapVersion) ? "" : this.BootstrapVersion;
                     bool IsDaemonEmpty = string.IsNullOrEmpty(this.Daemon);
 
@@ -308,7 +310,10 @@ private Hashtable PublicConfiguration
                     }
 
                     var hashTable = new Hashtable();
-                    hashTable.Add(BootstrapVersionTemplate, BootstrapVersion);
+                    if (!IsBootstrapVersionEmpty)
+                    {
+                        hashTable.Add(BootstrapVersionTemplate, BootstrapVersion);
+                    }
                     hashTable.Add(ClientRbTemplate, ClientConfig);
 
                     if (!IsRunListEmpty)
@@ -318,12 +323,14 @@ private Hashtable PublicConfiguration
 
                     if (!IsBootstrapOptionsEmpty)
                     {
-                        hashTable.Add(BootStrapOptionsTemplate, this.BootstrapOptions);
+                        JObject bootstrap_option_json = JObject.Parse(this.BootstrapOptions);
+                        hashTable.Add(BootStrapOptionsTemplate, bootstrap_option_json);
                     }
 
                     if (!IsJsonAttributeEmpty)
                     {
-                        hashTable.Add(JsonAttributeTemplate, JsonAttribute);
+                        JObject json_attribute_json = JObject.Parse(this.JsonAttribute);
+                        hashTable.Add(JsonAttributeTemplate, json_attribute_json);
                     }
 
                     if (!IsChefDaemonIntervalEmpty)
@@ -336,6 +343,7 @@ private Hashtable PublicConfiguration
                         hashTable.Add(DaemonTemplate, this.Daemon);
                     }
 
+
                     this.publicConfiguration = hashTable;
                 }