Update prompt message of deleting a share snapshot and the output format of getting a share snapshot (#23925)

Author: yifanz7

src/Storage/Storage.Management/ChangeLog.md

@@ -18,6 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Updated the prompt message when deleting a share snapshot and the output format when listing 
+    - `Remove-AzStorageShare`
+    - `Remove-AzRmStorageSahre`
+    - `Get-AzRmStorageShare`
 
 ## Version 6.1.0
 * Defaults of AllowBlobPublicAccess and AllowCrossTenantReplication when creating a storage account were set to false by server changes. Please refer to https://techcommunity.microsoft.com/t5/azure-storage-blog/azure-storage-updating-some-default-security-settings-on-new/ba-p/3819554

src/Storage/Storage.Management/File/RemoveAzureStorageShare.cs

@@ -137,7 +137,7 @@ public class RemoveAzureStorageShareCommand : StorageFileBaseCmdlet
         [ValidateNotNullOrEmpty]
         public DateTime? SnapshotTime { get; set; }
 
-        [Parameter(HelpMessage = "Force to remove the Share and all content in it")]
+        [Parameter(HelpMessage = "Force to remove the Share(snapshot) and all content in it")]
         public SwitchParameter Force { get; set; }
 
         [Parameter(
@@ -200,6 +200,7 @@ public override void ExecuteCmdlet()
                         this.ResourceGroupName = InputObject.ResourceGroupName;
                         this.StorageAccountName = InputObject.StorageAccountName;
                         this.Name = InputObject.Name;
+                        this.SnapshotTime = InputObject.SnapshotTime is null ? null : InputObject.SnapshotTime;
                         break;
                     case AccountObjectParameterSet:
                     case AccountObjectSnapshotParameterSet:
@@ -215,13 +216,24 @@ public override void ExecuteCmdlet()
                     default:
                         break;
                 }
-                if (Force.IsPresent || ShouldContinue(String.Format("Remove Share and all files in it: {0}", this.Name), ""))
+
+                String promptMessage;
+                if (this.SnapshotTime != null)
+                {
+                    promptMessage = String.Format("Remove share snapshot and all files in it: {0}, SnapshotTime: {1}", this.Name, this.SnapshotTime.Value.ToUniversalTime().ToString("o"));
+                } 
+                else
+                {
+                    promptMessage = String.Format("Remove Share and all files in it: {0}", this.Name);
+                }
+
+                if (Force.IsPresent || ShouldContinue(promptMessage, ""))
                 {
                     this.StorageClient.FileShares.Delete(
                        this.ResourceGroupName,
                        this.StorageAccountName,
                        this.Name,
-                       xMsSnapshot: this.SnapshotTime is null ? null : this.SnapshotTime.Value.ToUniversalTime().ToString("o"),
+                       xMsSnapshot: this.SnapshotTime?.ToUniversalTime().ToString("o"),
                        include: include.ToLower());
 
                     if (PassThru.IsPresent)

src/Storage/Storage.Management/Storage.Management.format.ps1xml

@@ -579,7 +579,7 @@
           </TableColumnHeader>
           <TableColumnHeader>
             <Alignment>Left</Alignment>
-            <Label>snapshotTime</Label>
+            <Label>SnapshotTime</Label>
           </TableColumnHeader>
         </TableHeaders>
         <TableRowEntries>
@@ -615,7 +615,7 @@
               </TableColumnItem>
               <TableColumnItem>
                 <Alignment>Left</Alignment>
-                <ScriptBlock>$_.snapshotTime.ToUniversalTime().ToString("s")+"Z"</ScriptBlock>
+                <ScriptBlock>$_.SnapshotTime.ToUniversalTime().ToString("s")+"Z"</ScriptBlock>
               </TableColumnItem>
             </TableColumnItems>
           </TableRowEntry>

src/Storage/Storage.Management/help/Remove-AzRmStorageShare.md

@@ -118,7 +118,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-Force to remove the Share and all content in it
+Force to remove the Share(snapshot) and all content in it
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter

src/Storage/Storage/File/Cmdlet/RemoveAzureStorageShare.cs

@@ -107,6 +107,7 @@ public override void ExecuteCmdlet()
                     {
                         share = AzureStorageFileShare.GetTrack2FileShareClient(this.Share, (AzureStorageContext)this.Context, this.ClientOptions);
                     }
+                    this.SnapshotTime = this.Share.SnapshotTime == null ? null : this.Share.SnapshotTime;
 
                     // Build and set storage context for the output object when
                     // 1. input track1 object and storage context is missing 2. the current context doesn't match the context of the input object 
@@ -138,7 +139,17 @@ public override void ExecuteCmdlet()
                         throw new PSArgumentException(string.Format(CultureInfo.InvariantCulture, "'IncludeAllSnapshot' should only be specified to delete a base share, and should not be specified to delete a Share snapshot: {0}", share.Uri));
                     }
 
-                    if (force || ShareIsEmpty(share) || ShouldContinue(string.Format("Remove share and all content in it: {0}", share.Name), ""))
+                    string promptMessage;
+                    if (this.SnapshotTime != null)
+                    {
+                        promptMessage = string.Format("Remove share snapshot and all files in it: {0}, SnapshotTime: {1}", share.Name, this.SnapshotTime.Value.ToUniversalTime().ToString("o"));
+                    }
+                    else
+                    {
+                        promptMessage = string.Format("Remove share and all content in it: {0}", share.Name);
+                    }
+
+                    if (force || ShareIsEmpty(share) || ShouldContinue(promptMessage, ""))
                     {
                         bool includeSnapshots = false;
                         bool retryDeleteSnapshot = false;