remove requirement that Amazon.Lambda.RuntimeSupport make InternalsVisibileTo Amazon.Lambda.AspNetCorServer.Hosting

Author: ppittle

Libraries/src/Amazon.Lambda.AspNetCoreServer.Hosting/Internal/LambdaSnapstartExecuteRequestsBeforeSnapshotHelper.cs

@@ -8,6 +8,7 @@
 using System.Text.Json.Serialization;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.ApplicationLoadBalancerEvents;
+using Amazon.Lambda.Core;
 using Amazon.Lambda.RuntimeSupport;
 using Amazon.Lambda.RuntimeSupport.Helpers;
 using Microsoft.AspNetCore.WebUtilities;
@@ -87,30 +88,36 @@ internal async Task Execute(HttpClient client)
         }
     }
 
-    private static class SnapstartHelperLambdaRequests
+    private class HelperLambdaContext : ILambdaContext, ICognitoIdentity, IClientContext
     {
-        private static readonly InternalLogger _logger = InternalLogger.GetDefaultLogger();
-
-        private static readonly RuntimeApiHeaders _fakeRuntimeApiHeaders = new(new Dictionary<string, IEnumerable<string>>
-        {
-            { RuntimeApiHeaders.HeaderAwsRequestId, new List<string>() },
-            { RuntimeApiHeaders.HeaderTraceId, new List<string>() },
-            { RuntimeApiHeaders.HeaderClientContext, new List<string>() },
-            { RuntimeApiHeaders.HeaderCognitoIdentity, new List<string>() },
-            { RuntimeApiHeaders.HeaderDeadlineMs, new List<string>() },
-            { RuntimeApiHeaders.HeaderInvokedFunctionArn, new List<string>() },
-        });
+        private LambdaEnvironment _lambdaEnvironment = new ();
+
+        public string TraceId => string.Empty;
+        public string AwsRequestId => string.Empty;
+        public IClientContext ClientContext => this;
+        public string FunctionName => _lambdaEnvironment.FunctionName;
+        public string FunctionVersion => _lambdaEnvironment.FunctionVersion;
+        public ICognitoIdentity Identity => this;
+        public string InvokedFunctionArn => string.Empty;
+        public ILambdaLogger Logger => null;
+        public string LogGroupName => _lambdaEnvironment.LogGroupName;
+        public string LogStreamName => _lambdaEnvironment.LogStreamName;
+        public int MemoryLimitInMB => 128;
+        public TimeSpan RemainingTime => TimeSpan.FromMilliseconds(100);
+        public string IdentityId { get; }
+        public string IdentityPoolId { get; }
+        public IDictionary<string, string> Environment { get; } = new Dictionary<string, string>();
+        public IClientApplication Client { get; }
+        public IDictionary<string, string> Custom { get; } = new Dictionary<string, string>();
+    }
 
+    private static class SnapstartHelperLambdaRequests
+    {
         public static async Task ExecuteSnapstartInitRequests(string jsonRequest, int times, HandlerWrapper handlerWrapper)
         {
-            var dummyRequest = new InvocationRequest
-            {
-                InputStream = new MemoryStream(Encoding.UTF8.GetBytes(jsonRequest)),
-                LambdaContext = new LambdaContext(
-                    _fakeRuntimeApiHeaders,
-                    new LambdaEnvironment(),
-                    new SimpleLoggerWriter())
-            };
+            var dummyRequest = new InvocationRequest(
+                new MemoryStream(Encoding.UTF8.GetBytes(jsonRequest)),
+                new HelperLambdaContext());
 
             for (var i = 0; i < times; i++)
             {
@@ -121,7 +128,6 @@ public static async Task ExecuteSnapstartInitRequests(string jsonRequest, int ti
                 catch (Exception e)
                 {
                     Console.WriteLine("StartAsync: " + e.Message + e.StackTrace);
-                    _logger.LogError(e, "StartAsync: Custom Warmup Failure: " + e.Message + e.StackTrace);
                 }
             }
         }

Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj

@@ -23,12 +23,6 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>Amazon.Lambda.AspNetCoreServer.Hosting, PublicKey="0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
   <PropertyGroup Condition=" '$(ExecutableOutputType)'=='true' ">
     <OutputType>Exe</OutputType>
   </PropertyGroup>

Libraries/src/Amazon.Lambda.RuntimeSupport/Client/InvocationRequest.cs

@@ -35,6 +35,13 @@ public class InvocationRequest : IDisposable
 
         internal InvocationRequest() { }
 
+        /// <inheritdoc cref="InvocationRequest"/>>
+        public InvocationRequest(Stream inputStream, ILambdaContext lambdaContext)
+        {
+            InputStream = inputStream;
+            LambdaContext = lambdaContext;
+        }
+
         public void Dispose()
         {
             InputStream?.Dispose();