@raisenow/tamaro-cli 1.1.5 → 1.1.7

package/src/commands/list-deployed.ts

@@ -1,12 +1,13 @@
 import {
   assertProfilesPresent,
+  assertProfileValid,
+  awsAuthenticate,
   type AwsOptions,
   prepareFlags,
   promptProfile,
-  withAwsAuthenticate,
 } from 'lib/aws'
 import {halt, runCommandSync} from 'lib/command'
-import {AWS_S3_BUCKET, CORE_CONFIG_NAME} from 'lib/constants'
+import {AWS_S3_BUCKET_TAMARO, CORE_CONFIG_NAME} from 'lib/constants'
 import {logCommand, logTitle} from 'lib/logging'
 import {getIfCoreFns, getWidgetUuid} from 'lib/resolve'
 
@@ -21,14 +22,15 @@ export type ListDeployedOptions = AwsOptions & {
 export const listDeployed = async (
   options: ListDeployedOptions,
 ): Promise<void> => {
-  assertOptionsValid(options)
-
-  if (!options.ci) {
+  if (!options.profile && !options.ci) {
     assertProfilesPresent()
     options.profile = await promptProfile()
   }
 
-  const flags = prepareFlags([], options).join(' ')
+  assertOptionsValid(options)
+  awsAuthenticate(options)
+
+  const flags = prepareFlags(options)
   const {config} = options
   const {ifCore} = getIfCoreFns()
   const configName = config ?? ifCore(CORE_CONFIG_NAME, getWidgetUuid())
@@ -37,7 +39,7 @@ export const listDeployed = async (
       ? `Listing deployments of Tamaro Core …`
       : `Listing deployments of "${configName}" customer configuration …`
 
-  const deployUrl = `s3://${AWS_S3_BUCKET}/${configName}/`
+  const deployUrl = `s3://${AWS_S3_BUCKET_TAMARO}/${configName}/`
   const cmd = `aws s3 ls ${deployUrl} ${flags}`
   let out = ''
 
@@ -47,8 +49,8 @@ export const listDeployed = async (
   // If customer configuration folder does not exist on AWS S3,
   // command fails with blank stderr, so we need to handle this case.
   try {
-    const result = withAwsAuthenticate(() => runCommandSync(cmd), options)
-    out = result.stdout
+    const result = runCommandSync(cmd)
+    out = result.stdout as string
   } catch (error: any) {
     out = error.stdout as string
 
@@ -67,7 +69,7 @@ export const listDeployed = async (
     text = tags
       .map((tag, idx) => {
         // prettier-ignore
-        return `${idx + 1}. https://${AWS_S3_BUCKET}/${configName}/${tag}/index.html`
+        return `${idx + 1}. https://${AWS_S3_BUCKET_TAMARO}/${configName}/${tag}/index.html`
       })
       .join('\n')
   }
@@ -79,9 +81,13 @@ export const listDeployed = async (
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: ListDeployedOptions) => {
-  const {config} = options
+  const {config, profile} = options
 
   assertConfigValid(config)
+
+  if (profile) {
+    assertProfileValid(profile)
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////

package/src/commands/serve.ts

@@ -18,7 +18,7 @@ export type ServeOptions = {
 export const serve = async (options: ServeOptions): Promise<void> => {
   assertOptionsValid(options)
 
-  const flags = (await prepareFlags([], options)).join(' ')
+  const flags = await prepareFlags(options)
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
   const cmd = `
@@ -48,10 +48,8 @@ const assertOptionsValid = (options: ServeOptions) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const prepareFlags = async (
-  flags: string[],
-  options: ServeOptions,
-): Promise<string[]> => {
+const prepareFlags = async (options: ServeOptions) => {
+  const flags: string[] = []
   const {port: defaultPort, https} = options
   const port = await getPortPromise({port: Number(defaultPort)})
 
@@ -67,5 +65,5 @@ const prepareFlags = async (
     flags.push(`--ssl-key ${keyFile}`)
   }
 
-  return flags
+  return flags.join(' ')
 }

package/src/lib/aws.ts

@@ -3,10 +3,6 @@ import {execaCommandSync} from 'execa'
 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'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,22 +13,13 @@ export type AwsOptions = {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const withAwsAuthenticate = <Result = any>(
-  fn: () => Result,
-  options: AwsOptions,
-): Result => {
-  awsAuthenticate(options)
-
-  return fn()
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 export const awsAuthenticate = (options: AwsOptions) => {
   if (options.ci) {
-    // Don't try to authenticate the user.
-    // 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".
+    /**
+     * Don't try to authenticate the user.
+     * 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
   }
 
@@ -70,20 +57,24 @@ export const getAvailableProfiles = (): string[] => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Returns caller identity data (output is ignored here).
-// Fails in case of expired SSO session.
+/**
+ * Returns caller identity data (output is ignored here).
+ * Fails in case of expired SSO session.
+ */
 const checkIdentity = (options: AwsOptions) => {
-  const flags = prepareFlags([], options).join(' ')
+  const flags = prepareFlags(options)
 
   execaCommandSync(`aws sts get-caller-identity ${flags}`)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Opens SSO authentication page in the browser.
-// Fails if user canceled authentication process.
+/**
+ * Opens SSO authentication page in the browser.
+ * Fails if user canceled authentication process.
+ */
 const login = (options: AwsOptions) => {
-  const flags = prepareFlags([], options).join(' ')
+  const flags = prepareFlags(options)
 
   try {
     execaCommandSync(`aws sso login ${flags}`, {stdio: 'inherit'})
@@ -96,17 +87,30 @@ const login = (options: AwsOptions) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const prepareFlags = (
-  flags: string[],
-  options: AwsOptions,
-): string[] => {
+export const prepareFlags = (options: AwsOptions) => {
+  const flags: string[] = []
   const {profile} = options
 
   if (profile) {
     flags.push(`--profile ${profile}`)
   }
 
-  return flags
+  return flags.join(' ')
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const assertProfileValid = (profile: string) => {
+  const profiles = getAvailableProfiles()
+
+  if (!profiles.includes(profile)) {
+    halt(
+      stripIndent(`
+        AWS profile "${profile}" is not found.
+        Available profiles are: ${profiles.map((v) => `"${v}"`).join(', ')}.
+      `),
+    )
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -126,34 +130,9 @@ export const promptProfile = async (): Promise<string | undefined> => {
       },
     ],
     {
-      onCancel: () => process.exit(1),
+      onCancel: () => halt(),
     },
   )
 
   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,15 +1,11 @@
-import {
-  execaCommandSync,
-  type ExecaSyncReturnValue,
-  type SyncOptions,
-} from 'execa'
+import {execaCommandSync, type SyncOptions, type SyncResult} from 'execa'
 import {logError} from 'lib/logging'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const halt = (message?: string, exitCode = 1) => {
+export const halt = (message?: string) => {
   logError(message)
-  process.exit(exitCode)
+  process.exit(1)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,6 +22,6 @@ export const prepareCommand = (cmd: string): string => {
 export const runCommandSync = (
   cmd: string,
   options?: SyncOptions,
-): ExecaSyncReturnValue => {
+): SyncResult => {
   return execaCommandSync(prepareCommand(cmd), options)
 }

package/src/lib/constants.ts

@@ -1,9 +1,8 @@
 export const DEFAULT_TAG = 'latest'
 export const DEFAULT_PORT = 1234
-export const DEFAULT_AWS_PROFILE = 'payments-prod-cs-deployer'
-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 AWS_S3_BUCKET_TAMARO = 'tamaro.raisenow.com'
+export const AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE = 'rnw-stage-email-service'
+export const AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD = 'rnw-email-service'
 export const CORE_CONFIG_NAME = 'tamaro-core'
 export const AWS_CLOUDFRONT_DISTRIBUTION_ID = 'EHJ1OM458YQ0I'
 export const HTTPS_CRT_FILE = 'localhost.crt'

package/src/lib/env.ts

@@ -144,8 +144,7 @@ export const assertEnvValid = (env?: string) => {
 
   if (envs.length !== 0) {
     if (!env) {
-      // There are some ".env.<env>" files, but no "--env" flag is specified,
-      // so we must require it
+      // There are some ".env.<env>" files, but no "--env" flag is specified, so we must require it
       halt('Flag "--env" is required.')
     }
 

package/src/webpack.config.ts

@@ -104,7 +104,7 @@ const getWebpackConfig = (env: any): Configuration => {
       },
       {
         loader: require.resolve('sass-loader'),
-        options: {sourceMap: true},
+        options: {api: 'modern-compiler', sourceMap: true},
       },
     ])
   }
@@ -158,8 +158,10 @@ const getWebpackConfig = (env: any): Configuration => {
 
         {
           oneOf: [
-            // App Javascript and Typescript (Babel)
-            // and some dependencies distributed in a non-es5 formats
+            /**
+             * App Javascript and Typescript (Babel)
+             * and some dependencies distributed in a non-es5 formats
+             */
             {
               test: /\.(js|ts)x?$/,
               include: ifCore(
@@ -268,8 +270,10 @@ const getWebpackConfig = (env: any): Configuration => {
               },
             },
 
-            // All other files - fallback
-            // This must be the latest rule!
+            /**
+             * All other files - fallback
+             * This must be the latest rule!
+             */
             {
               exclude: [/^$/, /\.(js|jsx|ts|tsx|mjs)$/, /\.html$/, /\.json$/],
               type: 'asset/resource',

package/tsconfig.json

@@ -1,86 +1,38 @@
 {
+  /* https://aka.ms/tsconfig.json */
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Basic Options */
-    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "esnext",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-    "module": "esnext",                       /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    // "lib": [],                             /* Specify library files to be included in the compilation. */
-    "allowJs": true,                          /* Allow javascript files to be compiled. */
-    // "checkJs": true,                       /* Report errors in .js files. */
-    "jsx": "react",                           /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    // "outDir": "./",                        /* Redirect output structure to the directory. */
-    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                     /* Enable project compilation */
-    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-    // "removeComments": true,                /* Do not emit comments to output. */
-    "noEmit": true,                           /* Do not emit outputs. */
-    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    "isolatedModules": true,                  /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,              /* Enable strict null checks. */
-    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                /* Report errors on unused locals. */
-    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-    "noFallthroughCasesInSwitch": true,       /* Report errors for fallthrough cases in switch statement. */
-    // "noUncheckedIndexedAccess": true,      /* Include 'undefined' in index signature results */
-
-    /* Module Resolution Options */
-    "moduleResolution": "node",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "baseUrl": ".",                           /* Base directory to resolve non-absolute module names. */
-    "paths": {                                /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    "moduleDetection": "force",
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+
+    "noEmit": true,
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "jsx": "react",
+
+    "baseUrl": ".",
+    "paths": {
       "commands/*": ["src/commands/*"],
       "lib/*": ["src/lib/*"]
     },
-    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
-    "allowSyntheticDefaultImports": true,     /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
-
-    /* Allow imports from json files */
-    "resolveJsonModule": true,
   },
   "include": [
     "**/*",
     ".eslintrc.cjs",
   ],
   "exclude": [
-    ".history/**/*",
-    ".idea/**/*",
-    "dist/**/*",
-    "node_modules/**/*",
+    ".history",
+    ".idea",
+    "dist",
+    "node_modules",
   ]
 }