commit 8

philasmar · philasmar · commit f850dce08247 · 2026-04-08T12:40:02.000-04:00
diff --git a/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/TestToolStartup.cs b/Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/TestToolStartup.cs
@@ -10,7 +10,6 @@ namespace Amazon.Lambda.TestTool
 {
     public class TestToolStartup
     {
-        private static bool shouldDisableLogs;
 
         public class RunConfiguration
         {
@@ -37,7 +36,7 @@ public static void Startup(string productName, Action<LocalLambdaOptions, bool>
             try
             {
                 var commandOptions = CommandLineOptions.Parse(args);
-                shouldDisableLogs = Utils.ShouldDisableLogs(commandOptions);
+                var shouldDisableLogs = Utils.ShouldDisableLogs(commandOptions);
 
                 if (!shouldDisableLogs) Utils.PrintToolTitle(productName);
 
@@ -76,7 +75,7 @@ public static void Startup(string productName, Action<LocalLambdaOptions, bool>
 
                 if (commandOptions.NoUI)
                 {
-                    ExecuteWithNoUi(localLambdaOptions, commandOptions, lambdaAssemblyDirectory, runConfiguration);
+                    ExecuteWithNoUi(localLambdaOptions, commandOptions, lambdaAssemblyDirectory, runConfiguration, shouldDisableLogs);
                 }
                 else
                 {
@@ -118,16 +117,16 @@ public static void Startup(string productName, Action<LocalLambdaOptions, bool>
         }
 
 
-        public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, RunConfiguration runConfiguration)
+        public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)
         {
             if (!shouldDisableLogs) runConfiguration.OutputWriter.WriteLine("Executing Lambda function without web interface");
             var lambdaProjectDirectory = Utils.FindLambdaProjectDirectory(lambdaAssemblyDirectory);
 
-            string configFile = DetermineConfigFile(commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory);
-            LambdaConfigInfo configInfo = LoadLambdaConfigInfo(configFile, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration);
-            LambdaFunction lambdaFunction = LoadLambdaFunction(configInfo, localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration);
+            string configFile = DetermineConfigFile(commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, shouldDisableLogs: shouldDisableLogs);
+            LambdaConfigInfo configInfo = LoadLambdaConfigInfo(configFile, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration, shouldDisableLogs: shouldDisableLogs);
+            LambdaFunction lambdaFunction = LoadLambdaFunction(configInfo, localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration, shouldDisableLogs: shouldDisableLogs);
 
-            string payload = DeterminePayload(localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration);
+            string payload = DeterminePayload(localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration, shouldDisableLogs: shouldDisableLogs);
 
             var awsProfile = commandOptions.AWSProfile ?? configInfo.AWSProfile;
             if (!string.IsNullOrEmpty(awsProfile))
@@ -166,7 +165,7 @@ public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, Comman
                 Function = lambdaFunction
             };
 
-            ExecuteRequest(request, localLambdaOptions, runConfiguration);
+            ExecuteRequest(request, localLambdaOptions, runConfiguration, shouldDisableLogs);
 
 
             if (runConfiguration.Mode == RunConfiguration.RunMode.Normal && commandOptions.PauseExit)
@@ -176,7 +175,7 @@ public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, Comman
             }
         }
 
-        private static string DetermineConfigFile(CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory)
+        private static string DetermineConfigFile(CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, bool shouldDisableLogs)
         {
             string configFile = null;
             if (string.IsNullOrEmpty(commandOptions.ConfigFile))
@@ -199,7 +198,7 @@ private static string DetermineConfigFile(CommandLineOptions commandOptions, str
             return configFile;
         }
 
-        private static LambdaConfigInfo LoadLambdaConfigInfo(string configFile, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration)
+        private static LambdaConfigInfo LoadLambdaConfigInfo(string configFile, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)
         {
             LambdaConfigInfo configInfo;
             if (configFile != null)
@@ -226,7 +225,7 @@ private static LambdaConfigInfo LoadLambdaConfigInfo(string configFile, CommandL
             return configInfo;
         }
 
-        private static LambdaFunction LoadLambdaFunction(LambdaConfigInfo configInfo, LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration)
+        private static LambdaFunction LoadLambdaFunction(LambdaConfigInfo configInfo, LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)
         {
             // If no function handler was explicitly set and there is only one function defined in the config file then assume the user wants to debug that function.
             var functionHandler = commandOptions.FunctionHandler;
@@ -264,7 +263,7 @@ private static LambdaFunction LoadLambdaFunction(LambdaConfigInfo configInfo, Lo
             return lambdaFunction;
         }
 
-        private static string DeterminePayload(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration)
+        private static string DeterminePayload(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)
         {
             var payload = commandOptions.Payload;
 
@@ -346,7 +345,7 @@ private static string DeterminePayload(LocalLambdaOptions localLambdaOptions, Co
             return payload;
         }
 
-        private static void ExecuteRequest(ExecutionRequest request, LocalLambdaOptions localLambdaOptions, RunConfiguration runConfiguration)
+        private static void ExecuteRequest(ExecutionRequest request, LocalLambdaOptions localLambdaOptions, RunConfiguration runConfiguration, bool shouldDisableLogs)
         {
             try
             {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace Amazon.Lambda.TestTool`
`10`	`10`	`{`
`11`	`11`	`public class TestToolStartup`
`12`	`12`	`{`
`13`		`- private static bool shouldDisableLogs;`
`14`	`13`
`15`	`14`	`public class RunConfiguration`
`16`	`15`	`{`
`@@ -37,7 +36,7 @@ public static void Startup(string productName, Action<LocalLambdaOptions, bool>`
`37`	`36`	`try`
`38`	`37`	`{`
`39`	`38`	`var commandOptions = CommandLineOptions.Parse(args);`
`40`		`- shouldDisableLogs = Utils.ShouldDisableLogs(commandOptions);`
	`39`	`+ var shouldDisableLogs = Utils.ShouldDisableLogs(commandOptions);`
`41`	`40`
`42`	`41`	`if (!shouldDisableLogs) Utils.PrintToolTitle(productName);`
`43`	`42`
`@@ -76,7 +75,7 @@ public static void Startup(string productName, Action<LocalLambdaOptions, bool>`
`76`	`75`
`77`	`76`	`if (commandOptions.NoUI)`
`78`	`77`	`{`
`79`		`- ExecuteWithNoUi(localLambdaOptions, commandOptions, lambdaAssemblyDirectory, runConfiguration);`
	`78`	`+ ExecuteWithNoUi(localLambdaOptions, commandOptions, lambdaAssemblyDirectory, runConfiguration, shouldDisableLogs);`
`80`	`79`	`}`
`81`	`80`	`else`
`82`	`81`	`{`
`@@ -118,16 +117,16 @@ public static void Startup(string productName, Action<LocalLambdaOptions, bool>`
`118`	`117`	`}`
`119`	`118`
`120`	`119`
`121`		`- public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, RunConfiguration runConfiguration)`
	`120`	`+ public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)`
`122`	`121`	`{`
`123`	`122`	`if (!shouldDisableLogs) runConfiguration.OutputWriter.WriteLine("Executing Lambda function without web interface");`
`124`	`123`	`var lambdaProjectDirectory = Utils.FindLambdaProjectDirectory(lambdaAssemblyDirectory);`
`125`	`124`
`126`		`- string configFile = DetermineConfigFile(commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory);`
`127`		`- LambdaConfigInfo configInfo = LoadLambdaConfigInfo(configFile, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration);`
`128`		`- LambdaFunction lambdaFunction = LoadLambdaFunction(configInfo, localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration);`
	`125`	`+ string configFile = DetermineConfigFile(commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, shouldDisableLogs: shouldDisableLogs);`
	`126`	`+ LambdaConfigInfo configInfo = LoadLambdaConfigInfo(configFile, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration, shouldDisableLogs: shouldDisableLogs);`
	`127`	`+ LambdaFunction lambdaFunction = LoadLambdaFunction(configInfo, localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration, shouldDisableLogs: shouldDisableLogs);`
`129`	`128`
`130`		`- string payload = DeterminePayload(localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration);`
	`129`	`+ string payload = DeterminePayload(localLambdaOptions, commandOptions, lambdaAssemblyDirectory: lambdaAssemblyDirectory, lambdaProjectDirectory: lambdaProjectDirectory, runConfiguration, shouldDisableLogs: shouldDisableLogs);`
`131`	`130`
`132`	`131`	`var awsProfile = commandOptions.AWSProfile ?? configInfo.AWSProfile;`
`133`	`132`	`if (!string.IsNullOrEmpty(awsProfile))`
`@@ -166,7 +165,7 @@ public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, Comman`
`166`	`165`	`Function = lambdaFunction`
`167`	`166`	`};`
`168`	`167`
`169`		`- ExecuteRequest(request, localLambdaOptions, runConfiguration);`
	`168`	`+ ExecuteRequest(request, localLambdaOptions, runConfiguration, shouldDisableLogs);`
`170`	`169`
`171`	`170`
`172`	`171`	`if (runConfiguration.Mode == RunConfiguration.RunMode.Normal && commandOptions.PauseExit)`
`@@ -176,7 +175,7 @@ public static void ExecuteWithNoUi(LocalLambdaOptions localLambdaOptions, Comman`
`176`	`175`	`}`
`177`	`176`	`}`
`178`	`177`
`179`		`- private static string DetermineConfigFile(CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory)`
	`178`	`+ private static string DetermineConfigFile(CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, bool shouldDisableLogs)`
`180`	`179`	`{`
`181`	`180`	`string configFile = null;`
`182`	`181`	`if (string.IsNullOrEmpty(commandOptions.ConfigFile))`
`@@ -199,7 +198,7 @@ private static string DetermineConfigFile(CommandLineOptions commandOptions, str`
`199`	`198`	`return configFile;`
`200`	`199`	`}`
`201`	`200`
`202`		`- private static LambdaConfigInfo LoadLambdaConfigInfo(string configFile, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration)`
	`201`	`+ private static LambdaConfigInfo LoadLambdaConfigInfo(string configFile, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)`
`203`	`202`	`{`
`204`	`203`	`LambdaConfigInfo configInfo;`
`205`	`204`	`if (configFile != null)`
`@@ -226,7 +225,7 @@ private static LambdaConfigInfo LoadLambdaConfigInfo(string configFile, CommandL`
`226`	`225`	`return configInfo;`
`227`	`226`	`}`
`228`	`227`
`229`		`- private static LambdaFunction LoadLambdaFunction(LambdaConfigInfo configInfo, LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration)`
	`228`	`+ private static LambdaFunction LoadLambdaFunction(LambdaConfigInfo configInfo, LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)`
`230`	`229`	`{`
`231`	`230`	`// If no function handler was explicitly set and there is only one function defined in the config file then assume the user wants to debug that function.`
`232`	`231`	`var functionHandler = commandOptions.FunctionHandler;`
`@@ -264,7 +263,7 @@ private static LambdaFunction LoadLambdaFunction(LambdaConfigInfo configInfo, Lo`
`264`	`263`	`return lambdaFunction;`
`265`	`264`	`}`
`266`	`265`
`267`		`- private static string DeterminePayload(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration)`
	`266`	`+ private static string DeterminePayload(LocalLambdaOptions localLambdaOptions, CommandLineOptions commandOptions, string lambdaAssemblyDirectory, string lambdaProjectDirectory, RunConfiguration runConfiguration, bool shouldDisableLogs)`
`268`	`267`	`{`
`269`	`268`	`var payload = commandOptions.Payload;`
`270`	`269`
`@@ -346,7 +345,7 @@ private static string DeterminePayload(LocalLambdaOptions localLambdaOptions, Co`
`346`	`345`	`return payload;`
`347`	`346`	`}`
`348`	`347`
`349`		`- private static void ExecuteRequest(ExecutionRequest request, LocalLambdaOptions localLambdaOptions, RunConfiguration runConfiguration)`
	`348`	`+ private static void ExecuteRequest(ExecutionRequest request, LocalLambdaOptions localLambdaOptions, RunConfiguration runConfiguration, bool shouldDisableLogs)`
`350`	`349`	`{`
`351`	`350`	`try`
`352`	`351`	`{`