Merge pull request Azure#1747 from ClogenyTechnologies/ali/set_vm_chef_ext_cmd_issue

Hovsep · Hovsep · commit 3c8d3061f923 · 2016-02-25T22:49:08.000Z
Updated client_rb code to copy newline character as it is in extension config file.
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Chef/SetAzureVMChefExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Chef/SetAzureVMChefExtension.cs
@@ -193,7 +193,7 @@ private void SetPublicConfig()
             if (!IsClientRbEmpty)
             {
                 ClientConfig = Regex.Replace(File.ReadAllText(this.ClientRb),
-                    "\"|'", "\\\"").TrimEnd('\r', '\n');
+                    "\"|'", "\\\"").TrimEnd('\r', '\n').Replace("\r\n", "\\r\\n");
                 // Append ChefServerUrl and ValidationClientName to end of ClientRb
                 if (!IsChefServerUrlEmpty && !IsValidationClientNameEmpty)
                 {

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ private void SetPublicConfig()`
`193`	`193`	`if (!IsClientRbEmpty)`
`194`	`194`	`{`
`195`	`195`	`ClientConfig = Regex.Replace(File.ReadAllText(this.ClientRb),`
`196`		`- "\"\|'", "\\\"").TrimEnd('\r', '\n');`
	`196`	`+ "\"\|'", "\\\"").TrimEnd('\r', '\n').Replace("\r\n", "\\r\\n");`
`197`	`197`	`// Append ChefServerUrl and ValidationClientName to end of ClientRb`
`198`	`198`	`if (!IsChefServerUrlEmpty && !IsValidationClientNameEmpty)`
`199`	`199`	`{`