Addressed PR comments

Author: sandipsh

src/Resources/ResourceManager/Entities/Policy/EnforcementMode.cs renamed to src/Resources/ResourceManager/Entities/Policy/PolicyAssignmentEnforcementMode.cs

@@ -15,18 +15,18 @@
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy
 {
     /// <summary>
-    /// The policy definition mode.
+    /// The policy assignment enforcement mode.
     /// </summary>
-    public class EnforcementMode
+    public enum PolicyAssignmentEnforcementMode
     {
         /// <summary>
         /// The policy effect is enforced during resource creation or update.
         /// </summary>
-        public const string Default = "Default";
+        Default,
 
         /// <summary>
         /// The policy effect is not enforced during resource creation or update.
         /// </summary>
-        public const string DoNotEnforce = "DoNotEnforce";
+        DoNotEnforce
     }
 }

src/Resources/ResourceManager/Entities/Policy/PolicyAssignmentProperties.cs

@@ -56,7 +56,7 @@ public class PolicyAssignmentProperties
         /// The policy assignment enforcement mode.
         /// </summary>
         [JsonProperty(Required = Required.Default)]
-        public string EnforcementMode { get; set; }
+        public PolicyAssignmentEnforcementMode? EnforcementMode { get; set; }
 
         /// <summary>
         /// The policy definition id.

src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyAssignment.cs

@@ -111,10 +111,9 @@ public class NewAzurePolicyAssignmentCmdlet : PolicyCmdletBase, IDynamicParamete
         /// <summary>
         /// Gets or sets the policy assignment enforcement mode.
         /// </summary>
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.NewPolicyAssignmentEnforcementModeHelp)]
-        [PSArgumentCompleter(Entities.Policy.EnforcementMode.Default, Entities.Policy.EnforcementMode.DoNotEnforce)]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.NewPolicyAssignmentEnforcementModeHelp)]        
         [ValidateNotNullOrEmpty]
-        public string EnforcementMode { get; set; }
+        public PolicyAssignmentEnforcementMode? EnforcementMode { get; set; }
 
         /// <summary>
         /// Gets or sets a flag indicating whether a system assigned identity should be added to the policy assignment.
@@ -201,7 +200,7 @@ private JToken GetResource()
                     Scope = this.Scope,
                     NotScopes = this.NotScope ?? null,
                     Metadata = this.Metadata == null ? null : JObject.Parse(this.GetObjectFromParameter(this.Metadata).ToString()),
-                    EnforcementMode = this.EnforcementMode ?? null,
+                    EnforcementMode = EnforcementMode ?? PolicyAssignmentEnforcementMode.Default,
                     Parameters = this.GetParameters(this.PolicyParameter, this.PolicyParameterObject)
                 }
             };

src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyAssignment.cs

@@ -12,6 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
+
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
@@ -118,9 +120,8 @@ public class SetAzurePolicyAssignmentCmdlet : PolicyCmdletBase
         /// Gets or sets the policy assignment enforcement mode.
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.NewPolicyAssignmentEnforcementModeHelp)]
-        [PSArgumentCompleter(Entities.Policy.EnforcementMode.Default, Entities.Policy.EnforcementMode.DoNotEnforce)]
         [ValidateNotNullOrEmpty]
-        public string EnforcementMode { get; set; }
+        public PolicyAssignmentEnforcementMode? EnforcementMode { get; set; }
 
         /// <summary>
         /// Executes the cmdlet.
@@ -162,6 +163,12 @@ private JToken GetResource(string resourceId, string apiVersion)
 
             var metaDataJson = string.IsNullOrEmpty(this.Metadata) ? resource.Properties["metadata"]?.ToString() : GetObjectFromParameter(this.Metadata).ToString();
 
+            PolicyAssignmentEnforcementMode? existingMode = null;
+            if (Enum.TryParse(resource.Properties["enforcementMode"]?.ToString(), true, out PolicyAssignmentEnforcementMode tempMode))
+            {
+                existingMode = tempMode;
+            }
+
             var policyAssignmentObject = new PolicyAssignment
             {
                 Name = this.Name ?? resource.Name,
@@ -175,7 +182,7 @@ private JToken GetResource(string resourceId, string apiVersion)
                     NotScopes = this.NotScope ?? resource.Properties["NotScopes"]?.ToString().Split(','),
                     PolicyDefinitionId = resource.Properties["policyDefinitionId"].ToString(),
                     Metadata = string.IsNullOrEmpty(this.Metadata) ? null : JObject.Parse(metaDataJson),
-                    EnforcementMode = this.EnforcementMode ?? resource.Properties["enforcementMode"]?.ToString(),
+                    EnforcementMode = this.EnforcementMode ?? existingMode,
                     Parameters = this.GetParameters(this.PolicyParameter, this.PolicyParameterObject) ?? (JObject)resource.Properties["parameters"]
                 }
             };

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

