@raisenow/tamaro-cli 1.0.25 → 1.1.0

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

@@ -1,36 +1,31 @@
 import {existsSync} from 'fs'
 import {
-  assertProfileValid,
-  AwsOptions,
+  assertProfilesPresent,
+  prepareFlags,
+  promptBucket,
+  promptProfile,
   withAwsAuthenticate,
-  prepareFlags as prepareAwsFlags,
 } from 'lib/aws'
+import {halt, runCommandSync} from 'lib/command'
 import {logCommand, logDataTable, logTitle} from 'lib/logging'
-import {getIfCoreFns, getPaths, getWidgetUuid} from 'lib/resolve'
 import {notify} from 'lib/notifier'
-import {halt, runCommandSync} from 'lib/command'
-
-///////////////////////////////////////////////////////////////////////////////
-
-export type DeployEmailConfigOptions = AwsOptions & {
-  bucket: string
-}
+import {getIfCoreFns, getPaths, getWidgetUuid} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const deployEmailConfig = async (
-  options: DeployEmailConfigOptions,
-): Promise<void> => {
+export const deployEmailConfig = async (): Promise<void> => {
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
   const emailConfigPath = `${paths.app}/email-config`
 
-  assertOptionsValid(options)
   assertIsNotCore()
   assertEmailConfigPathExists(emailConfigPath)
+  assertProfilesPresent()
+
+  const profile = await promptProfile()
+  const bucket = await promptBucket()
 
-  const flags = prepareFlags([], options).join(' ')
-  const {bucket} = options
+  const flags = prepareFlags([], {profile}).join(' ')
   const configName = getWidgetUuid()
   const deployUrl = `s3://${bucket}/${configName}`
 
@@ -41,12 +36,14 @@ export const deployEmailConfig = async (
       ${flags}
   `
   logTitle(
-    `Deploying email configuration for “${configName}” customer configuration to AWS S3 …`,
+    `Deploying email configuration for "${configName}" customer configuration to AWS S3 …`,
   )
   logCommand(cmd)
 
   try {
-    withAwsAuthenticate(() => runCommandSync(cmd, {stdout: 'inherit'}), options)
+    withAwsAuthenticate(() => runCommandSync(cmd, {stdout: 'inherit'}), {
+      profile,
+    })
   } catch (error: any) {
     halt(error.stderr)
   }
@@ -54,7 +51,7 @@ export const deployEmailConfig = async (
   /////////////////////////////////////////////////////////////////////////////
 
   logTitle(
-    `Email configuration for “${configName}” customer configuration is deployed.`,
+    `Email configuration for "${configName}" customer configuration is deployed.`,
   )
   logDataTable({'Deploy URL:': deployUrl})
 
@@ -62,23 +59,14 @@ export const deployEmailConfig = async (
 
   process.on('exit', () => {
     notify({
-      title: `deploy-email-config`,
-      message: `Email configuration for “${configName}” customer configuration is deployed.`,
+      title: 'deploy-email-config',
+      message: `Email configuration for "${configName}" customer configuration is deployed.`,
     })
   })
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const assertOptionsValid = (options: DeployEmailConfigOptions) => {
-  const {bucket, profile} = options
-
-  assertBucketValid(bucket)
-  assertProfileValid(profile)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 const assertEmailConfigPathExists = (distPath: string) => {
   if (!existsSync(distPath)) {
     halt('Email config folder does not exists. Nothing to deploy.', 0)
@@ -87,18 +75,6 @@ const assertEmailConfigPathExists = (distPath: string) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const assertBucketValid = (tag: string) => {
-  const regex = /^[a-zA-Z0-9-_]+$/
-
-  if (!regex.test(tag)) {
-    halt(
-      `Flag “--bucket” has forbidden format. Allowed format: ${regex.toString()}.`,
-    )
-  }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 const assertIsNotCore = () => {
   const {ifCore} = getIfCoreFns()
 
@@ -106,12 +82,3 @@ const assertIsNotCore = () => {
     halt('You cannot deploy widget email configuration for Tamaro Core.')
   }
 }
-
-///////////////////////////////////////////////////////////////////////////////
-
-const prepareFlags = (
-  flags: string[],
-  options: DeployEmailConfigOptions,
-): string[] => {
-  return prepareAwsFlags(flags, options)
-}

package/src/commands/deploy.ts

@@ -1,20 +1,21 @@
 import {existsSync} from 'fs'
 import stripIndent from 'strip-indent'
+import {
+  assertProfilesPresent,
+  type AwsOptions,
+  prepareFlags,
+  promptProfile,
+  withAwsAuthenticate,
+} from 'lib/aws'
+import {halt, runCommandSync} from 'lib/command'
 import {
   AWS_CLOUDFRONT_DISTRIBUTION_ID,
   AWS_S3_BUCKET,
   CORE_CONFIG_NAME,
 } from 'lib/constants'
-import {
-  assertProfileValid,
-  AwsOptions,
-  withAwsAuthenticate,
-  prepareFlags as prepareAwsFlags,
-} from 'lib/aws'
-import {getIfCoreFns, getPaths, getWidgetUuid} from 'lib/resolve'
 import {logCommand, logDataTable, logTitle} from 'lib/logging'
 import {notify} from 'lib/notifier'
-import {halt, runCommandSync} from 'lib/command'
+import {getIfCoreFns, getPaths, getWidgetUuid} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -30,6 +31,11 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
 
   assertOptionsValid(options)
   assertDistPathExists(paths.appDist)
+  assertProfilesPresent()
+
+  if (!options.profile) {
+    options.profile = await promptProfile()
+  }
 
   const flags = prepareFlags([], options).join(' ')
   const {tag} = options
@@ -106,7 +112,7 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
   const demoPage = `https://${AWS_S3_BUCKET}/${configName}/${tag}/index.html`
   const entryPoint = `https://${AWS_S3_BUCKET}/${configName}/${tag}/${entryFilename}`
 
-  logTitle(`\nBundle for “${configName}” is deployed with tag “${tag}”.`)
+  logTitle(`\nBundle for "${configName}" is deployed with tag "${tag}".`)
   logDataTable({
     'Demo page:': demoPage,
     'Entry point:': entryPoint,
@@ -118,7 +124,7 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
     notify({
       title: 'deploy',
       message: `
-        Bundle for “${configName}” is deployed with tag “${tag}”.
+        Bundle for "${configName}" is deployed with tag "${tag}".
         Demo page: ${demoPage}
         Entry point: ${entryPoint}
       `,
@@ -129,10 +135,9 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: DeployOptions) => {
-  const {tag, profile} = options
+  const {tag} = options
 
   assertTagValid(tag)
-  assertProfileValid(profile)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -155,13 +160,7 @@ const assertTagValid = (tag: string) => {
 
   if (!regex.test(tag)) {
     halt(
-      `Flag “--tag” has forbidden format. Allowed format: ${regex.toString()}.`,
+      `Flag "--tag" has forbidden format. Allowed format: ${regex.toString()}.`,
     )
   }
 }
-
-///////////////////////////////////////////////////////////////////////////////
-
-const prepareFlags = (flags: string[], options: DeployOptions): string[] => {
-  return prepareAwsFlags(flags, options)
-}

package/src/commands/dev.ts

@@ -1,9 +1,9 @@
 import {getPortPromise} from 'portfinder'
-import {getIfCoreFns, resolveBin, resolveOwn} from 'lib/resolve'
-import {logCommand, logTitle} from 'lib/logging'
 import {halt, runCommandSync} from 'lib/command'
-import {assertEnvValid} from 'lib/env'
+import {applyEnv, assertEnvValid} from 'lib/env'
 import {assertCrtExists} from 'lib/https'
+import {logCommand, logTitle} from 'lib/logging'
+import {getIfCoreFns, resolveBin, resolveOwn} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -11,13 +11,16 @@ export type DevOptions = {
   localCore: boolean
   https: boolean
   port: string
-  env: string
+  env?: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 export const dev = async (options: DevOptions): Promise<void> => {
+  const {env} = options
+
   assertOptionsValid(options)
+  applyEnv(env)
 
   const flags = (await prepareFlags([], options)).join(' ')
   const {ifCore} = getIfCoreFns()
@@ -45,11 +48,11 @@ const assertOptionsValid = (options: DevOptions) => {
   const {ifCore} = getIfCoreFns()
 
   if (ifCore() && localCore) {
-    halt('Flag “--local-core” is redundant if running in Tamaro Core context.')
+    halt('Flag "--local-core" is redundant if running in Tamaro Core context.')
   }
 
   if (isNaN(Number(port))) {
-    halt('Flag “--port” should be a number.')
+    halt('Flag "--port" should be a number.')
   }
 
   if (https) {

package/src/commands/list-deployed.ts

@@ -1,13 +1,14 @@
-import {AWS_S3_BUCKET, CORE_CONFIG_NAME} from 'lib/constants'
 import {
-  assertProfileValid,
-  AwsOptions,
+  assertProfilesPresent,
+  type AwsOptions,
+  prepareFlags,
+  promptProfile,
   withAwsAuthenticate,
-  prepareFlags as prepareAwsFlags,
 } from 'lib/aws'
-import {getIfCoreFns, getWidgetUuid} from 'lib/resolve'
-import {logCommand, logTitle} from 'lib/logging'
 import {halt, runCommandSync} from 'lib/command'
+import {AWS_S3_BUCKET, CORE_CONFIG_NAME} from 'lib/constants'
+import {logCommand, logTitle} from 'lib/logging'
+import {getIfCoreFns, getWidgetUuid} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -21,6 +22,9 @@ export const listDeployed = async (
   options: ListDeployedOptions,
 ): Promise<void> => {
   assertOptionsValid(options)
+  assertProfilesPresent()
+
+  options.profile = await promptProfile()
 
   const flags = prepareFlags([], options).join(' ')
   const {config} = options
@@ -29,7 +33,7 @@ export const listDeployed = async (
   const title =
     !config && ifCore()
       ? `Listing deployments of Tamaro Core …`
-      : `Listing deployments of “${configName}” customer configuration …`
+      : `Listing deployments of "${configName}" customer configuration …`
 
   const deployUrl = `s3://${AWS_S3_BUCKET}/${configName}/`
   const cmd = `aws s3 ls ${deployUrl} ${flags}`
@@ -44,7 +48,7 @@ export const listDeployed = async (
     const result = withAwsAuthenticate(() => runCommandSync(cmd), options)
     out = result.stdout
   } catch (error: any) {
-    out = error.stdout
+    out = error.stdout as string
 
     if (error.stderr) {
       halt(error.stderr)
@@ -66,16 +70,16 @@ export const listDeployed = async (
       .join('\n')
   }
 
+  // eslint-disable-next-line no-console
   console.log(`${text}\n`)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: ListDeployedOptions) => {
-  const {config, profile} = options
+  const {config} = options
 
   assertConfigValid(config)
-  assertProfileValid(profile)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -89,22 +93,13 @@ const assertConfigValid = (config: string | undefined) => {
 
   if (!regex.test(config)) {
     halt(
-      `Flag “--config” has forbidden format. Allowed format: ${regex.toString()}.`,
+      `Flag "--config" has forbidden format. Allowed format: ${regex.toString()}.`,
     )
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const prepareFlags = (
-  flags: string[],
-  options: ListDeployedOptions,
-): string[] => {
-  return prepareAwsFlags(flags, options)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 const parseTags = (lines: string[]): string[] => {
   const regex = /^\s*PRE\s*/
 

package/src/commands/serve.ts

@@ -1,10 +1,10 @@
 import {resolve} from 'path'
 import {getPortPromise} from 'portfinder'
-import {getIfCoreFns, getPaths} from 'lib/resolve'
-import {logCommand, logTitle} from 'lib/logging'
 import {halt, runCommandSync} from 'lib/command'
-import {assertCrtExists} from 'lib/https'
 import {HTTPS_CRT_FILE, HTTPS_KEY_FILE} from 'lib/constants'
+import {assertCrtExists} from 'lib/https'
+import {logCommand, logTitle} from 'lib/logging'
+import {getIfCoreFns, getPaths} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 

package/src/lib/InterpolateHtmlPlugin.ts

@@ -1,10 +1,10 @@
-import {Compiler} from 'webpack'
-import HtmlWebpackPlugin from 'html-webpack-plugin'
 import escapeStringRegexp from 'escape-string-regexp'
+import HtmlWebpackPlugin from 'html-webpack-plugin'
+import {type Compiler} from 'webpack'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export type Replacements = {[key: string]: string | undefined}
+export type Replacements = Record<string, string | undefined>
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -24,9 +24,9 @@ export class InterpolateHtmlPlugin {
       const hooks = HtmlWebpackPlugin.getHooks(compilation)
 
       hooks.alterAssetTagGroups.tap(PLUGIN_NAME, (assets) => {
-        const publicUrl = this.replacements['PUBLIC_URL'] ?? ''
-        const entry = assets.headTags[0].attributes['src'] as string
-        this.replacements['ENTRY'] = `${publicUrl}${entry}`
+        const publicUrl = this.replacements.PUBLIC_URL ?? ''
+        const entry = assets.headTags[0].attributes.src as string
+        this.replacements.ENTRY = `${publicUrl}${entry}`
 
         return assets
       })
@@ -36,7 +36,7 @@ export class InterpolateHtmlPlugin {
         Object.entries(this.replacements).forEach(([key, value]) => {
           data.html = data.html.replace(
             new RegExp(`%${escapeStringRegexp(key)}%`, 'g'),
-            value || '',
+            value ?? '',
           )
         })
 

package/src/lib/aws.ts

@@ -1,11 +1,17 @@
 import {execaCommandSync} from 'execa'
+// eslint-disable-next-line import/no-named-as-default
+import prompts from 'prompts'
 import stripIndent from 'strip-indent'
 import {halt} from 'lib/command'
+import {
+  AWS_S3_EMAIL_CONFIG_PROD_BUCKET,
+  AWS_S3_EMAIL_CONFIG_STAGE_BUCKET,
+} from 'lib/constants'
 
 ///////////////////////////////////////////////////////////////////////////////
 
 export type AwsOptions = {
-  profile: string
+  profile?: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -45,42 +51,28 @@ export const isSetEnv = () => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const assertProfileValid = (profile: string) => {
+export const assertProfilesPresent = () => {
   if (isSetEnv()) {
     return
   }
 
   const profiles = getAvailableProfiles()
 
-  if (!profiles.includes(profile)) {
-    console.log(`Using AWS profile: “${profile}”`)
-
-    let message
-
-    if (profiles.length === 0) {
-      message = stripIndent(`
+  if (profiles.length === 0) {
+    halt(
+      stripIndent(`
         No AWS profiles found.
-      `)
-    } else {
-      message = stripIndent(`
-        AWS profile “${profile}” has not been found.
-        Available profiles are: ${profiles.map((v) => `“${v}”`).join(', ')}.
-      `)
-    }
-
-    message += stripIndent(`
-      Run “aws configure sso” to set up SSO-enabled profile.
-      Check the wiki for more information:
-      https://raisenow.atlassian.net/wiki/x/lIrWvg
-    `)
-
-    halt(message)
+        Run "aws configure sso" to set up SSO-enabled profile.
+        Check the wiki for more information:
+        https://raisenow.atlassian.net/wiki/x/lIrWvg
+      `),
+    )
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const getAvailableProfiles = (): string[] => {
+export const getAvailableProfiles = (): string[] => {
   const {stdout} = execaCommandSync('aws configure list-profiles')
 
   return stdout.split('\n')
@@ -105,6 +97,7 @@ const login = (options: AwsOptions) => {
 
   try {
     execaCommandSync(`aws sso login ${flags}`, {stdio: 'inherit'})
+    // eslint-disable-next-line no-console
     console.log('')
   } catch (error) {
     halt('Login failed.')
@@ -119,9 +112,62 @@ export const prepareFlags = (
 ): string[] => {
   const {profile} = options
 
-  if (!isSetEnv()) {
+  if (!isSetEnv() && profile) {
     flags.push(`--profile ${profile}`)
   }
 
   return flags
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const promptProfile = async (): Promise<string | undefined> => {
+  if (isSetEnv()) {
+    return
+  }
+
+  const profiles = getAvailableProfiles()
+    .filter((v) => !!v)
+    .map((v) => ({title: v, value: v}))
+
+  const {profile} = await prompts(
+    [
+      {
+        type: 'select',
+        name: 'profile',
+        message: 'Select AWS profile',
+        choices: profiles,
+      },
+    ],
+    {
+      onCancel: () => process.exit(1),
+    },
+  )
+
+  return profile
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const promptBucket = async (): Promise<string> => {
+  const buckets = [
+    {title: 'stage', value: AWS_S3_EMAIL_CONFIG_STAGE_BUCKET},
+    {title: 'prod', value: AWS_S3_EMAIL_CONFIG_PROD_BUCKET},
+  ]
+
+  const {bucket} = await prompts(
+    [
+      {
+        type: 'select',
+        name: 'bucket',
+        message: 'Select environment',
+        choices: buckets,
+      },
+    ],
+    {
+      onCancel: () => process.exit(1),
+    },
+  )
+
+  return bucket
+}

package/src/lib/command.ts

@@ -1,4 +1,8 @@
-import {execaCommandSync, ExecaSyncReturnValue, SyncOptions} from 'execa'
+import {
+  execaCommandSync,
+  type ExecaSyncReturnValue,
+  type SyncOptions,
+} from 'execa'
 import {logError} from 'lib/logging'
 
 ///////////////////////////////////////////////////////////////////////////////

package/src/lib/constants.ts

@@ -1,7 +1,8 @@
 export const DEFAULT_TAG = 'latest'
 export const DEFAULT_PORT = 1234
 export const DEFAULT_AWS_PROFILE = 'payments-prod-cs-deployer'
-export const DEFAULT_AWS_S3_EMAIL_CONFIG_BUCKET = 'rnw-email-service'
+export const AWS_S3_EMAIL_CONFIG_PROD_BUCKET = 'rnw-email-service'
+export const AWS_S3_EMAIL_CONFIG_STAGE_BUCKET = 'rnw-stage-email-service'
 export const AWS_S3_BUCKET = 'tamaro.raisenow.com'
 export const CORE_CONFIG_NAME = 'tamaro-core'
 export const AWS_CLOUDFRONT_DISTRIBUTION_ID = 'EHJ1OM458YQ0I'