Merge pull request #297 from aws/gcbeatty/11

GarrettBeatty · web-flow · commit e03ccc2b6382 · 2025-03-28T10:36:52.000-04:00
Update AWS SDK to Preview 11
diff --git a/.autover/changes/263a5c38-9f7f-404d-a79c-33337a095a82.json b/.autover/changes/263a5c38-9f7f-404d-a79c-33337a095a82.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "AWS.Logger.Core",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Update AWS SDK to Preview 11"
+      ]
+    }
+  ]
+}
diff --git a/samples/AspNetCore/ConsoleSample/ConsoleSample.csproj b/samples/AspNetCore/ConsoleSample/ConsoleSample.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AWSSDK.Core" Version="4.0.0-preview.11" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/samples/Log4net/BasicAWSCredentialsConfigurationExample/BasicAWSCredentialsConfigurationExample.csproj b/samples/Log4net/BasicAWSCredentialsConfigurationExample/BasicAWSCredentialsConfigurationExample.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.Core" Version="4.0.0-preview.11" />
     <PackageReference Include="log4net" Version="2.0.15" />
   </ItemGroup>
 
diff --git a/src/AWS.Logger.Core/AWS.Logger.Core.csproj b/src/AWS.Logger.Core/AWS.Logger.Core.csproj
@@ -41,7 +41,7 @@
     </ItemGroup>
     
     <ItemGroup>
-        <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0-preview.8" />
+        <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0-preview.11" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 
diff --git a/src/AWS.Logger.Core/Core/AWSLoggerCore.cs b/src/AWS.Logger.Core/Core/AWSLoggerCore.cs
@@ -11,6 +11,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Amazon.Runtime.Credentials;
 
 namespace AWS.Logger.Core
 {
@@ -155,7 +156,7 @@ private static AWSCredentials DetermineCredentials(AWSLoggerConfig config)
                 if (credentials != null)
                     return credentials;
             }
-            return FallbackCredentialsFactory.GetCredentials();
+            return DefaultAWSCredentialsIdentityResolver.GetCredentials();
         }
 
         private static AWSCredentials LookupCredentialsFromProfileStore(AWSLoggerConfig config)
diff --git a/test/AWS.Logger.AspNetCore.Tests/AWS.Logger.AspNetCore.Tests.csproj b/test/AWS.Logger.AspNetCore.Tests/AWS.Logger.AspNetCore.Tests.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 
 </Project>
diff --git a/test/AWS.Logger.Log4Net.FilterTests/AWS.Logger.Log4Net.FilterTests.csproj b/test/AWS.Logger.Log4Net.FilterTests/AWS.Logger.Log4Net.FilterTests.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 	
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
diff --git a/test/AWS.Logger.Log4Net.Tests/AWS.Logger.Log4Net.Tests.csproj b/test/AWS.Logger.Log4Net.Tests/AWS.Logger.Log4Net.Tests.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
diff --git a/test/AWS.Logger.NLog.FilterTests/AWS.Logger.NLog.FilterTests.csproj b/test/AWS.Logger.NLog.FilterTests/AWS.Logger.NLog.FilterTests.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 
 </Project>
diff --git a/test/AWS.Logger.NLog.Tests/AWS.Logger.NLog.Tests.csproj b/test/AWS.Logger.NLog.Tests/AWS.Logger.NLog.Tests.csproj
@@ -41,7 +41,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 
 </Project>
diff --git a/test/AWS.Logger.SeriLog.Tests/AWS.Logger.SeriLog.Tests.csproj b/test/AWS.Logger.SeriLog.Tests/AWS.Logger.SeriLog.Tests.csproj
@@ -46,7 +46,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 
 </Project>
diff --git a/test/AWS.Logger.TestUtils/AWS.Logger.TestUtils.csproj b/test/AWS.Logger.TestUtils/AWS.Logger.TestUtils.csproj
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0-preview.11" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
  
 </Project>
diff --git a/test/AWS.Logger.UnitTests/AWS.Logger.UnitTests.csproj b/test/AWS.Logger.UnitTests/AWS.Logger.UnitTests.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
     <!-- This needs to be referenced to allow testing via AssumeRole credentials -->
-    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using System.Text;`
`12`	`12`	`using System.Threading;`
`13`	`13`	`using System.Threading.Tasks;`
	`14`	`+using Amazon.Runtime.Credentials;`
`14`	`15`
`15`	`16`	`namespace AWS.Logger.Core`
`16`	`17`	`{`
`@@ -155,7 +156,7 @@ private static AWSCredentials DetermineCredentials(AWSLoggerConfig config)`
`155`	`156`	`if (credentials != null)`
`156`	`157`	`return credentials;`
`157`	`158`	`}`
`158`		`- return FallbackCredentialsFactory.GetCredentials();`
	`159`	`+ return DefaultAWSCredentialsIdentityResolver.GetCredentials();`
`159`	`160`	`}`
`160`	`161`
`161`	`162`	`private static AWSCredentials LookupCredentialsFromProfileStore(AWSLoggerConfig config)`