Revert "Fix: Blob OpenWrite methods do not set metadata"

This reverts commit fa4277b.
spotflow-io · Aug 16, 2024 · 8d3b27d · 8d3b27d
1 parent fa4277b
commit 8d3b27d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 61 deletions.
diff --git a/src/Spotflow.InMemory.Azure.Storage/Blobs/Internals/BlobClientCore.cs b/src/Spotflow.InMemory.Azure.Storage/Blobs/Internals/BlobClientCore.cs
@@ -189,7 +189,7 @@ public async Task<Stream> OpenWriteAsync(bool overwrite, BlobOpenWriteOptions? o
 
         using var blob = AcquireBlob(cancellationToken);
 
-        if (!blob.Value.TryOpenWrite(options?.OpenConditions, options?.BufferSize, options?.Metadata, out var stream, out var error))
+        if (!blob.Value.TryOpenWrite(options?.OpenConditions, options?.BufferSize, out var stream, out var error))
         {
             throw error.GetClientException();
         }

diff --git a/src/Spotflow.InMemory.Azure.Storage/Blobs/Internals/InMemoryBlockBlob.cs b/src/Spotflow.InMemory.Azure.Storage/Blobs/Internals/InMemoryBlockBlob.cs
@@ -254,7 +254,7 @@ public bool TryGetBlockList(
         return true;
     }
 
-    public bool TryOpenWrite(RequestConditions? conditions, long? bufferSize, IDictionary<string, string>? metadata, [NotNullWhen(true)] out Stream? stream, [NotNullWhen(false)] out OpenWriteError? error)
+    public bool TryOpenWrite(RequestConditions? conditions, long? bufferSize, [NotNullWhen(true)] out Stream? stream, [NotNullWhen(false)] out OpenWriteError? error)
     {
         if (!ConditionChecker.CheckConditions(_properties?.ETag, conditions?.IfMatch, conditions?.IfNoneMatch, out var conditionError))
         {
@@ -263,7 +263,7 @@ public bool TryOpenWrite(RequestConditions? conditions, long? bufferSize, IDicti
             return false;
         }
 
-        SetCommitedState(null, metadata, []);
+        SetCommitedState(null, null, []);
 
         var client = InMemoryBlockBlobClient.FromAccount(Container.Service.Account, ContainerName, Name);
 

diff --git a/tests/Tests/Storage/Blobs/BlobClientTests.cs b/tests/Tests/Storage/Blobs/BlobClientTests.cs
@@ -143,31 +143,6 @@ public void OpenWrite_And_Dispose_Should_Create_Blob(BlobClientType clientType)
     }
 
 
-    [TestMethod]
-    [TestCategory(TestCategory.AzureInfra)]
-    [DataRow(BlobClientType.Generic)]
-    [DataRow(BlobClientType.Block)]
-    public void OpenWrite_Should_Set_Blob_Metadata(BlobClientType clientType)
-    {
-        var containerClient = ImplementationProvider.GetBlobContainerClient();
-
-        containerClient.CreateIfNotExists();
-
-        var blobName = Guid.NewGuid().ToString();
-
-        var blobClient = containerClient.GetBlobBaseClient(blobName, clientType);
-
-        blobClient.Exists().Value.Should().BeFalse();
-
-        var metadata = new Dictionary<string, string> { { "test-key", "test-value" } };
-
-        using var stream = OpenWrite(blobClient, true, metadata);
-
-        stream.Dispose();
-
-        blobClient.GetProperties().Value.Metadata.Should().Contain("test-key", "test-value");
-    }
-
     [TestMethod]
     [TestCategory(TestCategory.AzureInfra)]
     [DataRow(BlobClientType.Generic)]
@@ -190,7 +165,6 @@ public void OpenWrite_Without_Overwrite_Option_Should_Be_Unsupported(BlobClientT
 
     }
 
-
     [TestMethod]
     [TestCategory(TestCategory.AzureInfra)]
     [DataRow(BlobClientType.Generic)]
@@ -444,40 +418,14 @@ private static void Upload(BlobBaseClient blobClient, byte[] content, BlobUpload
         }
     }
 
-    private static Stream OpenWrite(BlobBaseClient blobClient, bool overwrite, IDictionary<string, string>? metadata = null)
+    private static Stream OpenWrite(BlobBaseClient blobClient, bool overwrite)
     {
-        if (blobClient is BlobClient genericClient)
-        {
-            BlobOpenWriteOptions? options = null;
-
-            if (metadata is not null)
-            {
-                options = new()
-                {
-                    Metadata = metadata
-                };
-            }
-
-            return genericClient.OpenWrite(overwrite, options);
-        }
-
-        if (blobClient is BlockBlobClient blockClient)
+        return blobClient switch
         {
-            BlockBlobOpenWriteOptions? options = null;
-
-            if (metadata is not null)
-            {
-                options = new()
-                {
-                    Metadata = metadata
-                };
-            }
-
-            return blockClient.OpenWrite(overwrite, options);
-        }
-
-        throw new InvalidOperationException("Unexpected client type.");
-
+            BlobClient genericClient => genericClient.OpenWrite(overwrite),
+            BlockBlobClient blockClient => blockClient.OpenWrite(overwrite),
+            _ => throw new InvalidOperationException()
+        };
     }