[Storage Dataplane] - Remove Validation Set and move to track2 SDK for

blueww · blueww · commit 96894ab46ede · 2023-01-17T10:41:13.000+08:00
accesstier
diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md
@@ -18,11 +18,15 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Removed the ValidateSet of StandardBlobTier parameter
+    - `Copy-AzStorageBlob`
+    - `Set-AzStorageBlobContent` 
+    - `Start-AzStorageBlobCopy`
 
 ## Version 5.3.0
-* Return ListBlobProperties in blob list result
+* Returned ListBlobProperties in blob list result
     - `Get-AzStorageBlob`
-* Output AllowedCopyScope in get account result
+* Returned AllowedCopyScope in get account result
     - `Get-AzStorageAccount`
 
 ## Version 5.2.0
diff --git a/src/Storage/Storage.Management/help/Copy-AzStorageBlob.md b/src/Storage/Storage.Management/help/Copy-AzStorageBlob.md
@@ -71,7 +71,7 @@ C:\PS> $blob = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob $blobnam
 
 This command update a block blob encryption scope by copy it to itself with a new encryption scope.
 
-### Example 5: Copy a blob to a new append blob 
+### Example 5: Copy a blob to a new append blob
 ```
 C:\PS> $srcBlob = Get-AzStorageBlob -Container $containerName -Blob $blobName  -Context $ctx 
 C:\PS> $destBlob = Copy-AzStorageBlob -SrcContainer "sourcecontainername" -SrcBlob "srcblobname" -DestContainer "destcontainername" -DestBlob "destblobname" -DestBlobType "Append" -DestContext $destCtx
@@ -325,7 +325,6 @@ See detail in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-
 Type: System.String
 Parameter Sets: (All)
 Aliases:
-Accepted values: Hot, Cool, Archive
 
 Required: False
 Position: Named
diff --git a/src/Storage/Storage.Management/help/Set-AzStorageBlobContent.md b/src/Storage/Storage.Management/help/Set-AzStorageBlobContent.md
@@ -94,6 +94,8 @@ The blob includes the metadata stored in $Metadata, and has PremiumPageBlobTier
 
 ### Example 6: Upload a file to blob with specified blob properties, and set StandardBlobTier as Cool
 <!-- Skip: Output cannot be splitted from code -->
+
+
 ```
 PS C:\> $filepath = "c:\temp\index.html"
 PS C:\> Set-AzStorageBlobContent -File $filepath -Container "contosouploads" -Properties @{"ContentType" = [System.Web.MimeMapping]::GetMimeMapping($filepath); "ContentMD5" = "i727sP7HigloQDsqadNLHw=="} -StandardBlobTier Cool
