@raisenow/tamaro-cli 1.1.0 → 1.1.1

package/dist/cli.js

@@ -36,7 +36,7 @@ var withAwsAuthenticate = (fn, options) => {
   return fn();
 };
 var awsAuthenticate = (options) => {
-  if (isSetEnv()) {
+  if (options.ci) {
     return;
   }
   try {
@@ -45,13 +45,7 @@ var awsAuthenticate = (options) => {
     login(options);
   }
 };
-var isSetEnv = () => {
-  return !!(process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY);
-};
 var assertProfilesPresent = () => {
-  if (isSetEnv()) {
-    return;
-  }
   const profiles = getAvailableProfiles();
   if (profiles.length === 0) {
     halt(
@@ -83,15 +77,12 @@ var login = (options) => {
 };
 var prepareFlags = (flags, options) => {
   const { profile } = options;
-  if (!isSetEnv() && profile) {
+  if (profile) {
     flags.push(`--profile ${profile}`);
   }
   return flags;
 };
 var promptProfile = async () => {
-  if (isSetEnv()) {
-    return;
-  }
   const profiles = getAvailableProfiles().filter((v) => !!v).map((v) => ({ title: v, value: v }));
   const { profile } = await prompts(
     [
@@ -167,9 +158,9 @@ var notify = (args) => {
 var build = async (options) => {
   const { env } = options;
   assertOptionsValid(options);
-  assertProfilesPresent();
   applyEnv(env);
-  if (options.deploy) {
+  if (options.deploy && !options.ci) {
+    assertProfilesPresent();
     options.profile = await promptProfile();
   }
   const flags = prepareFlags2([], options).join(" ");
@@ -238,8 +229,8 @@ var deploy = async (options) => {
   const paths = getPaths(ifCore);
   assertOptionsValid2(options);
   assertDistPathExists(paths.appDist);
-  assertProfilesPresent();
-  if (!options.profile) {
+  if (!options.ci) {
+    assertProfilesPresent();
     options.profile = await promptProfile();
   }
   const flags = prepareFlags([], options).join(" ");
@@ -336,16 +327,18 @@ var assertTagValid = (tag) => {
 
 // src/commands/deploy-email-config.ts
 import { existsSync as existsSync3 } from "fs";
-var deployEmailConfig = async () => {
+var deployEmailConfig = async (options) => {
   const { ifCore } = getIfCoreFns();
   const paths = getPaths(ifCore);
   const emailConfigPath = `${paths.app}/email-config`;
   assertIsNotCore();
   assertEmailConfigPathExists(emailConfigPath);
-  assertProfilesPresent();
-  const profile = await promptProfile();
-  const bucket = await promptBucket();
-  const flags = prepareFlags([], { profile }).join(" ");
+  if (!options.ci) {
+    assertProfilesPresent();
+    options.profile = await promptProfile();
+  }
+  const bucket = options.ci ? AWS_S3_EMAIL_CONFIG_PROD_BUCKET : await promptBucket();
+  const flags = prepareFlags([], options).join(" ");
   const configName = getWidgetUuid();
   const deployUrl = `s3://${bucket}/${configName}`;
   const cmd = `
@@ -359,9 +352,7 @@ var deployEmailConfig = async () => {
   );
   logCommand(cmd);
   try {
-    withAwsAuthenticate(() => runCommandSync(cmd, { stdout: "inherit" }), {
-      profile
-    });
+    withAwsAuthenticate(() => runCommandSync(cmd, { stdout: "inherit" }), options);
   } catch (error) {
     halt(error.stderr);
   }
@@ -441,8 +432,10 @@ var prepareFlags3 = async (flags, options) => {
 // src/commands/list-deployed.ts
 var listDeployed = async (options) => {
   assertOptionsValid4(options);
-  assertProfilesPresent();
-  options.profile = await promptProfile();
+  if (!options.ci) {
+    assertProfilesPresent();
+    options.profile = await promptProfile();
+  }
   const flags = prepareFlags([], options).join(" ");
   const { config } = options;
   const { ifCore } = getIfCoreFns();
@@ -539,7 +532,7 @@ var prepareFlags4 = async (flags, options) => {
 // package.json
 var package_default = {
   name: "@raisenow/tamaro-cli",
-  version: "1.1.0",
+  version: "1.1.1",
   author: {
     name: "RaiseNow",
     email: "development@raisenow.com"
@@ -562,7 +555,7 @@ var package_default = {
   },
   dependencies: {
     "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.17",
+    "@babel/core": "^7.22.19",
     "@babel/plugin-proposal-decorators": "^7.22.15",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.22.15",
@@ -599,7 +592,7 @@ var package_default = {
     eslint: "^8.49.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-markdownlint": "^0.5.0",
     "eslint-plugin-promise": "^6.1.1",
@@ -624,7 +617,7 @@ var package_default = {
     prompts: "^2.4.2",
     "react-refresh": "^0.14.0",
     "resolve-url-loader": "^5.0.0",
-    sass: "^1.66.1",
+    sass: "^1.67.0",
     "sass-loader": "^13.3.2",
     "source-map-loader": "^4.0.1",
     "strip-indent": "^4.0.0",
@@ -673,7 +666,7 @@ cli.command("build").description(
   "--https",
   "Let local web server serve Tamaro with SSL encryption",
   false
-).option("--port <port>", "Web server port", `${DEFAULT_PORT}`).option("--env <env>", "Environment (dev, stage, prod)").option(
+).option("--port <port>", "Web server port", `${DEFAULT_PORT}`).option("--env <env>", "Environment (dev, stage, prod)").option("--ci", "CI environment", false).option(
   "--deploy",
   "Deploy Tamaro Core or a customer configuration bundle to AWS S3",
   false
@@ -699,7 +692,7 @@ cli.command("serve").description("Run a local web server for pre-built bundle").
 });
 cli.command("deploy").description(
   "Deploy a pre-built Tamaro Core or customer configuration bundle to AWS S3"
-).option(
+).option("--ci", "CI environment", false).option(
   "--tag <tag>",
   "Tag which should be used for the deployment of the bundle",
   DEFAULT_TAG
@@ -708,14 +701,14 @@ cli.command("deploy").description(
 });
 cli.command("list-deployed").description(
   "List deployments of Tamaro Core or a particular customer configuration"
-).option(
+).option("--ci", "CI environment", false).option(
   "--config <config>",
   "Configuration name (default: current customer configuration)"
 ).action(async (options) => {
   await listDeployed(options);
 });
-cli.command("deploy-email-config").description("Deploy a widget's email configuration to AWS S3").action(async () => {
-  await deployEmailConfig();
+cli.command("deploy-email-config").description("Deploy a widget's email configuration to AWS S3").option("--ci", "CI environment", false).action(async (options) => {
+  await deployEmailConfig(options);
 });
 (async () => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.17",
+    "@babel/core": "^7.22.19",
     "@babel/plugin-proposal-decorators": "^7.22.15",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.22.15",
@@ -60,7 +60,7 @@
     "eslint": "^8.49.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-markdownlint": "^0.5.0",
     "eslint-plugin-promise": "^6.1.1",
@@ -85,7 +85,7 @@
     "prompts": "^2.4.2",
     "react-refresh": "^0.14.0",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.66.1",
+    "sass": "^1.67.0",
     "sass-loader": "^13.3.2",
     "source-map-loader": "^4.0.1",
     "strip-indent": "^4.0.0",

package/src/cli.ts

@@ -3,7 +3,10 @@
 import {createCommand} from 'commander'
 import {build, type BuildOptions} from 'commands/build'
 import {deploy, type DeployOptions} from 'commands/deploy'
-import {deployEmailConfig} from 'commands/deploy-email-config'
+import {
+  deployEmailConfig,
+  type DeployEmailConfigOptions,
+} from 'commands/deploy-email-config'
 import {dev, type DevOptions} from 'commands/dev'
 import {listDeployed, type ListDeployedOptions} from 'commands/list-deployed'
 import {serve, type ServeOptions} from 'commands/serve'
@@ -71,6 +74,7 @@ cli
   )
   .option('--port <port>', 'Web server port', `${DEFAULT_PORT}`)
   .option('--env <env>', 'Environment (dev, stage, prod)')
+  .option('--ci', 'CI environment', false)
   .option(
     '--deploy',
     'Deploy Tamaro Core or a customer configuration bundle to AWS S3',
@@ -111,6 +115,7 @@ cli
   .description(
     'Deploy a pre-built Tamaro Core or customer configuration bundle to AWS S3',
   )
+  .option('--ci', 'CI environment', false)
   .option(
     '--tag <tag>',
     'Tag which should be used for the deployment of the bundle',
@@ -125,6 +130,7 @@ cli
   .description(
     'List deployments of Tamaro Core or a particular customer configuration',
   )
+  .option('--ci', 'CI environment', false)
   .option(
     '--config <config>',
     'Configuration name (default: current customer configuration)',
@@ -136,8 +142,9 @@ cli
 cli
   .command('deploy-email-config')
   .description("Deploy a widget's email configuration to AWS S3")
-  .action(async () => {
-    await deployEmailConfig()
+  .option('--ci', 'CI environment', false)
+  .action(async (options: DeployEmailConfigOptions) => {
+    await deployEmailConfig(options)
   })
 
 ///////////////////////////////////////////////////////////////////////////////

package/src/commands/build.ts

@@ -33,10 +33,10 @@ export const build = async (
   const {env} = options
 
   assertOptionsValid(options)
-  assertProfilesPresent()
   applyEnv(env)
 
-  if (options.deploy) {
+  if (options.deploy && !options.ci) {
+    assertProfilesPresent()
     options.profile = await promptProfile()
   }
 

package/src/commands/deploy-email-config.ts

@@ -1,31 +1,44 @@
 import {existsSync} from 'fs'
 import {
   assertProfilesPresent,
+  type AwsOptions,
   prepareFlags,
   promptBucket,
   promptProfile,
   withAwsAuthenticate,
 } from 'lib/aws'
 import {halt, runCommandSync} from 'lib/command'
+import {AWS_S3_EMAIL_CONFIG_PROD_BUCKET} from 'lib/constants'
 import {logCommand, logDataTable, logTitle} from 'lib/logging'
 import {notify} from 'lib/notifier'
 import {getIfCoreFns, getPaths, getWidgetUuid} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const deployEmailConfig = async (): Promise<void> => {
+export type DeployEmailConfigOptions = AwsOptions
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const deployEmailConfig = async (
+  options: DeployEmailConfigOptions,
+): Promise<void> => {
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
   const emailConfigPath = `${paths.app}/email-config`
 
   assertIsNotCore()
   assertEmailConfigPathExists(emailConfigPath)
-  assertProfilesPresent()
 
-  const profile = await promptProfile()
-  const bucket = await promptBucket()
+  if (!options.ci) {
+    assertProfilesPresent()
+    options.profile = await promptProfile()
+  }
+
+  const bucket = options.ci
+    ? AWS_S3_EMAIL_CONFIG_PROD_BUCKET
+    : await promptBucket()
 
-  const flags = prepareFlags([], {profile}).join(' ')
+  const flags = prepareFlags([], options).join(' ')
   const configName = getWidgetUuid()
   const deployUrl = `s3://${bucket}/${configName}`
 
@@ -41,9 +54,7 @@ export const deployEmailConfig = async (): Promise<void> => {
   logCommand(cmd)
 
   try {
-    withAwsAuthenticate(() => runCommandSync(cmd, {stdout: 'inherit'}), {
-      profile,
-    })
+    withAwsAuthenticate(() => runCommandSync(cmd, {stdout: 'inherit'}), options)
   } catch (error: any) {
     halt(error.stderr)
   }

package/src/commands/deploy.ts

@@ -31,9 +31,9 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
 
   assertOptionsValid(options)
   assertDistPathExists(paths.appDist)
-  assertProfilesPresent()
 
-  if (!options.profile) {
+  if (!options.ci) {
+    assertProfilesPresent()
     options.profile = await promptProfile()
   }
 

package/src/commands/list-deployed.ts

@@ -22,9 +22,11 @@ export const listDeployed = async (
   options: ListDeployedOptions,
 ): Promise<void> => {
   assertOptionsValid(options)
-  assertProfilesPresent()
 
-  options.profile = await promptProfile()
+  if (!options.ci) {
+    assertProfilesPresent()
+    options.profile = await promptProfile()
+  }
 
   const flags = prepareFlags([], options).join(' ')
   const {config} = options

package/src/lib/aws.ts

@@ -12,6 +12,7 @@ import {
 
 export type AwsOptions = {
   profile?: string
+  ci?: boolean
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -28,10 +29,10 @@ export const withAwsAuthenticate = <Result = any>(
 ///////////////////////////////////////////////////////////////////////////////
 
 export const awsAuthenticate = (options: AwsOptions) => {
-  if (isSetEnv()) {
+  if (options.ci) {
     // Don't try to authenticate the user.
-    // This may be useful if CLI is running within an automated system like pipeline,
-    // where "AWS_ACCESS_KEY_ID" and "AWS_SECRET_ACCESS_KEY" are used instead of "AWS_PROFILE".
+    // This is done when CLI is running within an automated system like pipeline,
+    // In this case "AWS_ACCESS_KEY_ID" and "AWS_SECRET_ACCESS_KEY" are used instead of "AWS_PROFILE".
     return
   }
 
@@ -44,18 +45,7 @@ export const awsAuthenticate = (options: AwsOptions) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Returns true if "AWS_ACCESS_KEY_ID" and "AWS_SECRET_ACCESS_KEY" environment variables are set.
-export const isSetEnv = () => {
-  return !!(process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 export const assertProfilesPresent = () => {
-  if (isSetEnv()) {
-    return
-  }
-
   const profiles = getAvailableProfiles()
 
   if (profiles.length === 0) {
@@ -112,7 +102,7 @@ export const prepareFlags = (
 ): string[] => {
   const {profile} = options
 
-  if (!isSetEnv() && profile) {
+  if (profile) {
     flags.push(`--profile ${profile}`)
   }
 
@@ -122,10 +112,6 @@ export const prepareFlags = (
 ///////////////////////////////////////////////////////////////////////////////
 
 export const promptProfile = async (): Promise<string | undefined> => {
-  if (isSetEnv()) {
-    return
-  }
-
   const profiles = getAvailableProfiles()
     .filter((v) => !!v)
     .map((v) => ({title: v, value: v}))