Update Lambda Tools to pass in lambda runtime package store manifest into the dotnet publish command.

Author: normj

Libraries/src/Amazon.Lambda.Tools/Constants.cs

@@ -11,6 +11,8 @@ internal enum TemplateFormat { Json, Yaml }
 
     public static class Constants
     {
+        public const string ENV_DOTNET_LAMBDA_CLI_LOCAL_MANIFEST_OVERRIDE = "DOTNET_LAMBDA_CLI_LOCAL_MANIFEST_OVERRIDE";
+
         public const string IAM_ARN_PREFIX = "arn:aws:iam::";
         public const string AWS_MANAGED_POLICY_ARN_PREFIX = "arn:aws:iam::aws:policy";
 

Libraries/src/Amazon.Lambda.Tools/DotNetCLIWrapper.cs

@@ -31,7 +31,7 @@ public DotNetCLIWrapper(IToolLogger logger, string workingDirectory)
         /// <param name="outputLocation"></param>
         /// <param name="targetFramework"></param>
         /// <param name="configuration"></param>
-        public int Publish(LambdaToolsDefaults defaults, string projectLocation, string outputLocation, string targetFramework, string configuration)
+        public int Publish(LambdaToolsDefaults defaults, string projectLocation, string outputLocation, string targetFramework, string configuration, string deploymentTargetPackageStoreManifestContent)
         {
             if (Directory.Exists(outputLocation))
             {
@@ -80,6 +80,7 @@ public int Publish(LambdaToolsDefaults defaults, string projectLocation, string
                 arguments.Append($" --framework \"{targetFramework}\"");
             }
 
+            string manifestPath = null;
             if (!string.Equals("netcoreapp1.0", targetFramework, StringComparison.OrdinalIgnoreCase))
             {
                 arguments.Append(" /p:GenerateRuntimeConfigurationFiles=true");
@@ -90,6 +91,16 @@ public int Publish(LambdaToolsDefaults defaults, string projectLocation, string
                 {
                     arguments.Append(" -r linux-x64 --self-contained false /p:PreserveCompilationContext=false");
                 }
+
+                // If we have a manifest of packages already deploy in target deployment environment then write it to disk and add the 
+                // command line switch
+                if(!string.IsNullOrEmpty(deploymentTargetPackageStoreManifestContent))
+                {
+                    manifestPath = Path.GetTempFileName();
+                    File.WriteAllText(manifestPath, deploymentTargetPackageStoreManifestContent);
+
+                    arguments.Append($" --manifest \"{manifestPath}\"");
+                }
             }
 
             var psi = new ProcessStartInfo
@@ -129,6 +140,12 @@ public int Publish(LambdaToolsDefaults defaults, string projectLocation, string
                 exitCode = proc.ExitCode;
             }
 
+            // If we wrote a temporary manifest file then clean it up after dotnet publish has executed.
+            if(manifestPath != null && File.Exists(manifestPath))
+            {
+                File.Delete(manifestPath);
+            }
+
             if (exitCode == 0)
             {
                 ProcessAdditionalFiles(defaults, Utilities.DetermineProjectLocation(this._workingDirectory, projectLocation), outputLocation);

Libraries/src/Amazon.Lambda.Tools/LambdaPackager.cs

@@ -46,14 +46,17 @@ public static bool CreateApplicationBundle(LambdaToolsDefaults defaults, IToolLo
             string projectLocation, string configuration, string targetFramework, bool disableVersionCheck,
             out string publishLocation, ref string zipArchivePath)
         {
-
-            Utilities.ValidateMicrosoftAspNetCoreAllReference(logger, Utilities.DetermineProjectLocation(workingDirectory, projectLocation));
+            string lambdaRuntimePackageStoreManifestContent = null;
+            if (!disableVersionCheck)
+            {
+                Utilities.ValidateMicrosoftAspNetCoreAllReference(logger, Utilities.DetermineProjectLocation(workingDirectory, projectLocation), out lambdaRuntimePackageStoreManifestContent);
+            }
 
             var cli = new DotNetCLIWrapper(logger, workingDirectory);
 
             publishLocation = Utilities.DeterminePublishLocation(workingDirectory, projectLocation, configuration, targetFramework);
             logger?.WriteLine("Executing publish command");
-            if (cli.Publish(defaults, projectLocation, publishLocation, targetFramework, configuration) != 0)
+            if (cli.Publish(defaults, projectLocation, publishLocation, targetFramework, configuration, lambdaRuntimePackageStoreManifestContent) != 0)
                 return false;
 
             var buildLocation = Utilities.DetermineBuildLocation(workingDirectory, projectLocation, configuration, targetFramework);

Libraries/src/Amazon.Lambda.Tools/Utilities.cs

@@ -231,9 +231,32 @@ public static string DeterminePublishLocation(string workingDirectory, string pr
             return path;
         }
 
-        public static void ValidateMicrosoftAspNetCoreAllReference(IToolLogger logger, string csprofPath)
+        public static void ValidateMicrosoftAspNetCoreAllReference(IToolLogger logger, string csprofPath, out string manifestContent)
         {
-            if(Directory.Exists(csprofPath))
+            if(!string.IsNullOrEmpty(Environment.GetEnvironmentVariable(Constants.ENV_DOTNET_LAMBDA_CLI_LOCAL_MANIFEST_OVERRIDE)))
+            {
+                var filePath = Environment.GetEnvironmentVariable(Constants.ENV_DOTNET_LAMBDA_CLI_LOCAL_MANIFEST_OVERRIDE);
+                if(File.Exists(filePath))
+                {
+                    logger?.WriteLine($"Using local manifest override: {filePath}");
+                    manifestContent = File.ReadAllText(filePath);
+                }
+                else
+                {
+                    logger?.WriteLine("Using local manifest override");
+                    manifestContent = null;
+                }
+            }
+            else
+            {
+                manifestContent = ToolkitConfigFileFetcher.Instance.GetFileContentAsync(logger, "LambdaPackageStoreManifest.xml").Result;
+            }
+            if (string.IsNullOrEmpty(manifestContent))
+            {
+                return;
+            }
+
+            if (Directory.Exists(csprofPath))
             {
                 var projectFiles = Directory.GetFiles(csprofPath, "*.csproj", SearchOption.TopDirectoryOnly);
                 if(projectFiles.Length != 1)
@@ -251,15 +274,8 @@ public static void ValidateMicrosoftAspNetCoreAllReference(IToolLogger logger, s
 
             var projectContent = File.ReadAllText(csprofPath);
 
-            var manifestContent = ToolkitConfigFileFetcher.Instance.GetFileContentAsync(logger, "LambdaPackageStoreManifest.xml").Result;
-            if (!string.IsNullOrEmpty(manifestContent))
-            {
-                ValidateMicrosoftAspNetCoreAllReference(logger, manifestContent, projectContent);
-            }
-            else
-            {
-                logger.WriteLine("Skipping Microsoft.AspNetCore.All validation because error while downloading Lambda runtime store manifest.");
-            }
+            
+            ValidateMicrosoftAspNetCoreAllReference(logger, manifestContent, projectContent);
         }
 
         /// <summary>
@@ -326,11 +342,11 @@ public static void ValidateMicrosoftAspNetCoreAllReference(IToolLogger logger, s
                     }
                 }
 
-                throw new LambdaToolsException($"Project is referencing version {projectAspNetCoreVersion} of {ASPNET_CORE_ALL} which is newer " + 
-                    $"than {latestLambdaDeployedVersion}, the latest version available in the Lambda Runtime environment. Please update your project to " + 
+                throw new LambdaToolsException($"Project is referencing version {projectAspNetCoreVersion} of {ASPNET_CORE_ALL} which is newer " +
+                    $"than {latestLambdaDeployedVersion}, the latest version available in the Lambda Runtime environment. Please update your project to " +
                     $"use version {latestLambdaDeployedVersion} and then redeploy your Lambda function.", LambdaToolsException.ErrorCode.AspNetCoreAllValidation);
             }
-            catch(LambdaToolsException)
+            catch (LambdaToolsException)
             {
                 throw;
             }