@optimizely/ocp-cli 1.0.0-beta.6 → 1.0.0-beta.7

package/src/commands/accounts/Whois.ts

@@ -3,7 +3,7 @@ import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
 import {Rivendell} from '../../lib/Rivendell';
 import Account = Rivendell.Account;
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as table from 'text-table';
 import {styledStringLength} from '../../lib/StringUtils';
 
@@ -28,7 +28,7 @@ export class WhoisCommand {
         const zone = this.availability || 'us';
         console.log(chalk.yellow(`No accounts matching search term '${this.term}' found in ${zone}.`));
       }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/app/BaseBuildCommand.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {execSync} from 'child_process';
 import {DotenvParseOutput} from 'dotenv';
 import {defaultValue, flag, help, param} from 'oo-cli';
@@ -92,7 +92,7 @@ export abstract class BaseBuildCommand {
         if (version?.state !== AppVersionState.RUNNING) {
           await this.build(context, publish);
         }
-      } catch (e) {
+      } catch (e: any) {
         die(formatError(e));
       }
     }
@@ -182,7 +182,7 @@ export abstract class BaseBuildCommand {
       } else {
         await this.registerVersion(context, packageUrl, appEnv, usePreviousAppEnvValues, shard);
       }
-    } catch (e) {
+    } catch (e: any) {
       die(`${formatError(e)} (${shard})`);
     }
   }
