Feature/storage/blob tags75

sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.0.cs

@@ -891,7 +891,9 @@ public static partial class BlobsModelFactory
         public static Azure.Storage.Blobs.Models.PageInfo PageInfo(Azure.ETag eTag, System.DateTimeOffset lastModified, byte[] contentHash, byte[] contentCrc64, long blobSequenceNumber, string encryptionKeySha256) { throw null; }
         public static Azure.Storage.Blobs.Models.PageInfo PageInfo(Azure.ETag eTag, System.DateTimeOffset lastModified, byte[] contentHash, byte[] contentCrc64, long blobSequenceNumber, string encryptionKeySha256, string encryptionScope) { throw null; }
         public static Azure.Storage.Blobs.Models.PageRangesInfo PageRangesInfo(System.DateTimeOffset lastModified, Azure.ETag eTag, long blobContentLength, System.Collections.Generic.IEnumerable<Azure.HttpRange> pageRanges, System.Collections.Generic.IEnumerable<Azure.HttpRange> clearRanges) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public static Azure.Storage.Blobs.Models.TaggedBlobItem TaggedBlobItem(string blobName = null, string blobContainerName = null) { throw null; }
+        public static Azure.Storage.Blobs.Models.TaggedBlobItem TaggedBlobItem(string blobName = null, string blobContainerName = null, System.Collections.Generic.IDictionary<string, string> tags = null) { throw null; }
         public static Azure.Storage.Blobs.Models.UserDelegationKey UserDelegationKey(string signedObjectId, string signedTenantId, string signedService, string signedVersion, string value, System.DateTimeOffset signedExpiresOn, System.DateTimeOffset signedStartsOn) { throw null; }
     }
     public partial class BlobSnapshotInfo
@@ -1178,6 +1180,7 @@ public partial class TaggedBlobItem
         internal TaggedBlobItem() { }
         public string BlobContainerName { get { throw null; } }
         public string BlobName { get { throw null; } }
+        public System.Collections.Generic.IDictionary<string, string> Tags { get { throw null; } }
     }
     public partial class UserDelegationKey
     {

sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs

@@ -3921,6 +3921,7 @@ private async Task<Response<GetBlobTagResult>> GetTagsInternal(
                         resourceUri: Uri,
                         version: Version.ToVersionString(),
                         ifTags: conditions?.TagConditions,
+                        leaseId: conditions?.LeaseId,
                         async: async,
                         operationName: $"{nameof(BlobBaseClient)}.{nameof(GetTags)}",
                         cancellationToken: cancellationToken)
@@ -4084,6 +4085,7 @@ private async Task<Response> SetTagsInternal(
                         version: Version.ToVersionString(),
                         tags: tags.ToBlobTags(),
                         ifTags: conditions?.TagConditions,
+                        leaseId: conditions?.LeaseId,
                         async: async,
                         operationName: $"{nameof(BlobBaseClient)}.{nameof(SetTags)}",
                         cancellationToken: cancellationToken)

sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs

@@ -278,7 +278,8 @@ internal static TaggedBlobItem ToBlobTagItem(this FilterBlobItem filterBlobItem)
             return new TaggedBlobItem
             {
                 BlobName = filterBlobItem.BlobName,
-                BlobContainerName = filterBlobItem.BlobContainerName
+                BlobContainerName = filterBlobItem.BlobContainerName,
+                Tags = filterBlobItem.Tags.ToTagDictionary()
             };
         }
 

sdk/storage/Azure.Storage.Blobs/src/Models/BlobsModelFactory.cs

@@ -875,6 +875,21 @@ public static GetBlobTagResult GetBlobTagResult(Tags tags)
         /// <summary>
         /// Creates a new BlobTagItem instance for mocking.
         /// </summary>
+        public static TaggedBlobItem TaggedBlobItem(
+            string blobName = default,
+            string blobContainerName = default,
+            Tags tags = default)
+            => new TaggedBlobItem
+            {
+                BlobName = blobName,
+                BlobContainerName = blobContainerName,
+                Tags = tags
+            };
+
+        /// <summary>
+        /// Creates a new BlobTagItem instance for mocking.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static TaggedBlobItem TaggedBlobItem(
             string blobName = default,
             string blobContainerName = default)