@@ -432,32 +432,42 @@ function Test-PolicyAssignmentEnforcementMode
     $policy = New-AzPolicyDefinition -Name $policyName -Policy "$TestOutputRoot\SamplePolicyDefinition.json" -Description $description
 
     # assign the policy definition to the resource group, get the assignment back and validate
-    $actual = New-AzPolicyAssignment -Name testPA -PolicyDefinition $policy -Scope $rg.ResourceId -Description $description -Location $location -EnforcementMode $enforcementModeDoNotEnforce
+    $actual = New-AzPolicyAssignment -Name testPA -PolicyDefinition $policy -Scope $rg.ResourceId -Description $description -Location $location -EnforcementMode DoNotEnforce
     $expected = Get-AzPolicyAssignment -Name testPA -Scope $rg.ResourceId
     Assert-AreEqual $expected.Name $actual.Name
     Assert-AreEqual Microsoft.Authorization/policyAssignments $actual.ResourceType
     Assert-AreEqual $expected.PolicyAssignmentId $actual.PolicyAssignmentId
     Assert-AreEqual $expected.Properties.PolicyDefinitionId $policy.PolicyDefinitionId
     Assert-AreEqual $expected.Properties.Scope $rg.ResourceId
-    Assert-AreEqual $expected.Properties.EnforcementMode $actual.Properties.EnforcementMode    
+    Assert-AreEqual $expected.Properties.EnforcementMode $actual.Properties.EnforcementMode
+	Assert-AreEqual $expected.Properties.EnforcementMode $enforcementModeDoNotEnforce
     Assert-AreEqual $location $actual.Location
     Assert-AreEqual $expected.Location $actual.Location
 
     # get it back by id and validate
     $actualById = Get-AzPolicyAssignment -Id $actual.ResourceId    
     Assert-AreEqual $actual.Properties.EnforcementMode $actualById.Properties.EnforcementMode    
 
-    # update the policy assignment, validate enforcement mode is updated correctly.
-    $setResult = Set-AzPolicyAssignment -Id $actualById.ResourceId -DisplayName "testDisplay" -EnforcementMode $enforcementModeDefault
+	# update the policy assignment, validate enforcement mode is updated correctly with Default enum value.
+    $setResult = Set-AzPolicyAssignment -Id $actualById.ResourceId -DisplayName "testDisplay" -EnforcementMode Default
     Assert-AreEqual "testDisplay" $setResult.Properties.DisplayName
     Assert-AreEqual $enforcementModeDefault $setResult.Properties.EnforcementMode
 
+    # update the policy assignment, validate enforcement mode is updated correctly with 'Default' enum as string value.
+    $setResult = Set-AzPolicyAssignment -Id $actualById.ResourceId -DisplayName "testDisplay" -EnforcementMode $enforcementModeDefault
+    Assert-AreEqual "testDisplay" $setResult.Properties.DisplayName
+    Assert-AreEqual $enforcementModeDefault $setResult.Properties.EnforcementMode	
+
     # make another policy assignment without an enforcementMode, validate default mode is set
     $withoutEnforcementMode = New-AzPolicyAssignment -Name test2 -Scope $rg.ResourceId -PolicyDefinition $policy -Description $description
     Assert-AreEqual $enforcementModeDefault $withoutEnforcementMode.Properties.EnforcementMode
 
     # set an enforcement mode to the new assignment using the SET cmdlet
     $setResult = Set-AzPolicyAssignment -Id $withoutEnforcementMode.ResourceId -Location $location -EnforcementMode $enforcementModeDoNotEnforce
+    Assert-AreEqual $enforcementModeDoNotEnforce $setResult.Properties.EnforcementMode
+
+	# set an enforcement mode to the new assignment using the SET cmdlet enum value and validate
+    $setResult = Set-AzPolicyAssignment -Id $withoutEnforcementMode.ResourceId -Location $location -EnforcementMode DoNotEnforce
     Assert-AreEqual $enforcementModeDoNotEnforce $setResult.Properties.EnforcementMode
 
     # verify enforcement mode is returned in collection GET