@@ -243,7 +243,7 @@ export abstract class BaseBuildCommand {
       spinner?.update(`Status: ${formatBuildState(state)}`);
     }).then((errors: ErrorList) => {
       spinner?.stop();
-      if (errors) {
+      if (errors && errors.length > 0) {
         die(`${publish ? 'Build' : 'Validation'} failed:\n${errors.map((e) => ` * ${e}`).join('\n')}`);
       } else if (publish) {
         if (requiresReview) {

package/src/commands/app/Init.ts

@@ -1,8 +1,8 @@
 import {APP_ID_FORMAT, VENDOR_FORMAT, VERSION_FORMAT} from '@zaiusinc/app-sdk';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as columnify from 'columnify';
 import * as fs from 'fs';
-import * as marked from 'marked';
+import { marked } from 'marked';
 import * as MarkedTerminal from 'marked-terminal';
 import fetch from 'node-fetch';
 import {command, help, namespace, optional, param} from 'oo-cli';
@@ -294,7 +294,7 @@ export class CreateCommand {
       const json = await deps.json() as any;
       this.substitutions['app_sdk_version'] = this.getLatestSDKVersion(json['@zaiusinc/app-sdk']);
       this.substitutions['node_sdk_version'] = this.getLatestSDKVersion(json['@zaiusinc/node-sdk']);
-    } catch (e) {
+    } catch (e: any) {
       this.warnings.push('Error fetching sdk versions, defaulting to latest: ', e.message);
       this.substitutions['app_sdk_version'] = 'latest';
       this.substitutions['node_sdk_version'] = 'latest';

package/src/commands/app/Logs.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 
 import {command, defaultValue, flag, help, multiple, namespace, option} from 'oo-cli';
 import {isValidDateOrEpochOrDurationString, parseDate} from '../../lib/parseDate';
@@ -143,7 +143,7 @@ export class LogsCommand {
           spinner.stop();
         }
       }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/app/Prepare.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, flag, help, namespace} from 'oo-cli';
 import {appContext} from '../../lib/AppContext';
 import {PublishCommand} from '../directory/Publish';

package/src/commands/app/Register.ts

@@ -34,7 +34,7 @@ export class RegisterCommand {
         const app = await Rivendell.registerApp(this.id, this.name, this.personal, shard);
         console.log(`Registered app ${app.id} with name "${app.name} in ${shard}`);
       }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/app/Validate.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace} from 'oo-cli';
 import {BaseBuildCommand} from './BaseBuildCommand';
 

package/src/commands/availability/List.ts

@@ -3,7 +3,7 @@ import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
 import {Rivendell} from '../../lib/Rivendell';
 import Shard = Rivendell.Shard;
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as table from 'text-table';
 import {styledStringLength} from '../../lib/StringUtils';
 
@@ -14,7 +14,7 @@ export class ListCommand {
   public async list() {
     try {
       this.render(await Rivendell.shards());
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/Info.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatVersionState} from '../../lib/formatVersionState';
@@ -28,7 +28,7 @@ export class InfoCommand {
   public async info() {
     try {
       await this.render(await Rivendell.fetchApp(this.appId, this.availability));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/Install.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {Rivendell} from '../../lib/Rivendell';
@@ -30,7 +30,7 @@ export class InstallCommand {
       const install = await Rivendell.install(appId, version, this.trackerId, this.availability);
       console.log(chalk.green(`Installed ${appId}@${version} for ${this.trackerId} ` +
         `with install id ${install.id} in ${this.availability || 'us'}`));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/List.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, flag, help, namespace, option, optional, param} from 'oo-cli';
 import * as semver from 'semver';
 import * as table from 'text-table';
@@ -40,7 +40,7 @@ export class ListCommand {
         criteria.appId = this.appId;
       }
       this.render(await Rivendell.searchAppVersions(criteria, this.availability));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/ListFunctions.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
@@ -31,7 +31,7 @@ export class ListFunctionsCommand {
       }, this.availability);
 
       this.render(webhooks);
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/ListGlobalFunctions.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {Rivendell} from '../../lib/Rivendell';
@@ -25,7 +25,7 @@ export class ListGlobalFunctionsCommand {
         includeInternal: true,
         includeDisabled: true
       }, this.availability));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/ListInstalls.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import * as table from 'text-table';
 import {die} from '../../lib/die';
@@ -34,7 +34,7 @@ export class ListInstallsCommand {
       );
 
       this.render(version, appInstallations);
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/Publish.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, flag, help, namespace, param} from 'oo-cli';
 import {terminal} from 'terminal-kit';
 import {AppContext} from '../../lib/AppContext';
@@ -65,7 +65,7 @@ export class PublishCommand {
           await this.watchForPublishCompletion(context, await this.isStopped(context, shard), shard);
           // since we are handling the interrupt, disable the handler so we can exit
           terminal.removeAllListeners('key');
-        } catch (error) {
+        } catch (error: any) {
           errors.push(`${formatError(error)} (${shard})`);
         }
       }
@@ -77,7 +77,7 @@ export class PublishCommand {
       if (pre && pre[0] !== 'dev') {
         await this.checkOrphanedDeploys(appId, shards);
       }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }
@@ -130,7 +130,7 @@ export class PublishCommand {
 
   private watchForPublishCompletion(context: AppContext, wasStopped: boolean, shard: string) {
     console.log(chalk.gray(`Watching for publish (${shard}) to complete... CTRL+C to stop checking.`));
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
       const spinner = this.noProgress ? null : new TerminalSpinner().start('');
       let attempts = 0;
       let ignoreStopped = wasStopped;

package/src/commands/directory/Status.ts

@@ -38,7 +38,7 @@ export class StatusCommand {
             console.log(`Review status: ${formatReviewStatus(reviewStatus, appVersionState)}`);
           }
         }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/Uninstall.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {Rivendell} from '../../lib/Rivendell';
@@ -25,7 +25,7 @@ export class UninstallCommand {
       const install = await Rivendell.fetchAppInstallation(this.appId, this.trackerId, this.availability);
       await Rivendell.uninstall(install.id, this.availability);
       console.log(chalk.green(`Uninstalled ${install.appId} from ${install.trackerId} (${this.availability || 'us'})`));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/directory/Unpublish.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, flag, help, namespace, option, param} from 'oo-cli';
 import {terminal} from 'terminal-kit';
 import {AppContext} from '../../lib/AppContext';
@@ -63,7 +63,7 @@ export class UnpublishCommand {
           await Rivendell.unpublish(appId, version, shard);
           console.log(chalk.green(`${this.appVersion} is being unpublished in ${shard}.`));
           await this.watchForCompletion({appId, version}, shard);
-        } catch (error) {
+        } catch (error: any) {
           errors.push(`${formatError(error)} (${shard})`);
         }
       }
@@ -72,7 +72,7 @@ export class UnpublishCommand {
         console.log(chalk.red(errors.join('\n')));
       }
 
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }
@@ -134,7 +134,7 @@ export class UnpublishCommand {
 
   private async watchForCompletion(context: AppContext, shard: string) {
     console.log(chalk.gray(`Watching for unpublish to complete in ${shard}... CTRL+C to stop checking.`));
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
       const spinner = this.noProgress ? null : new TerminalSpinner().start('');
       let attempts = 0;
       const checkStatus = () => {

package/src/commands/directory/Uprade.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param, required} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
@@ -45,14 +45,14 @@ export class UpgradeCommand {
           chalk.green(`Upgraded ${this.trackerId} to ${this.appId}@${this.toVersion} in ${shard}.`));
         terminal.removeAllListeners('key');
       }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }
 
   private watchForCompletion(shard: string) {
     console.log(chalk.gray(`Upgrade was scheduled in ${shard}, watching for completion... CTRL+C to stop checking.`));
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
       let attempts = 0;
       const spinner = new TerminalSpinner().start('');
       const checkUpgrade = () => {

package/src/commands/env/GetEnvironment.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace} from 'oo-cli';
 import {getEnv, runtimeConfig} from '../../lib/Config';
 

package/src/commands/env/SetEnvironment.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, param} from 'oo-cli';
 import { getEnv } from '../../lib/Config';
 

package/src/commands/jobs/List.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, multiple, namespace, option, param} from 'oo-cli';
 import * as table from 'text-table';
 import {isValidDateOrEpochOrDurationString, parseDate} from '../../lib/parseDate';
@@ -166,7 +166,7 @@ export class ListCommand {
       } else {
         this.render(this.amendWithDuration(jobs));
       }
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/jobs/RuntimeStatus.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
@@ -42,7 +42,7 @@ export class RuntimeStatusCommand {
         die(`Runtime Status not available. This is normal for jobs that are not running.`);
       }
 
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/jobs/Terminate.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
@@ -20,7 +20,7 @@ export class TerminateCommand {
   public async terminate(): Promise<void> {
     try {
       await Rivendell.terminateJob(this.jobId, this.availability);
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
 

package/src/commands/jobs/Trigger.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, option, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
@@ -32,7 +32,7 @@ export class TriggerCommand {
   public async trigger(): Promise<void> {
     try {
       await Rivendell.triggerJob(this.appId, this.jobName, this.trackerId, this.parameters, this.availability);
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
 

package/src/commands/review/List.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, optional, param} from 'oo-cli';
 import * as semver from 'semver';
 import * as table from 'text-table';
@@ -32,7 +32,7 @@ export class ListCommand {
         criteria.appId = this.appId;
       }
       this.render(await Rivendell.searchAppVersions(criteria, 'us'));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/commands/review/Open.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {command, help, namespace, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {Rivendell} from '../../lib/Rivendell';
@@ -21,7 +21,7 @@ export class OpenCommand {
       console.log(chalk.gray(`Review URL: ${chalk.white(`${reviewUrl}`)}`));
       await open(reviewUrl);
       console.log(chalk.gray(`Opened review of app ${this.appVersion}`));
-    } catch (e) {
+    } catch (e: any) {
       die(formatError(e));
     }
   }

package/src/lib/AppPackager.ts

@@ -1,5 +1,5 @@
 import * as AdmZip from 'adm-zip';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as glob from 'glob';

package/src/lib/AppUpdater.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as child_process from 'child_process';
 import fetch from 'node-fetch';
 import {compare, major} from 'semver';

package/src/lib/AppUploader.ts

@@ -1,5 +1,5 @@
-import * as AWS from 'aws-sdk';
-import chalk from 'chalk';
+import { S3 } from '@aws-sdk/client-s3';
+import * as chalk from 'chalk';
 import * as crypto from 'crypto';
 import {AppContext} from './AppContext';
 import {runtimeConfig} from './Config';
@@ -17,22 +17,18 @@ export class AppUploader {
     const s3Key = `${vendor}/${appId}@${version}-${md5}.zip`;
     const credentials = await Rivendell.uploadCredentials(vendor!, appId!, version!, md5);
 
-    AWS.config.update({
+    await new S3({
       region: runtimeConfig().awsRegion,
-      credentials: new AWS.Credentials(
-        credentials.accessKeyId,
-        credentials.secretAccessKey,
-        credentials.sessionToken
-      )
-    });
-
-    await new AWS.S3()
-      .putObject( {
+      credentials: {
+        accessKeyId: credentials.accessKeyId,
+        secretAccessKey: credentials.secretAccessKey,
+        sessionToken: credentials.sessionToken
+      }
+    }).putObject( {
         Bucket: bucket,
         Key: s3Key,
         Body: this.packageData
-      })
-      .promise();
+      });
 
     return `s3://${bucket}/${s3Key}`;
   }

package/src/lib/EnvironmentalOutput.ts

@@ -1,18 +1,19 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import { existsSync } from 'fs';
 import { join } from 'path';
 import {getEnv} from './Config';
 
-const envColors = {
-  staging: chalk.yellow,
-  production: chalk.red,
-  other: chalk.gray
-};
+function printEnv(env: string) {
+  switch (env) {
+    case 'staging': return chalk.yellow(env);
+    case 'production': return chalk.red(env);
+    default: return chalk.gray(env);
+  }
+}
 
 export function showEnvironment() {
   if (existsSync(join(__dirname, '../commands/env'))) {
     const env = getEnv();
-    const color = envColors[env as keyof typeof envColors] || envColors['other'];
-    console.log(chalk.gray(`Active environment: ${color(env)}`));
+    console.log(chalk.gray(`Active environment: ${printEnv(env)}`));
   }
 }

package/src/lib/TerminalInput.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {stringWidth, terminal} from 'terminal-kit';
 
 interface Coordinates {

package/src/lib/TerminalMenu.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {stringWidth, terminal, truncateString} from 'terminal-kit';
 
 export interface MenuOptions {

package/src/lib/TerminalSpinner.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as cliSpinners from 'cli-spinners';
 import {Spinner} from 'cli-spinners';
 import {stringWidth, terminal, truncateString} from 'terminal-kit';
@@ -22,7 +22,7 @@ export class TerminalSpinner {
   private interval!: NodeJS.Timeout;
   private spinner: Spinner;
 
-  constructor(private color: string = 'yellow', spinner?: Spinner) {
+  constructor(spinner?: Spinner) {
     if (spinner) {
       this.spinner = spinner;
     } else {
@@ -44,9 +44,8 @@ export class TerminalSpinner {
     return this;
   }
 
-  public update(text: string, spinnerColor = this.color) {
+  public update(text: string) {
     this.text = text;
-    this.color = spinnerColor;
     this.render();
   }
 
@@ -61,7 +60,7 @@ export class TerminalSpinner {
   }
 
   private renderSpinner() {
-    terminal(` ${chalk.keyword(this.color)(this.spinner.frames[this.counter % this.spinner.frames.length])} `);
+    terminal(` ${chalk.yellow(this.spinner.frames[this.counter % this.spinner.frames.length])} `);
   }
 
   private render() {

package/src/lib/build.ts

@@ -18,7 +18,7 @@ export async function watchBuild(
           if (state === BuildState.FINISHED) {
             clearInterval(interval);
             if (build.status as BuildStatus === BuildStatus.SUCCESS) {
-              resolve();
+              resolve([]);
             } else {
               const errors = build.errors || [];
               resolve(errors);

package/src/lib/checkForUpdate.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';

package/src/lib/dev/app.ts

@@ -1,7 +1,7 @@
 import {ChildProcess, spawn} from 'child_process';
 import fetch from 'node-fetch';
 import {DevLogger} from './logger';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 
 const logger = new DevLogger();
 

package/src/lib/dev/logger.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import {Readable, Writable} from 'stream';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 
 type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'NEVER';
 

package/src/lib/die.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 
 /**
  * Logs an error message (in red) then exits with code 1.

package/src/lib/formatBuildState.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {Rivendell} from './Rivendell';
 
 export function formatBuildState(state: Rivendell.BuildState): string {

package/src/lib/formatJobStatus.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {Rivendell} from './Rivendell';
 import JobStatus = Rivendell.JobStatus;
 

package/src/lib/formatReviewStatus.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import {Rivendell} from './Rivendell';
 import AppVersionState = Rivendell.AppVersionState;
 import ReviewStatus = Rivendell.ReviewStatus;