@toa.io/cli 1.1.0-dev.15 → 1.1.0-dev.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "1.1.0-dev.15",
+  "version": "1.1.0-dev.16",
   "description": "Toa CLI",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -23,12 +23,12 @@
   },
   "dependencies": {
     "@toa.io/console": "0.6.0",
-    "@toa.io/generic": "0.11.0-dev.15",
-    "@toa.io/kubernetes": "0.7.5-dev.15",
-    "@toa.io/norm": "1.0.2-dev.15",
-    "@toa.io/yaml": "0.7.6-dev.15",
+    "@toa.io/generic": "0.11.0-dev.16",
+    "@toa.io/kubernetes": "0.7.5-dev.16",
+    "@toa.io/norm": "1.1.0-dev.0",
+    "@toa.io/yaml": "0.7.6-dev.16",
     "find-up": "5.0.0",
     "yargs": "17.6.2"
   },
-  "gitHead": "f479f6e79d5caaa207da4d0a3192425def1abf75"
+  "gitHead": "669be360acebac4dbe49735ec506127d9d0a05e3"
 }

package/readme.md

@@ -26,11 +26,12 @@ format.
 <dl>
 <dt><code>toa replay [paths...]</code></dt>
 <dd>
-<code>paths</code> path(s) to component(s) or a context (default <code>.</code>)<br/>
-<code>--integration</code> replay integration tests only<br/>
-<code>--component &lt;id&gt;</code> replay samples for specified component id<br/>
-<code>--operation &lt;name&gt;</code> replay samples for specified operation<br/>
-<code>--title &lt;regexp&gt;</code> regexp to match sample titles<br/>
+<code>paths</code> Path(s) to component(s) or a context (default <code>.</code>).<br/>
+<code>--integration</code> Replay integration tests only.<br/>
+<code>--component &lt;id&gt;</code> Replay samples for a specified component <code>id</code>.<br/>
+<code>--operation &lt;name&gt;</code> Replay samples for specified operation.<br/>
+<code>--title &lt;regexp&gt;</code> Regexp to match sample titles.<br/>
+<code>--dock</code> Run in Docker. Applicable only for component samples.
 </dd>
 </dl>
 
