From cc9fce8dadf0f561d3c29b9150544f6147452e3f Mon Sep 17 00:00:00 2001
From: Norm Johanson <normj@amazon.com>
Date: Fri, 25 Apr 2025 11:53:26 -0700
Subject: [PATCH 1/2] Add SSO dependencies to support credential profiles that
 are using SSO

---
 .../4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json  | 11 +++++++++++
 .../Amazon.Lambda.TestTool.csproj              |  6 ++++--
 ...zon.Lambda.TestTool.IntegrationTests.csproj | 18 +++++++++---------
 .../Amazon.Lambda.TestTool.UnitTests.csproj    |  4 ++--
 4 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 .autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json

diff --git a/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json b/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json
new file mode 100644
index 000000000..b582a471f
--- /dev/null
+++ b/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "Amazon.Lambda.TestTool",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Add SSO dependencies to support credential profiles that are using SSO"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
index 030d3731b..4d305cb5f 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
@@ -28,8 +28,10 @@
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400" />
-    <PackageReference Include="AWSSDK.Lambda" Version="3.7.411.17" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.109" />
+    <PackageReference Include="AWSSDK.Lambda" Version="3.7.412.23" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.139" />
+    <PackageReference Include="AWSSDK.SSO" Version="3.7.400.139" />
+    <PackageReference Include="AWSSDK.SSOOIDC" Version="3.7.401.17" />
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
     <PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj
index 92b0900bf..81c88eeea 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj
@@ -11,17 +11,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.5.0" />
-    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.3" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.5.1" />
+    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.13.0" />
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
-    <PackageReference Include="AWSSDK.APIGateway" Version="3.7.401.19" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.401.22" />
-	  <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.403.24" />
-    <PackageReference Include="AWSSDK.ApiGatewayV2" Version="3.7.400.75" />
-    <PackageReference Include="AWSSDK.Lambda" Version="3.7.411.18" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.24" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.110" />
+    <PackageReference Include="AWSSDK.APIGateway" Version="3.7.402.16" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.403.17" />
+	  <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.405.17" />
+    <PackageReference Include="AWSSDK.ApiGatewayV2" Version="3.7.402.16" />
+    <PackageReference Include="AWSSDK.Lambda" Version="3.7.412.23" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.88" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.139" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj
index fd1b0855a..7ee45b7ba 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.3" />
+    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.13.0" />
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-    <PackageReference Include="AWSSDK.Lambda" Version="3.7.411.18" />
+    <PackageReference Include="AWSSDK.Lambda" Version="3.7.412.23" />
     <PackageReference Include="coverlet.collector" Version="6.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 350615ff79e05faac2a1afd6ae4c39775c3631d2 Mon Sep 17 00:00:00 2001
From: Norm Johanson <normj@amazon.com>
Date: Mon, 28 Apr 2025 14:30:42 -0700
Subject: [PATCH 2/2] Update TestTool version of AWS SDK for .NET to V4.

---
 .../4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json      |  3 ++-
 .../Amazon.Lambda.TestTool.csproj                  | 12 ++++++------
 .../src/Amazon.Lambda.TestTool/Program.cs          |  3 +++
 .../Amazon.Lambda.TestTool.IntegrationTests.csproj | 14 +++++++-------
 .../Amazon.Lambda.TestTool.UnitTests.csproj        |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json b/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json
index b582a471f..86da8c575 100644
--- a/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json
+++ b/.autover/changes/4fa617cf-36b8-4ac7-a4e8-18e3aed7e9b2.json
@@ -4,7 +4,8 @@
       "Name": "Amazon.Lambda.TestTool",
       "Type": "Patch",
       "ChangelogMessages": [
-        "Add SSO dependencies to support credential profiles that are using SSO"
+        "Add SSO dependencies to support credential profiles that are using SSO",
+        "Update version of AWS SDK for .NET to V4"
       ]
     }
   ]
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
index 4d305cb5f..6b3fb0f90 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\..\buildtools\common.props" />
   <PropertyGroup>
@@ -27,11 +27,11 @@
 
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400" />
-    <PackageReference Include="AWSSDK.Lambda" Version="3.7.412.23" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.139" />
-    <PackageReference Include="AWSSDK.SSO" Version="3.7.400.139" />
-    <PackageReference Include="AWSSDK.SSOOIDC" Version="3.7.401.17" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SSO" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SSOOIDC" Version="4.0.0" />
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
     <PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs
index 4dd25fbc9..6c27a51e6 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs
@@ -7,6 +7,9 @@
 using Amazon.Lambda.TestTool.Services;
 using Spectre.Console.Cli;
 
+// Till we do the full inspection for collection maintain the S3 behavior for initializing collections.
+Amazon.AWSConfigs.InitializeCollections = true;
+
 var serviceCollection = new ServiceCollection();
 
 serviceCollection.AddCustomServices();
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj
index 81c88eeea..cedf28781 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/Amazon.Lambda.TestTool.IntegrationTests.csproj
@@ -15,13 +15,13 @@
     <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.13.0" />
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
-    <PackageReference Include="AWSSDK.APIGateway" Version="3.7.402.16" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.403.17" />
-	  <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.405.17" />
-    <PackageReference Include="AWSSDK.ApiGatewayV2" Version="3.7.402.16" />
-    <PackageReference Include="AWSSDK.Lambda" Version="3.7.412.23" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.88" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.139" />
+    <PackageReference Include="AWSSDK.APIGateway" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="4.0.0" />
+	  <PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.ApiGatewayV2" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj
index 7ee45b7ba..fd3d5290d 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Amazon.Lambda.TestTool.UnitTests.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.13.0" />
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
-    <PackageReference Include="AWSSDK.Lambda" Version="3.7.412.23" />
+    <PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>