Aspire tweaks for test tool

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs

@@ -30,30 +30,44 @@ public override async Task<int> ExecuteAsync(CommandContext context, RunCommandS
         {
             EvaluateEnvironmentVariables(settings);
 
-            var tasks = new List<Task>();
+            if (!settings.LambdaEmulatorPort.HasValue && !settings.ApiGatewayEmulatorPort.HasValue)
+            {
+                throw new ArgumentException("At least one of the following parameters must be set: " +
+                                            "--lambda-emulator-port or --api-gateway-emulator-port");
+            }
 
-            var testToolProcess = TestToolProcess.Startup(settings, cancellationTokenSource.Token);
-            tasks.Add(testToolProcess.RunningTask);
+            var tasks = new List<Task>();
 
-            if (!settings.NoLaunchWindow)
+            if (settings.LambdaEmulatorPort.HasValue)
             {
-                try
+                var testToolProcess = TestToolProcess.Startup(settings, cancellationTokenSource.Token);
+                tasks.Add(testToolProcess.RunningTask);
+
+                if (!settings.NoLaunchWindow)
                 {
-                    var info = new ProcessStartInfo
+                    try
                     {
-                        UseShellExecute = true,
-                        FileName = testToolProcess.ServiceUrl
-                    };
-                    Process.Start(info);
-                }
-                catch (Exception e)
-                {
-                    toolInteractiveService.WriteErrorLine($"Error launching browser: {e.Message}");
+                        var info = new ProcessStartInfo
+                        {
+                            UseShellExecute = true,
+                            FileName = testToolProcess.ServiceUrl
+                        };
+                        Process.Start(info);
+                    }
+                    catch (Exception e)
+                    {
+                        toolInteractiveService.WriteErrorLine($"Error launching browser: {e.Message}");
+                    }
                 }
             }
 
-            if (settings.ApiGatewayEmulatorMode is not null)
+            if (settings.ApiGatewayEmulatorPort.HasValue)
             {
+                if (settings.ApiGatewayEmulatorMode is null)
+                {
+                    throw new ArgumentException("When --api-gateway-emulator-port is set the --api-gateway-mode must be set to configure the mode for the API Gateway emulator.");
+                }
+
                 var apiGatewayEmulatorProcess =
                     ApiGatewayEmulatorProcess.Startup(settings, cancellationTokenSource.Token);
                 tasks.Add(apiGatewayEmulatorProcess.RunningTask);

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/Settings/RunCommandSettings.cs

@@ -1,4 +1,4 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using Amazon.Lambda.TestTool.Models;
@@ -23,12 +23,11 @@ public sealed class RunCommandSettings : CommandSettings
     public string LambdaEmulatorHost { get; set; } = Constants.DefaultLambdaEmulatorHost;
 
     /// <summary>
-    /// The port number used for the test tool's web interface.
+    /// The port number used for the test tool's web interface. If a port is specified the Lambda emulator will be started.
     /// </summary>
     [CommandOption("-p|--lambda-emulator-port <PORT>")]
     [Description("The port number used for the test tool's web interface.")]
-    [DefaultValue(Constants.DefaultLambdaEmulatorPort)]
-    public int LambdaEmulatorPort { get; set; } = Constants.DefaultLambdaEmulatorPort;
+    public int? LambdaEmulatorPort { get; set; }
 
     /// <summary>
     /// Disable auto launching the test tool's web interface in a browser.
@@ -58,17 +57,16 @@ public sealed class RunCommandSettings : CommandSettings
     /// and how API Gateway interprets the response from Lambda.
     /// The available modes are: Rest, HttpV1, HttpV2.
     /// </summary>
-    [CommandOption("--api-gateway-emulator <MODE>")]
+    [CommandOption("--api-gateway-emulator-mode <MODE>")]
     [Description(
         "The API Gateway Emulator Mode specifies the format of the event that API Gateway sends to a Lambda integration, and how API Gateway interprets the response from Lambda. " +
         "The available modes are: Rest, HttpV1, HttpV2.")]
     public ApiGatewayEmulatorMode? ApiGatewayEmulatorMode { get; set; }
 
     /// <summary>
-    /// The port number used for the test tool's API Gateway emulator.
+    /// The port number used for the test tool's API Gateway emulator. If a port is specified the API Gateway emulator will be started. The --api-gateway-mode muse also be set when setting the API Gateway emulator port.
     /// </summary>
     [CommandOption("--api-gateway-emulator-port <PORT>")]
     [Description("The port number used for the test tool's API Gateway emulator.")]
-    [DefaultValue(Constants.DefaultApiGatewayEmulatorPort)]
-    public int? ApiGatewayEmulatorPort { get; set; } = Constants.DefaultApiGatewayEmulatorPort;
+    public int? ApiGatewayEmulatorPort { get; set; }
 }

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor.cs

@@ -8,11 +8,14 @@
 using Amazon.Lambda.TestTool.Services.IO;
 using BlazorMonaco.Editor;
 using Microsoft.JSInterop;
+using Microsoft.AspNetCore.WebUtilities;
 
 namespace Amazon.Lambda.TestTool.Components.Pages;
 
 public partial class Home : ComponentBase, IDisposable
 {
+    [Inject] public required NavigationManager NavManager { get; set; }
+    [Inject] public required ILogger<Home> Logger { get; set; }
     [Inject] public required IHttpContextAccessor HttpContextAccessor { get; set; }
     [Inject] public required IRuntimeApiDataStoreManager DataStoreManager { get; set; }
     [Inject] public required IDirectoryManager DirectoryManager { get; set; }
@@ -87,10 +90,38 @@ public partial class Home : ComponentBase, IDisposable
 
     protected override void OnInitialized()
     {
-        DataStore = DataStoreManager.GetLambdaRuntimeDataStore(LambdaRuntimeApi.DefaultFunctionName);
+        var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
+        string initialFunction = string.Empty;
+        if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("function", out var queryValue))
+        {
+            initialFunction = queryValue.ToString();
+        }
+
+        Logger.LogDebug("Query string variable for initial Lambda function set to: {initialFunction}", initialFunction);
+
         _availableLambdaFunctions = DataStoreManager.GetListOfFunctionNames().ToList();
         if (_availableLambdaFunctions.Count > 0)
-            SelectedFunctionName = _availableLambdaFunctions.First();
+        {
+            if (!string.IsNullOrEmpty(initialFunction) && _availableLambdaFunctions.Contains(initialFunction))
+            {
+                Logger.LogDebug("Query string function found in the list of available functions");
+                SelectedFunctionName = initialFunction;
+            }
+            else
+            {
+                Logger.LogDebug("Query string function not found in the list of available functions");
+                SelectedFunctionName = _availableLambdaFunctions.First();
+            }
+
+            DataStore = DataStoreManager.GetLambdaRuntimeDataStore(SelectedFunctionName);
+        }
+        else
+        {
+            Logger.LogDebug("No functions currently registered with the test tool so default to the default function datastore");
+            DataStore = DataStoreManager.GetLambdaRuntimeDataStore(LambdaRuntimeApi.DefaultFunctionName);
+        }
+
+
         ThemeService.OnThemeChanged += HandleThemeChanged;
         DataStoreManager.StateChange += DataStoreManagerOnStateChange;
         SampleRequestManager = new SampleRequestManager(DirectoryManager.GetCurrentDirectory());

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs

@@ -15,16 +15,6 @@ public abstract class Constants
     /// </summary>
     public const string ToolName = "dotnet-lambda-test-tool";
 
-    /// <summary>
-    /// The default port used by the Lambda Test Tool for the Lambda Runtime API and the Web Interface.
-    /// </summary>
-    public const int DefaultLambdaEmulatorPort = 5050;
-
-    /// <summary>
-    /// The default port used by the API Gateway Emulator.
-    /// </summary>
-    public const int DefaultApiGatewayEmulatorPort = 5051;
-
     /// <summary>
     /// The default hostname used for the Lambda Test Tool.
     /// </summary>

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/ApiGatewayEmulatorProcessTests.cs

@@ -245,7 +245,7 @@ private void StartTestToolProcess(ApiGatewayEmulatorMode apiGatewayMode, TestCon
             ""HttpMethod"": ""{config.HttpMethod}"",
             ""Path"": ""/{config.RouteName}""
         }}");
-        cancellationTokenSource.CancelAfter(5000);
+        cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(60));
         var settings = new RunCommandSettings { LambdaEmulatorPort = lambdaPort, NoLaunchWindow = true, ApiGatewayEmulatorMode = apiGatewayMode,ApiGatewayEmulatorPort = apiGatewayPort};
         var command = new RunCommand(_mockInteractiveService.Object, _mockEnvironmentManager.Object);
         var context = new CommandContext(new List<string>(), _mockRemainingArgs.Object, "run", null);

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/RunCommandTests.cs

