Fix build scripts

Author: gsingh04

.gitignore

@@ -2,6 +2,7 @@
 **/dist
 **/global-s3-assets
 **/regional-s3-assets
+**/staging
 **/open-source
 **/.zip
 **/tmp

buildspec.yml

@@ -6,6 +6,7 @@ phases:
       nodejs: 16
   pre_build:
     commands:
+      - npm install -g npm@9.4.2
       - echo "Installing dependencies and executing unit tests - `pwd`"
       - cd deployment && chmod +x ./run-unit-tests.sh && ./run-unit-tests.sh
       - echo "Installing dependencies and executing unit tests completed `date`"

deployment/build-s3-dist.sh

@@ -34,11 +34,11 @@ headline "[Init] Setting up paths and variables"
 solution_name="$1"
 asset_bucket="$2"
 solution_version="$3"
-template_dir="$PWD"
-staging_dist_dir="$template_dir/staging"
-template_dist_dir="$template_dir/global-s3-assets"
-build_dist_dir="$template_dir/regional-s3-assets"
-source_dir="$template_dir/../source"
+deployment_dir="$PWD"
+staging_dist_dir="$deployment_dir/staging"
+template_dist_dir="$deployment_dir/global-s3-assets"
+build_dist_dir="$deployment_dir/regional-s3-assets"
+source_dir="$deployment_dir/../source"
 cdk_source_dir="$source_dir/constructs"
 
 headline "[Init] Clean old folders"
@@ -52,17 +52,16 @@ mkdir -p "$build_dist_dir"
 headline "[Build] Synthesize cdk template and assets"
 cd "$cdk_source_dir"
 npm run clean:install
-overrideWarningsEnabled=false npx cdk synth --asset-metadata false --path-metadata --output="$staging_dist_dir"
+overrideWarningsEnabled=false npx cdk synth --quiet --asset-metadata false --path-metadata --output="$staging_dist_dir"
 cd "$staging_dist_dir"
 rm tree.json manifest.json cdk.out ./*.assets.json
 cp "$staging_dist_dir"/*.template.json "$template_dist_dir"/
 rm ./*.template.json
 
 headline "[Package] Generate public template"
-# Run the helper to clean-up the templates and remove unnecessary CDK elements
-cd "$template_dir"
-npx ts-node "$template_dir"/cdk-solution-helper/template-builder/index "$template_dist_dir" "$solution_name" "$asset_bucket" "$solution_version"
+cd "$deployment_dir"
+npx ts-node "$deployment_dir"/cdk-solution-helper/template-builder/index "$template_dist_dir" "$solution_name" "$asset_bucket" "$solution_version"
 mv "$template_dist_dir"/*.template.json "$template_dist_dir"/"$solution_name".template
 
 headline "[Package] Generate public assets for lambda and ui"
-npx ts-node "$template_dir"/cdk-solution-helper/asset-package/index "$staging_dist_dir" "$build_dist_dir"
+npx ts-node "$deployment_dir"/cdk-solution-helper/asset-packager/index "$staging_dist_dir" "$build_dist_dir"

deployment/cdk-solution-helper/asset-packager/index.ts

@@ -6,8 +6,12 @@
 import { CDKAssetPackager } from "./asset-packager";
 import path from "path";
 
-export async function handler(cdkAssetFolderPath: string | undefined, outputPath: string | undefined) {
-  if (!cdkAssetFolderPath || !outputPath) throw new Error("undefined input path");
+export async function handler(
+  cdkAssetFolderPath: string | undefined,
+  outputPath: string | undefined
+) {
+  if (!cdkAssetFolderPath || !outputPath)
+    throw new Error("undefined input path");
   const assetPackager = new CDKAssetPackager(cdkAssetFolderPath);
   const assetPaths = await assetPackager.getAssetPaths();
   for (const path of assetPaths) {
@@ -19,8 +23,8 @@ export async function handler(cdkAssetFolderPath: string | undefined, outputPath
 if (require.main === module) {
   // this module was run directly from the command line, getting command line arguments
   // e.g. npx ts-node index.ts cdkAssetPath outputPath
-  const cdkAssetPath = process.argv[3];
-  const outputPath = process.argv[4];
+  const cdkAssetPath = process.argv[2];
+  const outputPath = process.argv[3];
   handler(cdkAssetPath, outputPath)
     .then(() => console.log("all assets packaged"))
     .catch((err) => {

deployment/cdk-solution-helper/template-builder/index.ts

@@ -35,10 +35,13 @@ export async function handler(
 if (require.main === module) {
   // this module was run directly from the command line, getting command line arguments
   // e.g. npx ts-node index.ts templatePath mySolution lambdaAssetBucketName myVersion
-  const templatePath = process.argv[3];
-  const solutionName = process.argv[4];
-  const lambdaBucketName = process.argv[5];
-  const version = process.argv[6];
+  const templatePath = process.argv[2];
+  const solutionName = process.argv[3];
+  const lambdaBucketName = process.argv[4];
+  const version = process.argv[5];
+  console.log(
+    `********here: ${templatePath} ${solutionName} ${lambdaBucketName} ${version}`
+  );
   handler(templatePath, solutionName, lambdaBucketName, version)
     .then(() => console.log("written all cfn templates"))
     .catch((err) => {

deployment/cdk-solution-helper/template-builder/template-builder.ts

@@ -35,14 +35,17 @@ export class TemplateBuilder {
         template.Resources[key].Type === "AWS::Lambda::LayerVersion"
     );
     lambdaResourceKeys.forEach((resourceKey) => {
-      const lambdaFunction = template.Resources[resourceKey];
-      const assetProperty = lambdaFunction.Properties.Code;
+      const lambdaResource = template.Resources[resourceKey];
+      const assetProperty =
+        lambdaResource.Type == "AWS::Lambda::Function"
+          ? lambdaResource.Properties.Code
+          : lambdaResource.Properties.Content;
       const artifactHash = assetProperty.S3Key;
       assetProperty.S3Key = `${this.solutionName}/${this.solutionVersion}/${artifactHash}`;
       assetProperty.S3Bucket = {
         "Fn::Sub": `${this.lambdaAssetBucketName}-\${AWS::Region}`,
       };
-      template.Resources[resourceKey] = lambdaFunction;
+      template.Resources[resourceKey] = lambdaResource;
     });
     return template;
   }

source/image-handler/package.json

@@ -8,7 +8,6 @@
   "main": "index.js",
   "scripts": {
     "clean": "rm -rf node_modules/ dist/ coverage/",
-    "install:SharpForLambda": "rm -rf node_modules/sharp && npm install --arch=x64 --platform=linux sharp",
     "pretest": "npm run clean && npm ci",
     "test": "jest --coverage --silent"
   },

source/package.json

@@ -9,7 +9,7 @@
     "lint": "npx eslint . --ext .ts",
     "prettier-format": "npx prettier --config .prettierrc.yml '**/*.ts' --write",
     "install:custom-resource": "cd ./custom-resource && npm run clean && npm ci",
-    "install:image-handler": "cd ./image-handler && npm run clean && npm ci && npm run install:SharpForLambda",
+    "install:image-handler": "cd ./image-handler && npm run clean && npm ci",
     "install:dependencies": "npm run install:custom-resource && npm run install:image-handler"
   },
   "devDependencies": {