Merge branch 'dev'

aws-sdk-dotnet-automation · aws-sdk-dotnet-automation · commit 23c0966ca64b · 2026-04-06T16:44:02.000Z
diff --git a/.github/workflows/aws-ci.yml b/.github/workflows/aws-ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 #v4
         with:
           role-to-assume: ${{ secrets.CI_MAIN_TESTING_ACCOUNT_ROLE_ARN }}
           role-duration-seconds: 7200
@@ -29,7 +29,7 @@ jobs:
           $roleArn=$(cat ./response.json)
           "roleArn=$($roleArn -replace '"', '')" >> $env:GITHUB_OUTPUT
       - name: Configure Test Runner Credentials
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 #v4
         with:
           role-to-assume: ${{ steps.lambda.outputs.roleArn }}
           role-duration-seconds: 7200
diff --git a/.github/workflows/change-file-in-pr.yml b/.github/workflows/change-file-in-pr.yml
@@ -15,11 +15,11 @@ jobs:
 
     steps:
       - name: Checkout PR code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
 
       - name: Get List of Changed Files
         id: changed-files
-        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 #v45
+        uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 #v45
 
       - name: Check for Change File(s) in .autover/changes/
         run: |
diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
@@ -25,26 +25,26 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2
       # Retrieve the Access Token from Secrets Manager
       - name: Retrieve secret from AWS Secrets Manager
-        uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
+        uses: aws-actions/aws-secretsmanager-get-secrets@3a411b6ec5cace3d626412dd917e7bfeac242cfa #v3.0.0
         with:
           secret-ids: |
             AWS_SECRET, ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_NAME }}
           parse-json-secrets: true
       # Checkout a full clone of the repo
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           fetch-depth: '0'
           token: ${{ env.AWS_SECRET_TOKEN }}
       # Install .NET8 which is needed for AutoVer
       - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #v5.0.1
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 #v5.2.0
         with:
           dotnet-version: 8.0.x
       # Install AutoVer to automate versioning and changelog creation
diff --git a/.github/workflows/doc-site.yml b/.github/workflows/doc-site.yml
@@ -26,24 +26,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # pinning V4 #v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # pinning V4 #v6.0.2
       - name: Dotnet Setup
-        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # pinning V4 #v5.0.1
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # pinning V4 #v5.2.0
         with:
           dotnet-version: 8.x
 
       - run: dotnet tool update -g docfx --version 2.78.3
       - run: docfx docs/docfx.json
 
       - name: Setup Pages
-        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # pinning V5 #v5.0.0
+        uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # pinning V5 #v6.0.0
       - name: Upload artifact
         uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # pinning V3 #v4.0.0
         with:
           # Upload entire repository
           path: "docs/_site"
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # pinning V4 #v4.0.5
+        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # pinning V4 #v5.0.0
 
 
diff --git a/.github/workflows/semgrep-analysis.yml b/.github/workflows/semgrep-analysis.yml
@@ -25,7 +25,7 @@ jobs:
     if: (github.actor != 'dependabot[bot]')
     steps:
       # Fetch project source
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
 
       - run: semgrep ci --sarif > semgrep.sarif
         env:
@@ -35,7 +35,7 @@ jobs:
             p/owasp-top-ten
 
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 #v4.31.9
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 #v4.35.1
         with:
           sarif_file: semgrep.sarif
         if: always()
diff --git a/.github/workflows/sync-main-dev.yml b/.github/workflows/sync-main-dev.yml
@@ -27,27 +27,27 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2
       # Retrieve the Access Token from Secrets Manager
       - name: Retrieve secret from AWS Secrets Manager
-        uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
+        uses: aws-actions/aws-secretsmanager-get-secrets@3a411b6ec5cace3d626412dd917e7bfeac242cfa #v3.0.0
         with:
           secret-ids: |
             AWS_SECRET, ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_NAME }}
           parse-json-secrets: true
       # Checkout a full clone of the repo
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           ref: dev
           fetch-depth: 0
           token: ${{ env.AWS_SECRET_TOKEN }}
       # Install .NET8 which is needed for AutoVer
       - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #v5.0.1
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 #v5.2.0
         with:
           dotnet-version: 8.0.x
       # Install AutoVer which is needed to retrieve information about the current release.