@@ -110,6 +112,8 @@ This command gets ContentType value set to blob properties by [System.Web.MimeMa
 
 ### Example 7: Upload a file to a blob with Encryption Scope
 <!-- Skip: Output cannot be splitted from code -->
+
+
 ```
 PS C:\> $blob = Set-AzStorageBlobContent  -File "mylocalfile" -Container "mycontainer" -Blob "myblob"  -EncryptionScope "myencryptscope"
 
@@ -419,7 +423,6 @@ See detail in https://docs.microsoft.com/azure/storage/blobs/storage-blob-storag
 Type: System.String
 Parameter Sets: (All)
 Aliases:
-Accepted values: Hot, Cool, Archive
 
 Required: False
 Position: Named
@@ -492,7 +495,7 @@ Accept wildcard characters: False
 ```
 
 ### CommonParameters
-This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
diff --git a/src/Storage/Storage.Management/help/Start-AzStorageBlobCopy.md b/src/Storage/Storage.Management/help/Start-AzStorageBlobCopy.md
@@ -614,7 +614,6 @@ See detail in https://docs.microsoft.com/azure/storage/blobs/storage-blob-storag
 Type: System.String
 Parameter Sets: (All)
 Aliases:
-Accepted values: Hot, Cool, Archive
 
 Required: False
 Position: Named
diff --git a/src/Storage/Storage/Blob/Cmdlet/CopyAzureStorageBlob.cs b/src/Storage/Storage/Blob/Cmdlet/CopyAzureStorageBlob.cs
@@ -18,6 +18,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet
     using Azure.Commands.Common.Authentication.Abstractions;
     using Commands.Common.Storage.ResourceModel;
     using global::Azure.Storage.Blobs;
+    using global::Azure.Storage.Blobs.Models;
     using global::Azure.Storage.Blobs.Specialized;
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using Microsoft.Azure.Storage.Blob;
@@ -99,28 +100,30 @@ public string SrcContainer
         public string DestBlobType { get; set; }
 
         [Parameter(HelpMessage = "Block Blob Tier, valid values are Hot/Cool/Archive. See detail in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers", Mandatory = false)]
+        [ValidateNotNullOrEmpty]
         [PSArgumentCompleter("Hot", "Cool", "Archive")]
-        [ValidateSet("Hot", "Cool", "Archive", IgnoreCase = true)]
         public string StandardBlobTier
         {
             get
             {
-                return standardBlobTier is null ? null : standardBlobTier.Value.ToString();
+                return accesstier?.ToString();
             }
 
             set
             {
                 if (value != null)
                 {
-                    standardBlobTier = ((StandardBlobTier)Enum.Parse(typeof(StandardBlobTier), value, true));
+                    accesstier = new AccessTier(value);
+                    isBlockBlobAccessTier = true;
                 }
                 else
                 {
-                    standardBlobTier = null;
+                    accesstier = null;
                 }
             }
         }
-        private StandardBlobTier? standardBlobTier = null;
+        private bool? isBlockBlobAccessTier = null;
+        private AccessTier? accesstier = null;
 
         [Parameter(HelpMessage = "Block Blob RehydratePriority. Indicates the priority with which to rehydrate an archived blob. Valid values are High/Standard.", Mandatory = false)]
         [ValidateSet("Standard", "High", IgnoreCase = true)]
@@ -372,7 +375,11 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,
 
             if (destBlobType != null)
             {
-                ValidateBlobTier(Util.convertBlobType_Track2ToTrack1(destBlobType), null, standardBlobTier, rehydratePriority);
+                ValidateBlobTier(Util.convertBlobType_Track2ToTrack1(destBlobType), null, isBlockBlobAccessTier, rehydratePriority);
+                if (this.rehydratePriority != null && this.accesstier == null)
+                {
+                    throw new ArgumentException("RehydratePriority should only be specified when StandardBlobTier is specified.");
+                }
             }
 
             if (!destExist || this.ConfirmOverwrite(srcUri.AbsoluteUri.ToString(), destBlob.Uri.ToString()))
@@ -483,9 +490,9 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,
                             Track2Models.BlobCopyFromUriOptions options = new Track2Models.BlobCopyFromUriOptions();
 
                             // The Blob Type and Blob Tier must match, since already checked before
-                            if (standardBlobTier != null || rehydratePriority != null)
+                            if (accesstier != null || rehydratePriority != null)
                             {
-                                options.AccessTier = Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier);
+                                options.AccessTier = accesstier;
                                 options.RehydratePriority = Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority);
                             }
                             options.SourceConditions = this.BlobRequestConditions;
@@ -495,10 +502,10 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,
                             destBlobClient.SyncCopyFromUri(srcUri, options, this.CmdletCancellationToken);
 
                             // Set rehydrate priority
-                            if (rehydratePriority != null)
+                            if (rehydratePriority != null && accesstier != null)
                             {
-                                destBlobClient.SetAccessTier(Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier) == null ? null : (Track2Models.AccessTier)Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier), 
-                                    rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);
+                                destBlobClient.SetAccessTier(accesstier.Value,
+                                        rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);
                             }
                             break;
                         }
@@ -510,9 +517,9 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,
                         commitBlockListOptions.Metadata = srcProperties.Metadata;
                         commitBlockListOptions.Tags = blobTags ?? null;
 
-                        if (standardBlobTier != null)
+                        if (accesstier != null)
                         {
-                            commitBlockListOptions.AccessTier = Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier);
+                            commitBlockListOptions.AccessTier = accesstier;
                         }
 
                         long blockLength = GetBlockLength(srcProperties.ContentLength);
