Merge pull request #9441 from mentat9/master

Add parameters to Set-AzPolicyAssignment, fixes

Author: markcowl

src/PolicyInsights/PolicyInsights/Common/ParameterHelpMessages.cs

@@ -30,7 +30,7 @@ public static class ParameterHelpMessages
         public const string PolicyAssignmentName = "Policy assignment name.";
         public const string PolicyAssignmentId = "Policy assignment ID. E.g. '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyAssignments/{assignmentName}'.";
         public const string PolicyDefinitionReferenceId = "Gets the policy definition reference ID of the individual definition that is being remediated. Required when the policy assignment assigns a policy set definition.";
-        public const string Top = "Maximum number of records to return.";
+        public const string Top = "Maximum number of records to return. If not provided, the maximum number of records returned is determined by the Azure Policy service (currently 1000).";
         public const string OrderBy = "Ordering expression using OData notation. One or more comma-separated column names with an optional 'desc' (the default) or 'asc'.";
         public const string Select = "Select expression using OData notation. One or more comma-separated column names. Limits the columns on each record to just those requested.";
         public const string From = "ISO 8601 formatted timestamp specifying the start time of the interval to query. When not specified, defaults to 'To' parameter value minus 1 day.";

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

@@ -115,7 +115,17 @@ private bool IsMatch(string input, string match)
 
         private IEnumerable<Provider> GetAllProviders()
         {
-            return this.ResourceManagerSdkClient.ResourceManagementClient.Providers.List(expand: "resourceTypes/aliases");
+            var returnList = new List<Provider>();
+            var tempResult = this.ResourceManagerSdkClient.ResourceManagementClient.Providers.List(expand: "resourceTypes/aliases");
+            returnList.AddRange(tempResult);
+
+            while (!string.IsNullOrWhiteSpace(tempResult.NextPageLink))
+            {
+                tempResult = this.ResourceManagerSdkClient.ResourceManagementClient.Providers.ListNext(tempResult.NextPageLink);
+                returnList.AddRange(tempResult);
+            }
+
+            return returnList;
         }
 
         private IEnumerable<Provider> GetMatchingProviders(IEnumerable<Provider> input, string namespaceMatch, string resourceTypeMatch)

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

@@ -14,18 +14,13 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    using Commands.Common.Authentication.Abstractions;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
-    using Microsoft.WindowsAzure.Commands.Common;
-    using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
-    using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using Newtonsoft.Json.Linq;
     using Policy;
     using System;
     using System.Collections;
-    using System.Linq;
     using System.Management.Automation;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
@@ -198,7 +193,7 @@ private JToken GetResource()
                     Scope = this.Scope,
                     NotScopes = this.NotScope ?? null,
                     Metadata = this.Metadata == null ? null : JObject.Parse(this.GetObjectFromParameter(this.Metadata).ToString()),
-                    Parameters = this.GetParameters()
+                    Parameters = this.GetParameters(this.PolicyParameter, this.PolicyParameterObject)
                 }
             };
 
@@ -260,32 +255,5 @@ object IDynamicParameters.GetDynamicParameters()
             this.RegisterDynamicParameters(this.dynamicParameters);
             return this.dynamicParameters;
         }
-
-        private JObject GetParameters()
-        {
-            // Load parameters from local file or literal
-            if (this.PolicyParameter != null)
-            {
-                string policyParameterFilePath = this.TryResolvePath(this.PolicyParameter);
-                return FileUtilities.DataStore.FileExists(policyParameterFilePath)
-                    ? JObject.Parse(FileUtilities.DataStore.ReadFileAsText(policyParameterFilePath))
-                    : JObject.Parse(this.PolicyParameter);
-            }
-
-            // Load from PS object
-            if (this.PolicyParameterObject != null)
-            {
-                return this.PolicyParameterObject.ToJObjectWithValue();
-            }
-
-            // Load dynamic parameters
-            var parameters = PowerShellUtilities.GetUsedDynamicParameters(AsJobDynamicParameters, MyInvocation);
-            if (parameters.Count() > 0)
-            {
-                return MyInvocation.BoundParameters.ToJObjectWithValue(parameters.Select(p => p.Name));
-            }
-
-            return null;
-        }
     }
 }

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

@@ -21,6 +21,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     using Newtonsoft.Json.Linq;
     using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
     using System;
+    using System.Collections;
     using System.IO;
     using System.Linq;
     using System.Management.Automation;
@@ -54,6 +55,10 @@ public enum ListFilter
         protected const string PolicyParameterStringParameterSet = "PolicyParameterStringParameterSet";
         protected const string PolicySetParameterObjectParameterSet = "PolicySetParameterObjectParameterSet";
         protected const string PolicySetParameterStringParameterSet = "PolicySetParameterStringParameterSet";
+        protected const string PolicyParameterNameObjectParameterSet = "PolicyParameterNameObjectParameterSet";
+        protected const string PolicyParameterNameStringParameterSet = "PolicyParameterNameStringParameterSet";
+        protected const string PolicyParameterIdObjectParameterSet = "PolicyParameterIdObjectParameterSet";
+        protected const string PolicyParameterIdStringParameterSet = "PolicyParameterIdStringParameterSet";
 
         /// <summary>
         /// Converts the resource object to specified resource type object.
