Handle relative paths for New/Set PolicyDefinition

Author: unknown

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs

@@ -126,8 +126,10 @@ private JToken GetResource()
         /// </summary>
         private JToken GetPolicyRuleObject()
         {
-            return File.Exists(this.Policy)
-                ? JToken.FromObject(FileUtilities.DataStore.ReadFileAsText(this.TryResolvePath(this.Policy)))
+            string policyFilePath = this.TryResolvePath(this.Policy);
+
+            return File.Exists(policyFilePath)
+                ? JToken.FromObject(FileUtilities.DataStore.ReadFileAsText(policyFilePath))
                 : JToken.FromObject(this.Policy);
         }
     }

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs

@@ -171,8 +171,10 @@ protected string GetResourceId()
         /// </summary>
         protected JToken GetPolicyRuleObject()
         {
-            return File.Exists(this.Policy)
-                ? JToken.FromObject(FileUtilities.DataStore.ReadFileAsText(this.TryResolvePath(this.Policy)))
+            string policyFilePath = this.TryResolvePath(this.Policy);
+
+            return File.Exists(policyFilePath)
+                ? JToken.FromObject(FileUtilities.DataStore.ReadFileAsText(policyFilePath))
                 : JToken.FromObject(this.Policy);
         }
     }

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/PolicyTests.ps1

@@ -28,7 +28,7 @@ function Test-PolicyDefinitionCRUD
 	Assert-AreEqual $expected.PolicyDefinitionId $actual.PolicyDefinitionId
 	Assert-NotNull($actual.Properties.PolicyRule)
 
-	$actual = Set-AzureRMPolicyDefinition -Name $policyName -DisplayName testDisplay -Description testDescription
+	$actual = Set-AzureRMPolicyDefinition -Name $policyName -DisplayName testDisplay -Description testDescription -Policy ".\SamplePolicyDefinition.json"
 	$expected = Get-AzureRMPolicyDefinition -Name $policyName
 	Assert-AreEqual $expected.Properties.DisplayName $actual.Properties.DisplayName
 	Assert-AreEqual $expected.Properties.Description $actual.Properties.Description