@@ -534,10 +541,10 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,
                         destBlockBlob.CommitBlockList(blockIDs, commitBlockListOptions, this.CmdletCancellationToken);
 
                         // Set rehydrate priority
-                        if (rehydratePriority != null)
+                        if (rehydratePriority != null && accesstier != null)
                         {
-                            destBlockBlob.SetAccessTier(Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier) == null ? null : (Track2Models.AccessTier)Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier),
-                            rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);
+                            destBlockBlob.SetAccessTier(accesstier.Value,
+                                rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);
                         }
                         break;
                 }
diff --git a/src/Storage/Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs b/src/Storage/Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs
@@ -180,28 +180,30 @@ public PremiumPageBlobTier PremiumPageBlobTier
         private PremiumPageBlobTier? pageBlobTier = null;
 
         [Parameter(HelpMessage = "Block Blob Tier, valid values are Hot/Cool/Archive. See detail in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers", Mandatory = false)]
+        [ValidateNotNullOrEmpty]
         [PSArgumentCompleter("Hot", "Cool", "Archive")]
-        [ValidateSet("Hot", "Cool", "Archive", IgnoreCase = true)]
         public string StandardBlobTier
         {
             get
             {
-                return standardBlobTier is null ? null : standardBlobTier.Value.ToString();
+                return accesstier?.ToString();
             }
 
             set
             {
                 if (value != null)
                 {
-                    standardBlobTier = ((StandardBlobTier)Enum.Parse(typeof(StandardBlobTier), value, true));
+                    accesstier = new AccessTier(value);
+                    isBlockBlobAccessTier = true;
                 }
                 else
                 {
-                    standardBlobTier = null;
+                    accesstier = null;
                 }
             }
         }
-        private StandardBlobTier? standardBlobTier = null;
+        private bool? isBlockBlobAccessTier = null;
+        private AccessTier? accesstier = null;
 
         [Parameter(HelpMessage = "Encryption scope to be used when making requests to the blob.",
             Mandatory = false)]
@@ -220,6 +222,10 @@ protected override bool UseTrack2Sdk()
             {
                 return true;
             }
+            if (accesstier != null && accesstier.Value != AccessTier.Archive && accesstier.Value != AccessTier.Cool && accesstier.Value != AccessTier.Hot)
+            {
+                return true;
+            }
             return false;
         }
 
@@ -286,9 +292,9 @@ await DataMovementTransferHelper.DoTransfer(() =>
                 data.Record,
                 this.OutputStream).ConfigureAwait(false);
 
-            if (this.pageBlobTier != null || this.standardBlobTier != null)
+            if (this.pageBlobTier != null || this.accesstier != null)
             {
-                await this.SetBlobTier(localChannel, blob, pageBlobTier, standardBlobTier).ConfigureAwait(false);
+                await this.SetBlobTier(localChannel, blob, pageBlobTier, accesstier).ConfigureAwait(false);
             }
 
             try
@@ -409,10 +415,10 @@ protected override void DoEndProcessing()
         /// <param name="localChannel">IStorageBlobManagement channel object</param>
         /// <param name="blob">CloudBlob object</param>
         /// <param name="pageBlobTier">Page Blob Tier</param>
