@pwrdrvr/microapps-publish 0.0.16 → 0.0.20

package/src/DeployClient.ts

@@ -1,17 +1,25 @@
 import * as lambda from '@aws-sdk/client-lambda';
-
-// eslint-disable-next-line import/no-extraneous-dependencies,import/no-unresolved
+import { TaskWrapper } from 'listr2/dist/lib/task-wrapper';
+import { DefaultRenderer } from 'listr2/dist/renderer/default.renderer';
 import {
   IDeployVersionPreflightRequest,
   IDeployVersionPreflightResponse,
   ICreateApplicationRequest,
   IDeployerResponse,
   IDeployVersionRequest,
-} from '@pwrdrvr/microapps-deployer';
+} from '@pwrdrvr/microapps-deployer-lib';
 import { IConfig } from './config/Config';
+import { IContext } from './index';
+
+export interface IDeployVersionPreflightResult {
+  exists: boolean;
+  response: IDeployVersionPreflightResponse;
+}
 
 export default class DeployClient {
-  static readonly _client = new lambda.LambdaClient({});
+  static readonly _client = new lambda.LambdaClient({
+    maxAttempts: 8,
+  });
   static readonly _decoder = new TextDecoder('utf-8');
 
   public static async CreateApp(config: IConfig): Promise<void> {
@@ -41,7 +49,8 @@ export default class DeployClient {
 
   public static async DeployVersionPreflight(
     config: IConfig,
-  ): Promise<{ exists: boolean; response: IDeployVersionPreflightResponse }> {
+    task: TaskWrapper<IContext, typeof DefaultRenderer>,
+  ): Promise<IDeployVersionPreflightResult> {
     const request = {
       type: 'deployVersionPreflight',
       appName: config.app.name,
@@ -59,7 +68,7 @@ export default class DeployClient {
         Buffer.from(response.Payload).toString('utf-8'),
       ) as IDeployVersionPreflightResponse;
       if (dResponse.statusCode === 404) {
-        console.log(`App/Version do not exist: ${config.app.name}/${config.app.semVer}`);
+        task.output = `App/Version do not exist: ${config.app.name}/${config.app.semVer}`;
         return { exists: false, response: dResponse };
       } else {
         return { exists: true, response: dResponse };
@@ -69,7 +78,18 @@ export default class DeployClient {
     }
   }
 
-  public static async DeployVersion(config: IConfig): Promise<void> {
+  /**
+   * Copy S3 static assets from staging to live bucket.
+   * Create API Gateway Integration for app (if needed).
+   * Give API Gateway permission to call the Lambda.
+   * Create API Gateway routes for this specific version.
+   * @param config
+   * @param task
+   */
+  public static async DeployVersion(
+    config: IConfig,
+    task: TaskWrapper<IContext, typeof DefaultRenderer>,
+  ): Promise<void> {
     const request = {
       type: 'deployVersion',
       appName: config.app.name,
@@ -89,9 +109,10 @@ export default class DeployClient {
         Buffer.from(response.Payload).toString('utf-8'),
       ) as IDeployerResponse;
       if (dResponse.statusCode === 201) {
-        console.log(`Deploy succeeded: ${config.app.name}/${config.app.semVer}`);
+        task.output = `Deploy succeeded: ${config.app.name}/${config.app.semVer}`;
       } else {
-        console.log(`Deploy failed with: ${dResponse.statusCode}`);
+        task.output = `Deploy failed with: ${dResponse.statusCode}`;
+        throw new Error(`Lambda call to DeployVersionfailed with: ${dResponse.statusCode}`);
       }
     } else {
       throw new Error(`Lambda call to DeployVersion failed: ${JSON.stringify(response)}`);

package/src/S3TransferUtility.ts

@@ -6,12 +6,19 @@ import { promises as fs, createReadStream } from 'fs';
 import * as path from 'path';
 import * as s3 from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
-// eslint-disable-next-line import/no-extraneous-dependencies,import/no-unresolved
-import { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer';
+import { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer-lib';
 import { contentType } from 'mime-types';
 import pMap from 'p-map';
 
 export default class S3TransferUtility {
+  /**
+   * @deprecated 2021-11-27
+   *
+   * @param s3Path
+   * @param destPrefixPath
+   * @param bucketName
+   * @param preflightResponse
+   */
   public static async UploadDir(
     s3Path: string,
     destPrefixPath: string,
@@ -20,6 +27,7 @@ export default class S3TransferUtility {
   ): Promise<void> {
     // Use temp credentials for S3
     const s3Client = new s3.S3Client({
+      maxAttempts: 16,
       credentials: {
         accessKeyId: preflightResponse.awsCredentials.accessKeyId,
         secretAccessKey: preflightResponse.awsCredentials.secretAccessKey,
@@ -69,7 +77,12 @@ export default class S3TransferUtility {
   // Recursive getFiles from
   // https://stackoverflow.com/a/45130990/831465
 
-  private static async GetFiles(dir: string): Promise<string | string[]> {
+  /**
+   * Resursively enumerate the files to be uploaded
+   * @param dir
+   * @returns
+   */
+  public static async GetFiles(dir: string): Promise<string | string[]> {
     const dirents = await fs.readdir(dir, { withFileTypes: true });
     const files = await Promise.all(
       dirents.map((dirent) => {

package/src/S3Uploader.ts

@@ -1,23 +1,55 @@
 import path from 'path';
-// eslint-disable-next-line import/no-extraneous-dependencies,import/no-unresolved
-import { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer';
+import { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer-lib';
 import fs from 'fs-extra';
 import { IConfig } from './config/Config';
 import S3TransferUtility from './S3TransferUtility';
 
 export default class S3Uploader {
+  /**
+   * Copy files to local upload directory
+   * @param config
+   * @param s3UploadPath
+   * @param preflightResponse
+   */
+  public static async CopyToUploadDir(config: IConfig, s3UploadPath: string): Promise<void> {
+    const { destinationPrefix } = S3Uploader.ParseUploadPath(s3UploadPath);
+
+    // Make a local root dir for the upload
+    const tempUploadPath = path.join(S3Uploader._tempDir, destinationPrefix);
+    await S3Uploader.removeTempDirIfExists();
+    await fs.mkdir(tempUploadPath, { recursive: true });
+
+    // Copy the files in the source dir to the root dir
+    // Note: It would be faster to move the files, then move them back
+    await fs.copy(config.app.staticAssetsPath, tempUploadPath);
+  }
+
+  public static ParseUploadPath(s3UploadPath: string): {
+    bucketName: string;
+    destinationPrefix: string;
+  } {
+    // Parse the S3 Source URI
+    const uri = new URL(s3UploadPath);
+    const bucketName = uri.host;
+    const destinationPrefix = uri.pathname.length >= 1 ? uri.pathname.slice(1) : '';
+
+    return { bucketName, destinationPrefix };
+  }
+
+  /**
+   * Upload files to S3
+   * @deprecated 2021-11-27
+   * @param config
+   * @param s3UploadPath
+   * @param preflightResponse
+   */
   public static async Upload(
     config: IConfig,
     s3UploadPath: string,
     preflightResponse: IDeployVersionPreflightResponse,
   ): Promise<void> {
     try {
-      //const destinationPrefix = `${config.app.name}/${config.app.semVer}`;
-
-      // Parse the S3 Source URI
-      const uri = new URL(s3UploadPath);
-      const bucketName = uri.host;
-      const destinationPrefix = uri.pathname.length >= 1 ? uri.pathname.slice(1) : '';
+      const { destinationPrefix, bucketName } = S3Uploader.ParseUploadPath(s3UploadPath);
 
       // Make a local root dir for the upload
       const tempUploadPath = path.join(S3Uploader._tempDir, destinationPrefix);
@@ -56,4 +88,7 @@ export default class S3Uploader {
   }
 
   private static readonly _tempDir = './deploytool-temp';
+  public static get TempDir(): string {
+    return S3Uploader._tempDir;
+  }
 }