Merge branch 'dev'

Author: aws-sdk-dotnet-automation

.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@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
+        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #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@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
+        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
         with:
           role-to-assume: ${{ steps.lambda.outputs.roleArn }}
           role-duration-seconds: 7200

.github/workflows/change-file-in-pr.yml

@@ -15,11 +15,11 @@ jobs:
 
     steps:
       - name: Checkout PR code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
 
       - name: Get List of Changed Files
         id: changed-files
-        uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 #v45
+        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 #v45
 
       - name: Check for Change File(s) in .autover/changes/
         run: |

.github/workflows/create-release-pr.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
+        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2
@@ -38,13 +38,13 @@ jobs:
           parse-json-secrets: true
       # Checkout a full clone of the repo
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
         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@d4c94342e560b34958eacfc5d055d21461ed1c5d #v5.0.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #v5.0.1
         with:
           dotnet-version: 8.0.x
       # Install AutoVer to automate versioning and changelog creation

.github/workflows/doc-site.yml

@@ -26,9 +26,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pinning V4 #v4.2.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # pinning V4 #v6.0.1
       - name: Dotnet Setup
-        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # pinning V4 #v5.0.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # pinning V4 #v5.0.1
         with:
           dotnet-version: 8.x
 

.github/workflows/semgrep-analysis.yml

@@ -25,7 +25,7 @@ jobs:
     if: (github.actor != 'dependabot[bot]')
     steps:
       # Fetch project source
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
 
       - 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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 #v3.30.5
+        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 #v4.31.9
         with:
           sarif_file: semgrep.sarif
         if: always()

.github/workflows/stale_issues.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Stale issue job
     steps:
-    - uses: aws-actions/stale-issue-cleanup@5650b49bcd757a078f6ca06c373d7807b773f9bc #v7.1.0
+    - uses: aws-actions/stale-issue-cleanup@0604f2edf84a3a66bc0dfb4a30eb07814cbdf440 #v7.1.1
       with:
         # Setting messages to an empty string will cause the automation to skip
         # that category

.github/workflows/sync-main-dev.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
       # Assume an AWS Role that provides access to the Access Token
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df #v4
+        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 #v4
         with:
           role-to-assume: ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_ROLE_ARN }}
           aws-region: us-west-2
@@ -40,14 +40,14 @@ jobs:
           parse-json-secrets: true
       # Checkout a full clone of the repo
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
         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@d4c94342e560b34958eacfc5d055d21461ed1c5d #v5.0.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #v5.0.1
         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@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
         with:
           ref: releases/next-release
           fetch-depth: 0
       # Install .NET8 which is needed for AutoVer
       - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d #v5.0.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #v5.0.1
         with:
           dotnet-version: 8.0.x
       # Install AutoVer which is needed to retrieve information about the current release.

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Release 2026-01-22
+
+### AWS.Messaging (1.1.0)
+* Added support for pollers that are tied to a single message type. This change also allows processing messages that use the CloudEvents envelope as well as those that do not.
+* Add SentTimestamp to SQSMetadata
+
 ## Release 2025-11-17
 
 ### AWS.Messaging.Lambda (1.0.2)

README.md

@@ -245,6 +245,78 @@ await Host.CreateDefaultBuilder(args)
     .RunAsync();
 ```
 
+### Consuming AWS service events (raw JSON payloads)
+Many AWS services can deliver events to SQS (directly, via SNS, or via EventBridge rules). These payloads are typically *raw JSON* and do not include the framework's CloudEvents envelope.
+
+To consume raw JSON payloads, configure the SQS poller for a *single message type* and disable envelope support via `MessageEnvelopeMode.NotSupported`.
+
+#### Example: Consume S3 event notifications from SQS
+If you configure an S3 bucket to send event notifications directly to an SQS queue (for example, `s3:ObjectCreated:*`), the message body contains an S3 event notification JSON document.
+
+You can model this payload yourself, but you can also reuse the strongly-typed event classes from the AWS Lambda .NET packages.
+
+Add the S3 events package:
+```
+dotnet add package Amazon.Lambda.S3Events
+```
+
+The following example uses `Amazon.Lambda.S3Events.S3Event` and configures JSON deserialization to be case-insensitive (S3 event JSON uses a mix of `Records` and camelCase properties).
+
+```csharp
+using System.Text.Json;
+using AWS.Messaging;
+using AWS.Messaging.Configuration;
+using Amazon.Lambda.S3Events;
+using Microsoft.Extensions.Hosting;
+
+public sealed class S3EventNotificationHandler : IMessageHandler<S3Event>
+{
+    public Task<MessageProcessStatus> HandleAsync(
+        MessageEnvelope<S3Event> messageEnvelope,
+        CancellationToken token = default)
+    {
+        var record = messageEnvelope.Message.Records?.FirstOrDefault();
+        var bucket = record?.S3?.Bucket?.Name;
+        var key = record?.S3?.Object?.Key;
+
+        Console.WriteLine($"S3 event: bucket='{bucket}', key='{key}', eventName='{record?.EventName}'");
+
+        return Task.FromResult(MessageProcessStatus.Success());
+    }
+}
+
+await Host.CreateDefaultBuilder(args)
+    .ConfigureServices(services =>
+    {
+        services.AddAWSMessageBus(builder =>
+        {
+            // The poller is tied to a single message type and expects raw JSON.
+            // This is a good fit for a queue dedicated to a single AWS service event.
+            builder.AddSQSPoller<S3Event>(
+                "https://sqs.us-west-2.amazonaws.com/012345678910/MyAppProd",
+                messageEnvelopeMode: MessageEnvelopeMode.NotSupported);
+
+            // Recommended for AWS service event JSON: be lenient about casing.
+            builder.ConfigureSerializationOptions(options =>
+            {
+                options.SystemTextJsonOptions = new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = true
+                };
+            });
+
+            builder.AddMessageHandler<S3EventNotificationHandler, S3Event>();
+        });
+    })
+    .Build()
+    .RunAsync();
+```
+
+Notes:
+* Without the CloudEvents envelope, the framework cannot type-route messages by a `'type'` discriminator. Use a dedicated queue per message type (or configure multiple pollers).
+* The S3-to-SQS notification format can include additional properties not modeled above; that's fine as long as your handler reads the fields it needs.
+* This same approach works with other AWS Lambda .NET event packages (for example, `Amazon.Lambda.SNSEvents`, etc.) when the SQS message body is raw JSON for that event type.
+
 ### Configuring the SQS Message Poller
 The SQS message poller can be configured by the `SQSMessagePollerOptions` when calling `AddSQSPoller`.
 * `MaxNumberOfConcurrentMessages` - The maximum number of messages from the queue to process concurrently. The default value is `10`.

src/AWS.Messaging/AWS.Messaging.csproj

@@ -18,7 +18,7 @@
     <NoWarn>CS1591</NoWarn>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>1.0.2</Version>
+    <Version>1.1.0</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>