Merge branch 'develop' into dependabot/github_actions/actions/download-artifact-5.0.0

hjgraca · web-flow · commit 331e28bfeacd · 2025-08-26T11:24:03.000+01:00
diff --git a/.github/workflows/dispatch_analytics.yml b/.github/workflows/dispatch_analytics.yml
@@ -31,7 +31,7 @@ jobs:
     environment: analytics
     steps:
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a
         with:
           aws-region: eu-central-1
           role-to-assume: ${{ secrets.AWS_ANALYTICS_ROLE_ARN }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build docs website
         run: make build-docs-website
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}
@@ -69,7 +69,7 @@ jobs:
           docfx apidocs/docfx.json
       
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
           aws-region: us-east-1
@@ -78,7 +78,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
           aws-region: us-east-1
@@ -119,7 +119,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
           aws-region: us-east-1
@@ -151,7 +151,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
           aws-region: us-east-1
@@ -192,7 +192,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
           aws-region: us-east-1
diff --git a/.github/workflows/reusable_publish_docs.yml b/.github/workflows/reusable_publish_docs.yml
@@ -68,7 +68,7 @@ jobs:
           poetry run mike set-default --push latest
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}
@@ -99,7 +99,7 @@ jobs:
           brew install -f docfx --skip-cask-deps --ignore-dependencies
           docfx apidocs/docfx.json
       - name: Configure AWS credentials 
-        uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
+        uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_DOCS_ROLE_ARN }}
diff --git a/libraries/src/AWS.Lambda.Powertools.Logging/Internal/PowertoolsLogger.cs b/libraries/src/AWS.Lambda.Powertools.Logging/Internal/PowertoolsLogger.cs
@@ -396,14 +396,26 @@ private static bool CustomFormatter<TState>(TState state, Exception exception, o
             return false;
 
 #if NET8_0_OR_GREATER
-        var stateKeys = (state as IEnumerable<KeyValuePair<string, object>>)?
-            .ToDictionary(i => i.Key, i => PowertoolsLoggerHelpers.ObjectToDictionary(i.Value));
+        var stateKeys = new Dictionary<string, object>();
+        if (state is IEnumerable<KeyValuePair<string, object>> keyValuePairs)
+        {
+            foreach (var kvp in keyValuePairs)
+            {
+                stateKeys[kvp.Key] = PowertoolsLoggerHelpers.ObjectToDictionary(kvp.Value);
+            }
+        }
 #else
-        var stateKeys = (state as IEnumerable<KeyValuePair<string, object>>)?
-            .ToDictionary(i => i.Key, i => i.Value);
+var stateKeys = new Dictionary<string, object>();
+if (state is IEnumerable<KeyValuePair<string, object>> keyValuePairs)
+{
+    foreach (var kvp in keyValuePairs)
+    {
+        stateKeys[kvp.Key] = kvp.Value;
+    }
+}
 #endif
 
-        if (stateKeys is null || stateKeys.Count != 2)
+        if (stateKeys.Count != 2)
             return false;
 
         if (!stateKeys.TryGetValue(_originalformat, out var originalFormat))
diff --git a/libraries/tests/AWS.Lambda.Powertools.Logging.Tests/PowertoolsLoggerTest.cs b/libraries/tests/AWS.Lambda.Powertools.Logging.Tests/PowertoolsLoggerTest.cs
@@ -1750,6 +1750,48 @@ public void Log_Cold_Start(bool willLog, string awsInitType)
             // Assert
             Assert.Contains($"\"coldStart\":{willLog.ToString().ToLower()}", outPut);
         }
+        
+        [Fact]
+        public void Log_WhenDuplicateKeysInState_LastValueWins()
+        {
+            // Arrange
+            var loggerName = Guid.NewGuid().ToString();
+            var service = Guid.NewGuid().ToString();
+            var logLevel = LogLevel.Information;
+
+            var configurations = Substitute.For<IPowertoolsConfigurations>();
+            configurations.Service.Returns(service);
+            configurations.LogLevel.Returns(logLevel.ToString());
+            configurations.LoggerOutputCase.Returns(LoggerOutputCase.PascalCase.ToString());
+
+            var systemWrapper = Substitute.For<IConsoleWrapper>();
+
+            var loggerConfiguration = new PowertoolsLoggerConfiguration
+            {
+                Service = service,
+                MinimumLogLevel = logLevel,
+                LoggerOutputCase = LoggerOutputCase.PascalCase,
+                LogOutput = systemWrapper
+            };
+
+            var provider = new PowertoolsLoggerProvider(loggerConfiguration, configurations);
+            var logger = provider.CreateLogger(loggerName);
+
+            // Create state with duplicate keys (simulating duplicate HTTP headers)
+            var stateWithDuplicates = new List<KeyValuePair<string, object>>
+            {
+                new("Content-Type", "application/json"),
+                new("Content-Type", "application/x-www-form-urlencoded"), // This should win
+                new("Accept", "text/html"),
+                new("Accept", "*/*") // This should win
+            };
+
+            // Act - This should not throw an exception
+            logger.Log(logLevel, new EventId(), stateWithDuplicates, null, (state, ex) => "Test message");
+
+            // Assert
+            systemWrapper.Received(1).WriteLine(Arg.Any<string>());
+        }
 
         public void Dispose()
         {