@@ -107,13 +107,13 @@ jobs:
     steps:
       # Checkout a full clone of the repo
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           ref: releases/next-release
           fetch-depth: 0
       # Install .NET8 which is needed for AutoVer
       - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #v5.0.1
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 #v5.2.0
         with:
           dotnet-version: 8.0.x
       # Install AutoVer which is needed to retrieve information about the current release.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Release 2026-04-06
+
+### AWS.Messaging (1.3.0)
+* Added ISerializationCallback<T> generic interface for type-specific serialization callbacks. Callbacks registered via AddSerializationCallback<TCallback, TMessage>() are only invoked when the message type matches, providing direct typed access to the message payload with zero casting. Also fixed ArgumentNullException constructor usage in EnvelopeSerializer.
+
 ## Release 2026-03-31
 
 ### AWS.Messaging (1.2.0)
diff --git a/src/AWS.Messaging/AWS.Messaging.csproj b/src/AWS.Messaging/AWS.Messaging.csproj
@@ -18,7 +18,7 @@
     <NoWarn>CS1591</NoWarn>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
diff --git a/src/AWS.Messaging/Configuration/IMessageBusBuilder.cs b/src/AWS.Messaging/Configuration/IMessageBusBuilder.cs
@@ -91,6 +91,16 @@ public interface IMessageBusBuilder
     /// <param name="serializationCallback">An instance of <see cref="ISerializationCallback"/>that lets users inject their own metadata to incoming and outgoing messages.</param>
     IMessageBusBuilder AddSerializationCallback(ISerializationCallback serializationCallback);
 
+    /// <summary>
+    /// Adds a type-specific serialization callback that is only invoked when the message being
+    /// serialized matches <typeparamref name="TMessage"/>. This provides direct typed access to
+    /// the message payload without requiring any casting.
+    /// </summary>
+    /// <typeparam name="TCallback">The callback implementation type.</typeparam>
+    /// <typeparam name="TMessage">The message type this callback handles.</typeparam>
+    IMessageBusBuilder AddSerializationCallback<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCallback, TMessage>()
+        where TCallback : class, ISerializationCallback<TMessage>;
+
     /// <summary>
     /// Adds a global message source to the message bus.
     /// This source will be added to the message envelope of all the messages sent through the framework.
diff --git a/src/AWS.Messaging/Configuration/MessageBusBuilder.cs b/src/AWS.Messaging/Configuration/MessageBusBuilder.cs
@@ -184,6 +184,14 @@ public IMessageBusBuilder AddSerializationCallback(ISerializationCallback serial
         return this;
     }
 
+    /// <inheritdoc/>
+    public IMessageBusBuilder AddSerializationCallback<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCallback, TMessage>()
+        where TCallback : class, ISerializationCallback<TMessage>
+    {
+        _serviceCollection.AddSingleton<ISerializationCallback<TMessage>, TCallback>();
+        return this;
+    }
+
     /// <inheritdoc/>
     public IMessageBusBuilder AddMessageSource(string messageSource)
     {
diff --git a/src/AWS.Messaging/Serialization/EnvelopeSerializer.cs b/src/AWS.Messaging/Serialization/EnvelopeSerializer.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Logging;
 using AWS.Messaging.Serialization.Parsers;
 using System.Collections.Frozen;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace AWS.Messaging.Serialization;
 
@@ -26,6 +27,7 @@ internal class EnvelopeSerializer : IEnvelopeSerializer
     private readonly IDateTimeHandler _dateTimeHandler;
     private readonly IMessageIdGenerator _messageIdGenerator;
     private readonly IMessageSourceHandler _messageSourceHandler;
+    private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<EnvelopeSerializer> _logger;
 
     // Order matters for the SQS parser (must be last), but SNS and EventBridge parsers
@@ -43,14 +45,16 @@ public EnvelopeSerializer(
         IMessageSerializer messageSerializer,
         IDateTimeHandler dateTimeHandler,
         IMessageIdGenerator messageIdGenerator,
-        IMessageSourceHandler messageSourceHandler)
+        IMessageSourceHandler messageSourceHandler,
+        IServiceProvider serviceProvider)
     {
         _logger = logger;
         _messageConfiguration = messageConfiguration;
         _messageSerializer = messageSerializer;
         _dateTimeHandler = dateTimeHandler;
         _messageIdGenerator = messageIdGenerator;
         _messageSourceHandler = messageSourceHandler;
+        _serviceProvider = serviceProvider;
     }
 
     /// <inheritdoc/>
