Merge pull request #2708 from Azure/update-rm-confirm

Update default ConfirmAction execution

Author: markcowl

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -85,6 +85,24 @@ protected override AzureContext DefaultContext
             }
         }
 
+        /// <summary>
+        /// Guards execution of the given action using ShouldProcess and ShouldContinue.  The optional 
+        /// useSHouldContinue predicate determines whether SHouldContinue should be called for this 
+        /// particular action (e.g. a resource is being overwritten). By default, both 
+        /// ShouldProcess and ShouldContinue will be executed.  Cmdlets that use this method overload 
+        /// must have a force parameter.
+        /// </summary>
+        /// <param name="force">Do not ask for confirmation</param>
+        /// <param name="continueMessage">Message to describe the action</param>
+        /// <param name="processMessage">Message to prompt after the active is performed.</param>
+        /// <param name="target">The target name.</param>
+        /// <param name="action">The action code</param>
+        protected override void ConfirmAction(bool force, string continueMessage, string processMessage, string target,
+            Action action)
+        {
+            ConfirmAction(force, continueMessage, processMessage, target, action, () => true);
+        }
+        
         /// <summary>
         /// Prompt for confirmation for the specified change to the specified ARM resource
         /// </summary>

src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainerStoredAccessPolicy.cs

@@ -93,8 +93,6 @@ internal bool RemoveAzureContainerStoredAccessPolicy(IStorageBlobManagement loca
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            WriteWarning("Force parameter in this cmdlet will be removed in a future release.");
-
             if (String.IsNullOrEmpty(Container) || String.IsNullOrEmpty(Policy)) return;
             bool success = RemoveAzureContainerStoredAccessPolicy(Channel, Container, Policy);
             string result = string.Empty;

src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShareStoredAccessPolicy.cs

@@ -76,8 +76,6 @@ internal bool RemoveAzureShareStoredAccessPolicy(IStorageFileManagement localCha
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            WriteWarning("Force parameter in this cmdlet will be removed in a future release.");
-
             bool success = RemoveAzureShareStoredAccessPolicy(Channel, ShareName, Policy);
             string result = string.Empty;
 

src/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueueStoredAccessPolicy.cs

@@ -91,8 +91,6 @@ internal bool RemoveAzureQueueStoredAccessPolicy(IStorageQueueManagement localCh
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            WriteWarning("Force parameter in this cmdlet will be removed in a future release.");
-
             if (String.IsNullOrEmpty(Queue) || String.IsNullOrEmpty(Policy)) return;
             bool success = RemoveAzureQueueStoredAccessPolicy(Channel, Queue, Policy);
             string result = string.Empty;

src/Storage/Commands.Storage/Table/Cmdlet/RemoveAzureStorageTableStoredAccessPolicy.cs

@@ -91,8 +91,6 @@ internal bool RemoveAzureTableStoredAccessPolicy(IStorageTableManagement localCh
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            WriteWarning("Force parameter in this cmdlet will be removed in a future release.");
-
             if (String.IsNullOrEmpty(Table) || String.IsNullOrEmpty(Policy)) return;
             bool success = RemoveAzureTableStoredAccessPolicy(Channel, Table, Policy);
             string result = string.Empty;