-        /// <param name="standardBlobTier">Access condition to source if it's file/blob in azure.</param>
-        private async Task SetBlobTier(IStorageBlobManagement localChannel, StorageBlob.CloudBlob blob, PremiumPageBlobTier? pageBlobTier = null, StandardBlobTier? standardBlobTier = null)
+        /// <param name="accessTier">Access condition to source if it's file/blob in azure.</param>
+        private async Task SetBlobTier(IStorageBlobManagement localChannel, StorageBlob.CloudBlob blob, PremiumPageBlobTier? pageBlobTier = null, AccessTier? accessTier = null)
         {
-            if (pageBlobTier == null && standardBlobTier == null)
+            if (pageBlobTier == null && accessTier == null)
             {
                 return;
             }
@@ -424,10 +430,9 @@ private async Task SetBlobTier(IStorageBlobManagement localChannel, StorageBlob.
             {
                 await Channel.SetPageBlobTierAsync((CloudPageBlob)blob, pageBlobTier.Value, requestOptions, OperationContext, CmdletCancellationToken).ConfigureAwait(false);
             }
-            if (standardBlobTier != null)
+            if (accessTier != null)
             {
-                AccessCondition accessCondition = null;
-                await Channel.SetStandardBlobTierAsync((CloudBlockBlob)blob, accessCondition, standardBlobTier.Value, null, requestOptions, OperationContext, CmdletCancellationToken).ConfigureAwait(false);
+                AzureStorageBlob.GetTrack2BlobClient(blob, localChannel.StorageContext, ClientOptions).SetAccessTier(accesstier.Value, cancellationToken: this.CmdletCancellationToken);
             }
         }
 
@@ -450,7 +455,11 @@ internal virtual async Task UploadBlobwithSdk(long taskId, IStorageBlobManagemen
                 BlobHttpHeaders blobHttpHeaders = CreateBlobHttpHeaders(BlobProperties);
                 IDictionary<string, string> metadata = new Dictionary<string, string>();
                 SetBlobMeta_Track2(metadata, this.Metadata);
-                AccessTier? accesstier = GetAccessTier_Track2(this.standardBlobTier, this.pageBlobTier);
+                AccessTier? accesstierToSet = this.accesstier;
+                if (accesstierToSet == null)
+                {
+                    accesstierToSet = Util.ConvertAccessTier_Track1ToTrack2(this.pageBlobTier);
+                }
 
                 //Prepare progress handler
                 long fileSize = new FileInfo(ResolvedFileName).Length;
@@ -485,7 +494,7 @@ internal virtual async Task UploadBlobwithSdk(long taskId, IStorageBlobManagemen
                         uploadOptions.Metadata = metadata;
                         uploadOptions.HttpHeaders = blobHttpHeaders;
                         uploadOptions.Conditions = this.BlobRequestConditions;
-                        uploadOptions.AccessTier = accesstier;
+                        uploadOptions.AccessTier = accesstierToSet;
                         uploadOptions.ProgressHandler = progressHandler;
                         uploadOptions.TransferOptions = trasnferOption;
 
@@ -580,9 +589,9 @@ internal virtual async Task UploadBlobwithSdk(long taskId, IStorageBlobManagemen
                             offset += readoutcount;
                             progressHandler.Report(offset);
                         }
-                        if (string.Equals(blobType, PageBlobType, StringComparison.InvariantCultureIgnoreCase) && accesstier != null)
+                        if (string.Equals(blobType, PageBlobType, StringComparison.InvariantCultureIgnoreCase) && accesstierToSet != null)
                         {
-                            await pageblobClient.SetAccessTierAsync(accesstier.Value, cancellationToken: CmdletCancellationToken).ConfigureAwait(false);
+                            await pageblobClient.SetAccessTierAsync(accesstierToSet.Value, cancellationToken: CmdletCancellationToken).ConfigureAwait(false);
                         }
                     }
                     else
@@ -613,9 +622,9 @@ protected override void OnTaskSuccessful(DataMovementUserData data)
                 AccessCondition accessCondition = null;
                 StorageBlob.BlobRequestOptions requestOptions = RequestOptions;
 
-                if (this.pageBlobTier != null || this.standardBlobTier != null)
+                if (this.pageBlobTier != null || this.accesstier != null)
                 {
-                    this.SetBlobTier(localChannel, blob, pageBlobTier, standardBlobTier).Wait();
+                    this.SetBlobTier(localChannel, blob, pageBlobTier, accesstier).Wait();
                 }
 
                 try
@@ -683,7 +692,7 @@ public override void ExecuteCmdlet()
             {
                 type = StorageBlob.BlobType.Unspecified;
             }
-            ValidateBlobTier(type, pageBlobTier, standardBlobTier);
+            ValidateBlobTier(type, pageBlobTier, this.isBlockBlobAccessTier);
 
             if (BlobProperties != null)
             {
diff --git a/src/Storage/Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs b/src/Storage/Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs
diff --git a/src/Storage/Storage/Blob/StorageCloudBlobCmdletBase.cs b/src/Storage/Storage/Blob/StorageCloudBlobCmdletBase.cs
diff --git a/src/Storage/Storage/Common/AzureStorageBlob.cs b/src/Storage/Storage/Common/AzureStorageBlob.cs

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet`
`18`	`18`	`using Azure.Commands.Common.Authentication.Abstractions;`
`19`	`19`	`using Commands.Common.Storage.ResourceModel;`
`20`	`20`	`using global::Azure.Storage.Blobs;`
	`21`	`+ using global::Azure.Storage.Blobs.Models;`
`21`	`22`	`using global::Azure.Storage.Blobs.Specialized;`
`22`	`23`	`using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;`
`23`	`24`	`using Microsoft.Azure.Storage.Blob;`
`@@ -99,28 +100,30 @@ public string SrcContainer`
`99`	`100`	`public string DestBlobType { get; set; }`
`100`	`101`
`101`	`102`	`[Parameter(HelpMessage = "Block Blob Tier, valid values are Hot/Cool/Archive. See detail in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers", Mandatory = false)]`
	`103`	`+ [ValidateNotNullOrEmpty]`
`102`	`104`	`[PSArgumentCompleter("Hot", "Cool", "Archive")]`
`103`		`- [ValidateSet("Hot", "Cool", "Archive", IgnoreCase = true)]`
`104`	`105`	`public string StandardBlobTier`
`105`	`106`	`{`
`106`	`107`	`get`
`107`	`108`	`{`
`108`		`- return standardBlobTier is null ? null : standardBlobTier.Value.ToString();`
	`109`	`+ return accesstier?.ToString();`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`set`
`112`	`113`	`{`
`113`	`114`	`if (value != null)`
`114`	`115`	`{`
`115`		`- standardBlobTier = ((StandardBlobTier)Enum.Parse(typeof(StandardBlobTier), value, true));`
	`116`	`+ accesstier = new AccessTier(value);`
	`117`	`+ isBlockBlobAccessTier = true;`
`116`	`118`	`}`
`117`	`119`	`else`
`118`	`120`	`{`
`119`		`- standardBlobTier = null;`
	`121`	`+ accesstier = null;`
`120`	`122`	`}`
`121`	`123`	`}`
`122`	`124`	`}`
`123`		`- private StandardBlobTier? standardBlobTier = null;`
	`125`	`+ private bool? isBlockBlobAccessTier = null;`
	`126`	`+ private AccessTier? accesstier = null;`
`124`	`127`
`125`	`128`	`[Parameter(HelpMessage = "Block Blob RehydratePriority. Indicates the priority with which to rehydrate an archived blob. Valid values are High/Standard.", Mandatory = false)]`
`126`	`129`	`[ValidateSet("Standard", "High", IgnoreCase = true)]`
`@@ -372,7 +375,11 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,`
`372`	`375`
`373`	`376`	`if (destBlobType != null)`
`374`	`377`	`{`
`375`		`- ValidateBlobTier(Util.convertBlobType_Track2ToTrack1(destBlobType), null, standardBlobTier, rehydratePriority);`
	`378`	`+ ValidateBlobTier(Util.convertBlobType_Track2ToTrack1(destBlobType), null, isBlockBlobAccessTier, rehydratePriority);`
	`379`	`+ if (this.rehydratePriority != null && this.accesstier == null)`
	`380`	`+ {`
	`381`	`+ throw new ArgumentException("RehydratePriority should only be specified when StandardBlobTier is specified.");`
	`382`	`+ }`
`376`	`383`	`}`
`377`	`384`
`378`	`385`	`if (!destExist \|\| this.ConfirmOverwrite(srcUri.AbsoluteUri.ToString(), destBlob.Uri.ToString()))`
`@@ -483,9 +490,9 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,`
`483`	`490`	`Track2Models.BlobCopyFromUriOptions options = new Track2Models.BlobCopyFromUriOptions();`
`484`	`491`
`485`	`492`	`// The Blob Type and Blob Tier must match, since already checked before`
`486`		`- if (standardBlobTier != null \|\| rehydratePriority != null)`
	`493`	`+ if (accesstier != null \|\| rehydratePriority != null)`
`487`	`494`	`{`
`488`		`- options.AccessTier = Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier);`
	`495`	`+ options.AccessTier = accesstier;`
`489`	`496`	`options.RehydratePriority = Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority);`
`490`	`497`	`}`
`491`	`498`	`options.SourceConditions = this.BlobRequestConditions;`
`@@ -495,10 +502,10 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,`
`495`	`502`	`destBlobClient.SyncCopyFromUri(srcUri, options, this.CmdletCancellationToken);`
`496`	`503`
`497`	`504`	`// Set rehydrate priority`
`498`		`- if (rehydratePriority != null)`
	`505`	`+ if (rehydratePriority != null && accesstier != null)`
`499`	`506`	`{`
`500`		`- destBlobClient.SetAccessTier(Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier) == null ? null : (Track2Models.AccessTier)Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier),`
`501`		`- rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);`
	`507`	`+ destBlobClient.SetAccessTier(accesstier.Value,`
	`508`	`+ rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);`
`502`	`509`	`}`
`503`	`510`	`break;`
`504`	`511`	`}`
`@@ -510,9 +517,9 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,`
`510`	`517`	`commitBlockListOptions.Metadata = srcProperties.Metadata;`
`511`	`518`	`commitBlockListOptions.Tags = blobTags ?? null;`
`512`	`519`
`513`		`- if (standardBlobTier != null)`
	`520`	`+ if (accesstier != null)`
`514`	`521`	`{`
`515`		`- commitBlockListOptions.AccessTier = Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier);`
	`522`	`+ commitBlockListOptions.AccessTier = accesstier;`
`516`	`523`	`}`
`517`	`524`
`518`	`525`	`long blockLength = GetBlockLength(srcProperties.ContentLength);`
`@@ -534,10 +541,10 @@ private async Task CopyFromUri(long taskId, IStorageBlobManagement destChannel,`
`534`	`541`	`destBlockBlob.CommitBlockList(blockIDs, commitBlockListOptions, this.CmdletCancellationToken);`
`535`	`542`
`536`	`543`	`// Set rehydrate priority`
`537`		`- if (rehydratePriority != null)`
	`544`	`+ if (rehydratePriority != null && accesstier != null)`
`538`	`545`	`{`
`539`		`- destBlockBlob.SetAccessTier(Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier) == null ? null : (Track2Models.AccessTier)Util.ConvertAccessTier_Track1ToTrack2(standardBlobTier),`
`540`		`- rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);`
	`546`	`+ destBlockBlob.SetAccessTier(accesstier.Value,`
	`547`	`+ rehydratePriority: Util.ConvertRehydratePriority_Track1ToTrack2(rehydratePriority), cancellationToken: this.CmdletCancellationToken);`
`541`	`548`	`}`
`542`	`549`	`break;`
`543`	`550`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,28 +180,30 @@ public PremiumPageBlobTier PremiumPageBlobTier`
`180`	`180`	`private PremiumPageBlobTier? pageBlobTier = null;`
`181`	`181`
`182`	`182`	`[Parameter(HelpMessage = "Block Blob Tier, valid values are Hot/Cool/Archive. See detail in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers", Mandatory = false)]`
	`183`	`+ [ValidateNotNullOrEmpty]`
`183`	`184`	`[PSArgumentCompleter("Hot", "Cool", "Archive")]`
`184`		`- [ValidateSet("Hot", "Cool", "Archive", IgnoreCase = true)]`
`185`	`185`	`public string StandardBlobTier`
`186`	`186`	`{`
`187`	`187`	`get`
`188`	`188`	`{`
`189`		`- return standardBlobTier is null ? null : standardBlobTier.Value.ToString();`
	`189`	`+ return accesstier?.ToString();`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`set`
`193`	`193`	`{`
`194`	`194`	`if (value != null)`
`195`	`195`	`{`
`196`		`- standardBlobTier = ((StandardBlobTier)Enum.Parse(typeof(StandardBlobTier), value, true));`
	`196`	`+ accesstier = new AccessTier(value);`
	`197`	`+ isBlockBlobAccessTier = true;`
`197`	`198`	`}`
`198`	`199`	`else`
`199`	`200`	`{`
`200`		`- standardBlobTier = null;`
	`201`	`+ accesstier = null;`
`201`	`202`	`}`
`202`	`203`	`}`
`203`	`204`	`}`
`204`		`- private StandardBlobTier? standardBlobTier = null;`
	`205`	`+ private bool? isBlockBlobAccessTier = null;`
	`206`	`+ private AccessTier? accesstier = null;`
`205`	`207`
`206`	`208`	`[Parameter(HelpMessage = "Encryption scope to be used when making requests to the blob.",`
`207`	`209`	`Mandatory = false)]`
`@@ -220,6 +222,10 @@ protected override bool UseTrack2Sdk()`
`220`	`222`	`{`
`221`	`223`	`return true;`
`222`	`224`	`}`
	`225`	`+ if (accesstier != null && accesstier.Value != AccessTier.Archive && accesstier.Value != AccessTier.Cool && accesstier.Value != AccessTier.Hot)`
	`226`	`+ {`
	`227`	`+ return true;`
	`228`	`+ }`
`223`	`229`	`return false;`
`224`	`230`	`}`
`225`	`231`
`@@ -286,9 +292,9 @@ await DataMovementTransferHelper.DoTransfer(() =>`
`286`	`292`	`data.Record,`
`287`	`293`	`this.OutputStream).ConfigureAwait(false);`
`288`	`294`
`289`		`- if (this.pageBlobTier != null \|\| this.standardBlobTier != null)`
	`295`	`+ if (this.pageBlobTier != null \|\| this.accesstier != null)`
`290`	`296`	`{`
`291`		`- await this.SetBlobTier(localChannel, blob, pageBlobTier, standardBlobTier).ConfigureAwait(false);`
	`297`	`+ await this.SetBlobTier(localChannel, blob, pageBlobTier, accesstier).ConfigureAwait(false);`
`292`	`298`	`}`
`293`	`299`
`294`	`300`	`try`
`@@ -409,10 +415,10 @@ protected override void DoEndProcessing()`
`409`	`415`	`/// <param name="localChannel">IStorageBlobManagement channel object</param>`
`410`	`416`	`/// <param name="blob">CloudBlob object</param>`
`411`	`417`	`/// <param name="pageBlobTier">Page Blob Tier</param>`
`412`		`- /// <param name="standardBlobTier">Access condition to source if it's file/blob in azure.</param>`
`413`		`- private async Task SetBlobTier(IStorageBlobManagement localChannel, StorageBlob.CloudBlob blob, PremiumPageBlobTier? pageBlobTier = null, StandardBlobTier? standardBlobTier = null)`
	`418`	`+ /// <param name="accessTier">Access condition to source if it's file/blob in azure.</param>`
	`419`	`+ private async Task SetBlobTier(IStorageBlobManagement localChannel, StorageBlob.CloudBlob blob, PremiumPageBlobTier? pageBlobTier = null, AccessTier? accessTier = null)`
`414`	`420`	`{`
`415`		`- if (pageBlobTier == null && standardBlobTier == null)`
	`421`	`+ if (pageBlobTier == null && accessTier == null)`
`416`	`422`	`{`
`417`	`423`	`return;`
`418`	`424`	`}`
`@@ -424,10 +430,9 @@ private async Task SetBlobTier(IStorageBlobManagement localChannel, StorageBlob.`
`424`	`430`	`{`
`425`	`431`	`await Channel.SetPageBlobTierAsync((CloudPageBlob)blob, pageBlobTier.Value, requestOptions, OperationContext, CmdletCancellationToken).ConfigureAwait(false);`
`426`	`432`	`}`
`427`		`- if (standardBlobTier != null)`
	`433`	`+ if (accessTier != null)`
`428`	`434`	`{`
`429`		`- AccessCondition accessCondition = null;`
`430`		`- await Channel.SetStandardBlobTierAsync((CloudBlockBlob)blob, accessCondition, standardBlobTier.Value, null, requestOptions, OperationContext, CmdletCancellationToken).ConfigureAwait(false);`
	`435`	`+ AzureStorageBlob.GetTrack2BlobClient(blob, localChannel.StorageContext, ClientOptions).SetAccessTier(accesstier.Value, cancellationToken: this.CmdletCancellationToken);`
`431`	`436`	`}`
`432`	`437`	`}`
`433`	`438`
`@@ -450,7 +455,11 @@ internal virtual async Task UploadBlobwithSdk(long taskId, IStorageBlobManagemen`
`450`	`455`	`BlobHttpHeaders blobHttpHeaders = CreateBlobHttpHeaders(BlobProperties);`
`451`	`456`	`IDictionary<string, string> metadata = new Dictionary<string, string>();`
`452`	`457`	`SetBlobMeta_Track2(metadata, this.Metadata);`
`453`		`- AccessTier? accesstier = GetAccessTier_Track2(this.standardBlobTier, this.pageBlobTier);`
	`458`	`+ AccessTier? accesstierToSet = this.accesstier;`
	`459`	`+ if (accesstierToSet == null)`
	`460`	`+ {`
	`461`	`+ accesstierToSet = Util.ConvertAccessTier_Track1ToTrack2(this.pageBlobTier);`
	`462`	`+ }`
`454`	`463`
`455`	`464`	`//Prepare progress handler`
`456`	`465`	`long fileSize = new FileInfo(ResolvedFileName).Length;`
`@@ -485,7 +494,7 @@ internal virtual async Task UploadBlobwithSdk(long taskId, IStorageBlobManagemen`
`485`	`494`	`uploadOptions.Metadata = metadata;`
`486`	`495`	`uploadOptions.HttpHeaders = blobHttpHeaders;`
`487`	`496`	`uploadOptions.Conditions = this.BlobRequestConditions;`
`488`		`- uploadOptions.AccessTier = accesstier;`
	`497`	`+ uploadOptions.AccessTier = accesstierToSet;`
`489`	`498`	`uploadOptions.ProgressHandler = progressHandler;`
`490`	`499`	`uploadOptions.TransferOptions = trasnferOption;`
`491`	`500`
`@@ -580,9 +589,9 @@ internal virtual async Task UploadBlobwithSdk(long taskId, IStorageBlobManagemen`
`580`	`589`	`offset += readoutcount;`
`581`	`590`	`progressHandler.Report(offset);`
`582`	`591`	`}`
`583`		`- if (string.Equals(blobType, PageBlobType, StringComparison.InvariantCultureIgnoreCase) && accesstier != null)`
	`592`	`+ if (string.Equals(blobType, PageBlobType, StringComparison.InvariantCultureIgnoreCase) && accesstierToSet != null)`
`584`	`593`	`{`
`585`		`- await pageblobClient.SetAccessTierAsync(accesstier.Value, cancellationToken: CmdletCancellationToken).ConfigureAwait(false);`
	`594`	`+ await pageblobClient.SetAccessTierAsync(accesstierToSet.Value, cancellationToken: CmdletCancellationToken).ConfigureAwait(false);`
`586`	`595`	`}`
`587`	`596`	`}`
`588`	`597`	`else`
`@@ -613,9 +622,9 @@ protected override void OnTaskSuccessful(DataMovementUserData data)`
`613`	`622`	`AccessCondition accessCondition = null;`
`614`	`623`	`StorageBlob.BlobRequestOptions requestOptions = RequestOptions;`
`615`	`624`
`616`		`- if (this.pageBlobTier != null \|\| this.standardBlobTier != null)`
	`625`	`+ if (this.pageBlobTier != null \|\| this.accesstier != null)`
`617`	`626`	`{`
`618`		`- this.SetBlobTier(localChannel, blob, pageBlobTier, standardBlobTier).Wait();`
	`627`	`+ this.SetBlobTier(localChannel, blob, pageBlobTier, accesstier).Wait();`
`619`	`628`	`}`
`620`	`629`
`621`	`630`	`try`
`@@ -683,7 +692,7 @@ public override void ExecuteCmdlet()`
`683`	`692`	`{`
`684`	`693`	`type = StorageBlob.BlobType.Unspecified;`
`685`	`694`	`}`
`686`		`- ValidateBlobTier(type, pageBlobTier, standardBlobTier);`
	`695`	`+ ValidateBlobTier(type, pageBlobTier, this.isBlockBlobAccessTier);`
`687`	`696`
`688`	`697`	`if (BlobProperties != null)`
`689`	`698`	`{`