@@ -92,7 +96,8 @@ public async ValueTask<string> SerializeAsync<T>(MessageEnvelope<T> envelope)
         try
         {
             await InvokePreSerializationCallback(envelope);
-            var message = envelope.Message ?? throw new ArgumentNullException("The underlying application message cannot be null");
+            await InvokeTypedPreSerializationCallbacks(envelope);
+            var message = envelope.Message ?? throw new ArgumentNullException(nameof(envelope.Message), "The underlying application message cannot be null");
 
             // This blob serves as an intermediate data container because the underlying application message
             // must be serialized separately as the _messageSerializer can have a user injected implementation.
@@ -418,6 +423,15 @@ private async ValueTask InvokePreSerializationCallback(MessageEnvelope messageEn
         }
     }
 
+    private async ValueTask InvokeTypedPreSerializationCallbacks<T>(MessageEnvelope<T> messageEnvelope)
+    {
+        var typedCallbacks = _serviceProvider.GetServices<ISerializationCallback<T>>();
+        foreach (var callback in typedCallbacks)
+        {
+            await callback.PreSerializationAsync(messageEnvelope);
+        }
+    }
+
     private async ValueTask<string> InvokePostSerializationCallback(string message)
     {
         foreach (var serializationCallback in _messageConfiguration.SerializationCallbacks)
diff --git a/src/AWS.Messaging/Serialization/ISerializationCallback{T}.cs b/src/AWS.Messaging/Serialization/ISerializationCallback{T}.cs
@@ -0,0 +1,27 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+namespace AWS.Messaging.Serialization
+{
+    /// <summary>
+    /// A type-specific serialization callback that is only invoked when the message being serialized
+    /// matches the type <typeparamref name="T"/>. This provides direct typed access to the message payload
+    /// via <see cref="MessageEnvelope{T}.Message"/> without requiring any casting.
+    /// <para/>
+    /// This is useful for extracting values from the message to set as envelope metadata,
+    /// such as CloudEvents extension attributes like <c>subject</c>.
+    /// <para/>
+    /// For cross-cutting concerns that apply to all message types (e.g., encryption, logging),
+    /// use the non-generic <see cref="ISerializationCallback"/> instead.
+    /// </summary>
+    /// <typeparam name="T">The .NET type of the message this callback handles.</typeparam>
+    public interface ISerializationCallback<T>
+    {
+        /// <summary>
+        /// This is invoked before the message envelope is serialized and published to an endpoint.
+        /// It is only called when the message type matches <typeparamref name="T"/>.
+        /// </summary>
+        /// <param name="messageEnvelope">The typed message envelope containing the application message and CloudEvents metadata.</param>
+        ValueTask PreSerializationAsync(MessageEnvelope<T> messageEnvelope);
+    }
+}
diff --git a/test/AWS.Messaging.UnitTests/SerializationTests/EnvelopeSerializerTests.cs b/test/AWS.Messaging.UnitTests/SerializationTests/EnvelopeSerializerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,14 @@ public IMessageBusBuilder AddSerializationCallback(ISerializationCallback serial`
`184`	`184`	`return this;`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ /// <inheritdoc/>`
	`188`	`+ public IMessageBusBuilder AddSerializationCallback<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCallback, TMessage>()`
	`189`	`+ where TCallback : class, ISerializationCallback<TMessage>`
	`190`	`+ {`
	`191`	`+ _serviceCollection.AddSingleton<ISerializationCallback<TMessage>, TCallback>();`
	`192`	`+ return this;`
	`193`	`+ }`
	`194`	`+`
`187`	`195`	`/// <inheritdoc/>`
`188`	`196`	`public IMessageBusBuilder AddMessageSource(string messageSource)`
`189`	`197`	`{`