@@ -50,7 +50,7 @@ public async Task ExecuteAsync_ApiGatewayEmulator_SuccessfulLaunch()
         Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
         var cancellationSource = new CancellationTokenSource();
         cancellationSource.CancelAfter(5000);
-        var settings = new RunCommandSettings { LambdaEmulatorPort = 9002,  ApiGatewayEmulatorMode = ApiGatewayEmulatorMode.HttpV2, NoLaunchWindow = true};
+        var settings = new RunCommandSettings { LambdaEmulatorPort = 9002, ApiGatewayEmulatorPort = 9003, ApiGatewayEmulatorMode = ApiGatewayEmulatorMode.HttpV2, NoLaunchWindow = true};
         var command = new RunCommand(_mockInteractiveService.Object, _mockEnvironmentManager.Object);
         var context = new CommandContext(new List<string>(), _mockRemainingArgs.Object, "run", null);
         var apiUrl = $"http://{settings.LambdaEmulatorHost}:{settings.ApiGatewayEmulatorPort}/__lambda_test_tool_apigateway_health__";

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/Settings/RunCommandSettingsTests.cs

@@ -1,4 +1,4 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using Amazon.Lambda.TestTool.Commands.Settings;
@@ -18,26 +18,6 @@ public void DefaultHost_IsSetToConstantsDefaultHost()
         Assert.Equal(Constants.DefaultLambdaEmulatorHost, settings.LambdaEmulatorHost);
     }
 
-    [Fact]
-    public void DefaultPort_IsSetToConstantsDefaultPort()
-    {
-        // Arrange
-        var settings = new RunCommandSettings();
-
-        // Assert
-        Assert.Equal(Constants.DefaultLambdaEmulatorPort, settings.LambdaEmulatorPort);
-    }
-
-    [Fact]
-    public void ApiGatewayEmulatorPort_IsSetToConstantsDefaultApiGatewayEmulatorPort()
-    {
-        // Arrange
-        var settings = new RunCommandSettings();
-
-        // Assert
-        Assert.Equal(Constants.DefaultApiGatewayEmulatorPort, settings.ApiGatewayEmulatorPort);
-    }
-
     [Fact]
     public void NoLaunchWindow_DefaultsToFalse()
     {