Add the ability to specify the tags you whish to place on archives me…

…ssages (#2800)
BrighterCommand · Sep 4, 2023 · ed035c6 · ed035c6
1 parent 438938b
commit ed035c6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/src/Paramore.Brighter.Archive.Azure/AzureBlobArchiveProvider.cs b/src/Paramore.Brighter.Archive.Azure/AzureBlobArchiveProvider.cs
@@ -100,16 +100,7 @@ private BlobUploadOptions GetUploadOptions(Message message)
         };
 
         if (_options.TagBlobs)
-        {
-            opts.Tags = new Dictionary<string, string>()
-            {
-                { "topic", message.Header.Topic },
-                { "correlationId", message.Header.CorrelationId.ToString() },
-                { "message_type", message.Header.MessageType.ToString() },
-                { "timestamp", message.Header.TimeStamp.ToString() },
-                { "content_type", message.Header.ContentType }
-            };
-        }
+            opts.Tags = _options.TagsFunc.Invoke(message);
 
         return opts;
     }

diff --git a/src/Paramore.Brighter.Archive.Azure/AzureBlobArchiveProviderOptions.cs b/src/Paramore.Brighter.Archive.Azure/AzureBlobArchiveProviderOptions.cs
@@ -34,4 +34,16 @@ public class AzureBlobArchiveProviderOptions
     /// The maximum upload size in mb
     /// </summary>
     public int MaxUploadSize = 50;
+
+    /// <summary>
+    /// The function to arrange the tags to add when storing, please note that <see cref="TagBlobs"/> must be True for these to be used
+    /// </summary>
+    public Func<Message, Dictionary<string, string>> TagsFunc = (message) => new Dictionary<string, string>()
+    {
+        { "topic", message.Header.Topic },
+        { "correlationId", message.Header.CorrelationId.ToString() },
+        { "message_type", message.Header.MessageType.ToString() },
+        { "timestamp", message.Header.TimeStamp.ToString() },
+        { "content_type", message.Header.ContentType }
+    };
 }
diff --git a/tests/Paramore.Brighter.Azure.Tests/AzureBlobArchiveProviderTests.cs b/tests/Paramore.Brighter.Azure.Tests/AzureBlobArchiveProviderTests.cs
@@ -175,8 +175,15 @@ private BlobContainerClient GetClient(AccessTier tier , bool tags = false )
             BlobContainerUri = new Uri("https://brighterarchivertest.blob.core.windows.net/messagearchive"), 
             TokenCredential = new AzureCliCredential(),
             AccessTier = tier,
-            TagBlobs = tags
-
+            TagBlobs = tags,
+            TagsFunc = (message => new Dictionary<string, string>()
+            {
+                { "topic", message.Header.Topic },
+                { "correlationId", message.Header.CorrelationId.ToString() },
+                { "message_type", message.Header.MessageType.ToString() },
+                { "timestamp", message.Header.TimeStamp.ToString() },
+                { "content_type", message.Header.ContentType }
+            })
         };
         _provider = new AzureBlobArchiveProvider(options);