@@ -253,5 +258,38 @@ protected async Task<JObject> GetExistingResource(string resourceId, string apiV
                     cancellationToken: this.CancellationToken.Value)
                 .ConfigureAwait(continueOnCapturedContext: false);
         }
+
+        /// <summary>
+        /// Resolve given input parameters into JSON parameter object for put
+        /// </summary>
+        /// <param name="policyParameter"></param>
+        /// <param name="policyParameterObject"></param>
+        /// <returns></returns>
+        protected JObject GetParameters(string policyParameter, Hashtable policyParameterObject)
+        {
+            // Load parameters from local file or literal
+            if (policyParameter != null)
+            {
+                string policyParameterFilePath = this.TryResolvePath(policyParameter);
+                return FileUtilities.DataStore.FileExists(policyParameterFilePath)
+                    ? JObject.Parse(FileUtilities.DataStore.ReadFileAsText(policyParameterFilePath))
+                    : JObject.Parse(policyParameter);
+            }
+
+            // Load from PS object
+            if (policyParameterObject != null)
+            {
+                return policyParameterObject.ToJObjectWithValue();
+            }
+
+            // Load dynamic parameters
+            var parameters = PowerShellUtilities.GetUsedDynamicParameters(AsJobDynamicParameters, MyInvocation);
+            if (parameters.Count() > 0)
+            {
+                return MyInvocation.BoundParameters.ToJObjectWithValue(parameters.Select(p => p.Name));
+            }
+
+            return null;
+        }
     }
 }

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

@@ -46,6 +46,8 @@ public static class PolicyHelpStrings
         public const string SetPolicyAssignmentDisplayNameHelp = "The display name of the updated policy assignment";
         public const string SetPolicyAssignmentDescriptionHelp = "The description of the updated policy assignment";
         public const string SetPolicyAssignmentMetadataHelp = "The updated metadata for the policy assignment. This can either be a path to a file name containing the metadata, or the metadata as a string.";
+        public const string SetPolicyAssignmentPolicyParameterObjectHelp = "The new policy parameters object for the policy assignment.";
+        public const string SetPolicyParameterHelp = "The new policy parameters file path or string for the policy assignment.";
         public const string SetPolicyAssignmentSkuHelp = "A hash table which specifies sku properties. This parameter is deprecated and ignored.";
         public const string PolicyAssignmentAssignIdentityHelp = "Generate and assign an Azure Active Directory Identity for this policy assignment. The identity will be used when executing deployments for 'deployIfNotExists' policies. Location is required when assigning an identity.";
         public const string PolicyAssignmentLocationHelp = "The location of the policy assignment's resource identity. This is required when the -AssignIdentity switch is used.";

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

@@ -12,14 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
-
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
-    using Microsoft.WindowsAzure.Commands.Common;
     using Newtonsoft.Json.Linq;
     using Policy;
     using System.Collections;
@@ -37,13 +34,17 @@ public class SetAzurePolicyAssignmentCmdlet : PolicyCmdletBase
         /// Gets or sets the policy assignment name parameter.
         /// </summary>
         [Parameter(ParameterSetName = PolicyCmdletBase.NameParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentNameHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterNameObjectParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentPolicyParameterObjectHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterNameStringParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyParameterHelp)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the policy assignment scope parameter.
         /// </summary>
         [Parameter(ParameterSetName = PolicyCmdletBase.NameParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentScopeHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterNameObjectParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentPolicyParameterObjectHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterNameStringParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyParameterHelp)]
         [ValidateNotNullOrEmpty]
         public string Scope { get; set; }
 
@@ -59,6 +60,8 @@ public class SetAzurePolicyAssignmentCmdlet : PolicyCmdletBase
         /// </summary>
         [Alias("ResourceId")]
         [Parameter(ParameterSetName = PolicyCmdletBase.IdParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentIdHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterIdObjectParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentPolicyParameterObjectHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterIdStringParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyParameterHelp)]
         [ValidateNotNullOrEmpty]
         public string Id { get; set; }
 
@@ -83,6 +86,21 @@ public class SetAzurePolicyAssignmentCmdlet : PolicyCmdletBase
         [ValidateNotNullOrEmpty]
         public string Metadata { get; set; }
 
+        /// <summary>
+        /// Gets or sets the policy assignment policy parameter object.
+        /// </summary>
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterNameObjectParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = false, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentPolicyParameterObjectHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterIdObjectParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = false, HelpMessage = PolicyHelpStrings.SetPolicyAssignmentPolicyParameterObjectHelp)]
+        public Hashtable PolicyParameterObject { get; set; }
+
+        /// <summary>
+        /// Gets or sets the policy assignment policy parameter file path or policy parameter string.
+        /// </summary>
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterNameStringParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyParameterHelp)]
+        [Parameter(ParameterSetName = PolicyCmdletBase.PolicyParameterIdStringParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = PolicyHelpStrings.SetPolicyParameterHelp)]
+        [ValidateNotNullOrEmpty]
+        public string PolicyParameter { get; set; }
+
         /// <summary>
         /// Gets or sets a flag indicating whether a system assigned identity should be added to the policy assignment.
         /// </summary>
@@ -149,7 +167,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),
-                    Parameters = (JObject)resource.Properties["parameters"]
+                    Parameters = this.GetParameters(this.PolicyParameter, this.PolicyParameterObject) ?? (JObject)resource.Properties["parameters"]
                 }
             };