@@ -39,7 +40,7 @@ format.
 ```shell
 $ toa replay
 $ toa replay ./path/to/component
-$ toa replay ./components/a ./components/b
+$ toa replay ./components/a ./components/b --dock
 $ toa replay ./components/*
 $ toa replay ./path/to/context
 $ toa replay --title "should add numbers"
@@ -97,7 +98,7 @@ the context will be found and replayed sequentially.
 </dt>
 <dd>Run interactive shell inside a disposable pod.
 
-<code>image</code> docker image<br/>
+<code>image</code> Docker image<br/>
 </dd>
 </dl>
 

package/src/commands/build.js

@@ -4,10 +4,6 @@ const { build } = require('../handlers/build')
 
 const builder = (yargs) => {
   yargs
-    .positional('environment', {
-      type: 'string',
-      desc: 'Deployment environment'
-    })
     .option('path', {
       alias: 'p',
       group: 'Command options:',
@@ -17,7 +13,7 @@ const builder = (yargs) => {
     })
 }
 
-exports.command = 'build [environment]'
-exports.desc = 'Build and push docker images'
+exports.command = 'build'
+exports.desc = 'Build Docker images'
 exports.builder = builder
 exports.handler = build

package/src/commands/push.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { push } = require('../handlers/push')
+
+const builder = (yargs) => {
+  yargs
+    .option('path', {
+      alias: 'p',
+      group: 'Command options:',
+      type: 'string',
+      desc: 'Path to context',
+      default: '.'
+    })
+}
+
+exports.command = 'push'
+exports.desc = 'Build and push Docker images'
+exports.builder = builder
+exports.handler = push

package/src/commands/replay.js

@@ -4,6 +4,10 @@
 
 const { replay } = require('../handlers/replay')
 
+/*
+!!! OPTIONS MUST BE SYNCHRONIZED WITH ../handlers/.replay/args !!!
+ */
+
 const builder = (yargs) => {
   yargs
     .positional('paths', {
@@ -35,6 +39,13 @@ const builder = (yargs) => {
       group: 'Command options:',
       describe: 'Replay samples with titles matching given regexp'
     })
+    .option('dock', {
+      alias: 'd',
+      type: 'boolean',
+      default: false,
+      group: 'Command options:',
+      describe: 'Replay inside Docker container'
+    })
 }
 
 exports.command = 'replay [paths...]'

package/src/handlers/.replay/build.js

@@ -0,0 +1,67 @@
+'use strict'
+
+const { newid } = require('@toa.io/generic')
+const { component: load } = require('@toa.io/norm')
+const { deployment: { Factory } } = require('@toa.io/operations')
+const runtime = require('@toa.io/runtime')
+
+const find = require('../../util/find')
+
+/**
+ * @param {string[]} paths
+ * @return {Promise<string>}
+ */
+async function build (paths) {
+  const context = await createContext(/** @type {string[]} */ paths)
+  const factory = new Factory(context)
+  const registry = factory.registry()
+
+  await registry.build()
+
+  const composition = context.compositions[0].name
+
+  return `${context.name}/composition-${composition}`
+}
+
+/**
+ * @param {string[]} patterns
+ * @return {Promise<toa.norm.Context>}
+ */
+async function createContext (patterns) {
+  const paths = patterns.map((pattern) => find.components(pattern))
+  const components = await loadComponents(paths)
+  const rnd = newid().substring(0, 6)
+  const name = 'replay-' + rnd
+
+  return {
+    name: 'toa-temp',
+    runtime: {
+      version: runtime.version
+    },
+    registry: {
+      platforms: null
+    },
+    compositions: [{
+      name,
+      components
+    }]
+  }
+}
+
+/**
+ * @param {string[]} paths
+ * @return {Promise<toa.norm.Component[]>}
+ */
+async function loadComponents (paths) {
+  const components = []
+
+  for (const path of paths) {
+    const component = await load(path)
+
+    components.push(component)
+  }
+
+  return components
+}
+
+exports.build = build

package/src/handlers/.replay/command.js

@@ -0,0 +1,35 @@
+'use strict'
+
+/**
+ * @param {Record<string, any>} argv
+ */
+const command = (argv) => {
+  const values = pick(argv)
+
+  return format(values)
+}
+
+function pick (argv) {
+  const { component, operation, integration, title } = argv
+  return { component, operation, integration, title }
+}
+
+function format (values) {
+  const args = []
+
+  for (const [name, value] of Object.entries(values)) {
+    if (value === undefined) continue
+
+    args.push('--' + name)
+
+    if (typeof value !== 'boolean') args.push(`"${value}"`)
+  }
+
+  const argumentsString = args.join(' ')
+
+  return COMMAND + argumentsString
+}
+
+const COMMAND = 'toa replay * '
+
+exports.command = command

package/src/handlers/.replay/dock.js

@@ -0,0 +1,18 @@
+'use strict'
+
+const { build } = require('./build')
+const { run } = require('./run')
+const { command } = require('./command')
+
+/**
+ * @param {Record<string, string | string[] | boolean>} argv
+ * @return {Promise<void>}
+ */
+async function dock (argv) {
+  const repository = await build(argv.paths)
+  const cmd = command(argv)
+
+  await run(repository, cmd)
+}
+
+exports.dock = dock

package/src/handlers/.replay/run.js

@@ -0,0 +1,33 @@
+'use strict'
+
+const { spawn, exec } = require('node:child_process')
+const { promisify } = require('node:util')
+
+const { promex } = require('@toa.io/generic')
+
+const execute = promisify(exec)
+
+/**
+ * @param {string} repository
+ * @param {string} command
+ * @return {Promise<void>}
+ */
+async function run (repository, command) {
+  const imagesResult =
+    /** @type {{ stdout: string }} */
+    await execute(`docker images -q ${repository} | head -n 1`)
+
+  const id = imagesResult.stdout.trim()
+  const args = ['run', '--rm', id, 'sh', '-c', command]
+  const done = promex()
+
+  const running = await spawn('docker', args, { stdio: 'inherit' })
+
+  running.on('exit', done.resolve)
+
+  await done
+
+  await execute(`docker rmi ${id}`)
+}
+
+exports.run = run

package/src/handlers/build.js

@@ -6,9 +6,9 @@ const { context: find } = require('../util/find')
 
 const build = async (argv) => {
   const path = find(argv.path)
-  const operator = await boot.deployment(path, argv.environment)
+  const registry = await boot.registry(path)
 
-  await operator.build()
+  await registry.build()
 }
 
 exports.build = build

package/src/handlers/export/images.js

@@ -13,4 +13,12 @@ const prepare = async (argv) => {
   console.log(path)
 }
 
+// const prepare = async (argv) => {
+//   const context = find(argv.path)
+//   const registry = await boot.registry(context)
+//   const path = await registry.prepare(argv.target)
+//
+//   console.log(path)
+// }
+
 exports.prepare = prepare

package/src/handlers/push.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const boot = require('@toa.io/boot')
+
+const { context: find } = require('../util/find')
+
+const push = async (argv) => {
+  const path = find(argv.path)
+  const registry = await boot.registry(path)
+
+  await registry.push()
+}
+
+exports.push = push

package/src/handlers/replay.js

@@ -1,10 +1,16 @@
 'use strict'
 
 const find = require('../util/find')
+const { context, components } = require('@toa.io/userland/samples')
 
+const { dock } = require('./.replay/dock')
+
+/**
+ * @param {Record<string, string | boolean>} argv
+ * @return {Promise<void>}
+ */
 async function replay (argv) {
-  // prevent loading userland which is intended for local use only
-  const { context, components } = require('@toa.io/userland/samples')
+  if (argv.dock) return dock(argv)
 
   /** @type {boolean} */
   let ok

package/src/program.js

@@ -19,7 +19,7 @@ yargs(process.argv.slice(2))
   .fail((msg, err) => {
     const actual = err || new Error(msg)
 
-    console.error(process.env.TOA_DEBUG === '1' ? actual : actual.message)
+    console.error(actual)
 
     process.exit(actual.exitCode > 0 ? actual.exitCode : 1)
   })

package/src/util/find.js

@@ -17,7 +17,7 @@ const find = (from, filename, test) => {
 
     if (found.size === 0) {
       if (test === true) return null
-      else throw new Error(`File '${filename}' is found in ${from.join(', ')}`)
+      else throw new Error(`File '${filename}' is not found in ${from.join(', ')}`)
     }
 
     return [...found]