sdk/storage/Azure.Storage.Blobs/src/Models/TaggedBlobItem.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
+using Tags = System.Collections.Generic.IDictionary<string, string>;
 
 namespace Azure.Storage.Blobs.Models
 {
@@ -20,6 +20,11 @@ public class TaggedBlobItem
         /// </summary>
         public string BlobContainerName { get; internal set; }
 
+        /// <summary>
+        /// Blob Tags.
+        /// </summary>
+        public Tags Tags { get; internal set; }
+
         /// <summary>
         /// Prevent direct instantiation of FilterBlobItem instances.
         /// You can use BlobsModelFactory.FilterBlobItem instead.

sdk/storage/Azure.Storage.Blobs/swagger/readme.md

@@ -4,7 +4,7 @@
 ## Configuration
 ``` yaml
 # Generate blob storage
-input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.BlobStorage/preview/2020-02-10/blob.json
+input-file: C:\Users\seanmcc\git\azure-rest-api-specs\specification\storage\data-plane\Microsoft.BlobStorage\preview\2020-04-08\blob.json
 output-folder: ../src/Generated
 clear-output-folder: false
 

sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs

@@ -5661,6 +5661,75 @@ await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
                 e => Assert.AreEqual(BlobErrorCode.BlobNotFound.ToString(), e.ErrorCode));
         }
 
+        [Test]
+        [ServiceVersion(Min = BlobClientOptions.ServiceVersion.V2020_04_08)]
+        public async Task GetSetTagsAsync_Lease()
+        {
+            // Arrange
+            await using DisposingContainer test = await GetTestContainerAsync();
+            BlobBaseClient blob = await GetNewBlobClient(test.Container);
+
+            string leaseId = Recording.Random.NewGuid().ToString();
+            TimeSpan duration = TimeSpan.FromSeconds(15);
+            await InstrumentClient(blob.GetBlobLeaseClient(leaseId)).AcquireAsync(duration);
+
+            BlobRequestConditions conditions = new BlobRequestConditions
+            {
+                LeaseId = leaseId
+            };
+
+            Dictionary<string, string> tags = BuildTags();
+            await blob.SetTagsAsync(tags, conditions);
+
+            // Act
+            Response<GetBlobTagResult> response = await blob.GetTagsAsync(conditions);
+
+            // Assert
+            AssertDictionaryEquality(tags, response.Value.Tags);
+        }
+
+        [Test]
+        [ServiceVersion(Min = BlobClientOptions.ServiceVersion.V2020_04_08)]
+        public async Task GetTagsAsync_LeaseFailed()
+        {
+            // Arrange
+            await using DisposingContainer test = await GetTestContainerAsync();
+            BlobBaseClient blob = await GetNewBlobClient(test.Container);
+            string leaseId = Recording.Random.NewGuid().ToString();
+
+            BlobRequestConditions conditions = new BlobRequestConditions
+            {
+                LeaseId = leaseId
+            };
+
+            // Act
+            await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
+                blob.GetTagsAsync(conditions),
+                e => Assert.AreEqual(BlobErrorCode.LeaseNotPresentWithBlobOperation.ToString(), e.ErrorCode));
+        }
+
+        [Test]
+        [ServiceVersion(Min = BlobClientOptions.ServiceVersion.V2020_04_08)]
+        public async Task SetTagsAsync_LeaseFailed()
+        {
+            // Arrange
+            await using DisposingContainer test = await GetTestContainerAsync();
+            BlobBaseClient blob = await GetNewBlobClient(test.Container);
+            string leaseId = Recording.Random.NewGuid().ToString();
+
+            BlobRequestConditions conditions = new BlobRequestConditions
+            {
+                LeaseId = leaseId
+            };
+
+            Dictionary<string, string> tags = BuildTags();
+
+            // Act
+            await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
+                blob.SetTagsAsync(tags, conditions),
+                e => Assert.AreEqual(BlobErrorCode.LeaseNotPresentWithBlobOperation.ToString(), e.ErrorCode));
+        }
+
         //[Test]
         //public async Task SetTierAsync_Batch()
         //{

sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs

@@ -578,7 +578,16 @@ public async Task FindBlobsByTagAsync()
 
             // Assert
             TaggedBlobItem filterBlob = blobs.Where(r => r.BlobName == blobName).FirstOrDefault();
-            Assert.IsNotNull(filterBlob);
+
+            if (_serviceVersion >= BlobClientOptions.ServiceVersion.V2020_04_08)
+            {
+                Assert.AreEqual(1, filterBlob.Tags.Count);
+                Assert.AreEqual("myTagValue", filterBlob.Tags["myTagKey"]);
+            }
+            else
+            {
+                Assert.IsNotNull(filterBlob);
+            }
         }
 
         [Test]