@toa.io/cli 1.0.0-alpha.7 → 1.0.0-alpha.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.72",
   "description": "Toa CLI",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -22,16 +22,17 @@
     "@toa.io/runtime": "*"
   },
   "dependencies": {
-    "@toa.io/console": "1.0.0-alpha.7",
-    "@toa.io/generic": "1.0.0-alpha.7",
-    "@toa.io/kubernetes": "1.0.0-alpha.7",
-    "@toa.io/norm": "1.0.0-alpha.7",
-    "@toa.io/operations": "1.0.0-alpha.7",
-    "@toa.io/yaml": "1.0.0-alpha.7",
+    "@toa.io/generic": "1.0.0-alpha.63",
+    "@toa.io/kubernetes": "1.0.0-alpha.63",
+    "@toa.io/norm": "1.0.0-alpha.67",
+    "@toa.io/operations": "1.0.0-alpha.72",
+    "@toa.io/yaml": "1.0.0-alpha.63",
     "dotenv": "16.1.1",
     "find-up": "5.0.0",
+    "jsonpath": "1.1.1",
+    "openspan": "1.0.0-alpha.67",
     "paseto": "3.1.4",
     "yargs": "17.6.2"
   },
-  "gitHead": "4f5ac0bc342d4b7bd469fbe5c74266f050b55c9f"
+  "gitHead": "919b587dfcdfab40d18f0f8bd24b34d8107f811a"
 }

package/readme.md

@@ -60,54 +60,39 @@ Credentials specified in the output file are preserved.
 
 > It is recommended to add `.env*` to `.gitignore`.
 
-### replay
-
-[Replay](/extensions/sampling/docs/replay.md) samples. Reports in [TAP](https://testanything.org)
-format.
+### export manifest
 
 <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>--component &lt;id&gt;</code> Replay samples for a specified component <code>id</code>.<br/>
-<code>--integration</code> Replay integration tests only.<br/>
-<code>--autonomous</code> Replay autonomous tests only.<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.
+<dt><code>toa export manifest</code></dt>
+<dd>Print normalized manifest.
+
+<code>--path</code> path to a component (default <code>.</code>)<br/>
+<code>--jsonpath</code> JSONPath expression to filter the output<br/>
+<code>--error</code> print errors only<br/>
+<code>--output</code> output format (default <code>yaml</code>)
 </dd>
 </dl>
 
-#### Examples
+### export secrets
 
-```shell
-$ toa replay
-$ toa replay ./path/to/component
-$ toa replay ./components/a ./components/b --dock
-$ toa replay ./components/*
-$ toa replay ./path/to/context
-$ toa replay --title "should add numbers"
-```
+<dl>
+<dt><code>toa export secrets &lt;environment&gt;</code></dt>
+<dd>Print deployment secrets.
 
-If the path is a Context root (containing `context.toa.yaml` file), samples for components within
-the Context will be found and replayed sequentially.
+<code>--path</code> path to context (default <code>.</code>)<br/>
+</dd>
+</dl>
 
-### export manifest
+### export image tags
 
 <dl>
-<dt><code>toa export manifest</code></dt>
-<dd>Print normalized manifest.
+<dt><code>toa export tags &lt;environment&gt;</code></dt>
+<dd>Print image tags.
 
-<code>--path</code> path to component (default <code>.</code>)<br/>
-<code>--error</code> print errors only<br/>
-<code>--output</code> output format (default <code>yaml</code>)
+<code>--path</code> path to context (default <code>.</code>)<br/>
 </dd>
 </dl>
 
-### export entity
-
-Same as `exprot manifest` but outputs only the `entity`.
-
 ## Operations
 
 > Some commands use current `kubectl` and `docker` context.

package/src/commands/deploy.js

@@ -34,6 +34,12 @@ const builder = (yargs) => {
       boolean: true,
       desc: 'Wait for deployment ready state'
     })
+    .option('timeout', {
+      alias: 't',
+      group: 'Command options:',
+      type: 'string',
+      desc: 'Deployment timeout'
+    })
 }
 
 exports.command = 'deploy [environment]'

package/src/commands/export/manifest.js

@@ -17,6 +17,12 @@ const builder = (yargs) => {
       desc: 'Path to a component',
       default: '.'
     })
+    .option('jsonpath', {
+      alias: 'j',
+      group: 'Command options:',
+      type: 'string',
+      desc: 'JSONPath expression'
+    })
     .option('output', {
       alias: 'o',
       group: 'Command options:',

package/src/commands/export/secrets.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const { secrets } = require('../../handlers/export/secrets')
+
+const builder = (yargs) => {
+  yargs
+    .positional('environment', {
+      type: 'string',
+      desc: 'Deployment environment'
+    })
+    .option('path', {
+      alias: 'p',
+      group: 'Command options:',
+      type: 'string',
+      desc: 'Path to context',
+      default: '.'
+    })
+}
+
+exports.command = ['secrets <environment>']
+exports.desc = 'Export deployment secrets'
+exports.builder = builder
+exports.handler = secrets

package/src/commands/export/tags.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const { tags } = require('../../handlers/export/tags')
+
+const builder = (yargs) => {
+  yargs
+    .positional('environment', {
+      type: 'string',
+      desc: 'Deployment environment'
+    })
+    .option('path', {
+      alias: 'p',
+      group: 'Command options:',
+      type: 'string',
+      desc: 'Path to context',
+      default: '.'
+    })
+}
+
+exports.command = ['tags <environment>']
+exports.desc = 'Export image tags'
+exports.builder = builder
+exports.handler = tags

package/src/handlers/compose.js

@@ -5,6 +5,7 @@ const boot = require('@toa.io/boot')
 const { version } = require('@toa.io/runtime')
 
 const docker = require('./docker')
+const { graceful } = require('./lib/graceful')
 const { components: find } = require('../util/find')
 
 /**
@@ -22,6 +23,8 @@ async function compose (argv) {
   await composition.connect()
 
   if (argv.kill === true) await composition.disconnect()
+
+  return graceful(composition)
 }
 
 /**

package/src/handlers/deploy.js

@@ -25,6 +25,7 @@ const deploy = async (argv) => {
 
     if (argv.namespace !== undefined) options.namespace = argv.namespace
     if (argv.wait === true) options.wait = true
+    if (argv.timeout !== undefined) options.timeout = argv.timeout
 
     await operator.install(options)
   }

package/src/handlers/docker/build.js

@@ -14,8 +14,9 @@ async function build (contextPath, componentPatterns) {
   await registry.build()
 
   const composition = context.compositions[0].name
+  const base = context.registry.base === undefined ? '' : context.registry.base + '/'
 
-  return `${context.registry.base === undefined ? '' : context.registry.base + '/'}${context.name}/composition-${composition}`
+  return `${base}${context.name}/composition-${composition}`
 }
 
 async function createContext (contextPath, componentPatterns) {
@@ -24,10 +25,13 @@ async function createContext (contextPath, componentPatterns) {
   const paths = componentPatterns.map((pattern) => find.components(pattern))
   const components = await loadComponents(paths)
   const rnd = newid().substring(0, 6)
-  const name = 'replay-' + rnd
+  const name = 'temp-' + rnd
 
   context.name += '-' + rnd
-  context.compositions = [{ name, components }]
+  context.compositions = [{
+    name,
+    components
+  }]
 
   return context
 }

package/src/handlers/export/deployment.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { console } = require('@toa.io/console')
 const { context: find } = require('../../util/find')
 const { deployment: { Factory } } = require('@toa.io/operations')
 

package/src/handlers/export/images.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { console } = require('@toa.io/console')
 const { context: find } = require('../../util/find')
 const { deployment: { Factory } } = require('@toa.io/operations')
 

package/src/handlers/export/manifest.js

@@ -1,7 +1,7 @@
 'use strict'
 
+const jsonpath = require('jsonpath')
 const { component } = require('@toa.io/norm')
-const { console } = require('@toa.io/console')
 const yaml = require('@toa.io/yaml')
 
 const { components: find } = require('../../util/find')
@@ -11,7 +11,10 @@ const print = async (argv) => {
 
   if (path === undefined) throw new Error(`No component found in ${argv.path}`)
 
-  const manifest = await component(path)
+  let manifest = await component(path)
+
+  if (argv.jsonpath !== undefined)
+    manifest = jsonpath.value(manifest, argv.jsonpath)
 
   if (argv.error !== true) {
     const result = argv.output === 'json'

package/src/handlers/export/secrets.js

@@ -0,0 +1,40 @@
+'use strict'
+
+const { context: find } = require('../../util/find')
+const { deployment: { Factory } } = require('@toa.io/operations')
+
+/**
+ * @param {{ path: string, target: string, environment: string }} argv
+ * @returns {Promise<void>}
+ */
+const secrets = async (argv) => {
+  const path = find(argv.path)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
+  const secrets = operator
+    .variables()
+    .filter(({ secret }) => secret !== undefined)
+    .map(({ secret }) => secret)
+    .sort((a, b) => a.name.localeCompare(b.name))
+
+  const groups = []
+  let current = null
+
+  for (const secret of secrets) {
+    if (current === null || current.name !== secret.name) {
+      current = { name: secret.name, keys: new Map() }
+      groups.push(current)
+    }
+
+    current.keys.set(secret.key, secret.optional)
+  }
+
+  for (const group of groups) {
+    console.log(`${group.name}:`)
+
+    for (const [key, optional] of group.keys)
+      console.log('  ' + key + (optional ? ' (optional)' : ''))
+  }
+}
+
+exports.secrets = secrets

package/src/handlers/export/tags.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const { context: find } = require('../../util/find')
+const { deployment: { Factory } } = require('@toa.io/operations')
+
+/**
+ * @param {{ path: string, target: string, environment: string }} argv
+ * @returns {Promise<void>}
+ */
+const tags = async (argv) => {
+  const path = find(argv.path)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
+  const tags = operator.tags()
+
+  for (const tag of tags)
+    console.log(tag)
+}
+
+exports.tags = tags

package/src/handlers/lib/graceful.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const { console } = require('openspan')
+
+function graceful (connector) {
+  ['SIGTERM', 'SIGINT']
+    .forEach(signal => process.once(signal, async () => {
+      console.info('Shutting down', { signal })
+
+      await connector.disconnect()
+    }))
+}
+
+exports.graceful = graceful

package/src/handlers/serve.js

@@ -4,6 +4,7 @@ const boot = require('@toa.io/boot')
 const { shortcuts } = require('@toa.io/norm')
 const { directory: { find } } = require('@toa.io/filesystem')
 const { version } = require('@toa.io/runtime')
+const { graceful } = require('./lib/graceful')
 
 const serve = async (argv) => {
   console.log('Runtime', version)
@@ -22,8 +23,7 @@ const serve = async (argv) => {
 
   await service.connect()
 
-  // for tests
-  return service
+  return graceful(service)
 }
 
 exports.serve = serve

package/src/program.js

@@ -4,7 +4,6 @@
 
 const yargs = require('yargs/yargs')
 
-const { console } = require('@toa.io/console')
 const { version } = require('@toa.io/runtime')
 
 yargs(process.argv.slice(2))
@@ -13,8 +12,6 @@ yargs(process.argv.slice(2))
   })
   .middleware((argv) => {
     if (argv.log === undefined) argv.log = process.env.TOA_DEBUG === '1' ? 'debug' : 'info'
-
-    console.level(argv.log)
   })
   .middleware(async (argv) => {
     if (argv.env === undefined) return

package/types/deploy.d.ts

@@ -1,10 +1,11 @@
 declare namespace toa.cli.deploy {
 
-    interface Arguments {
-        path: string
-        environment?: string
-        namespace?: string
-        dry: boolean
-        wait: boolean
-    }
+  interface Arguments {
+    path: string
+    environment?: string
+    namespace?: string
+    dry: boolean
+    wait: boolean
+    timeout: string
+  }
 }

package/src/commands/export/entity.js

@@ -1,26 +0,0 @@
-'use strict'
-
-const { manifest } = require('../../handlers/export/entity')
-
-const builder = (yargs) => {
-  yargs
-    .option('path', {
-      alias: 'p',
-      group: 'Command options:',
-      type: 'string',
-      desc: 'Path to a component',
-      default: '.'
-    })
-    .option('output', {
-      alias: 'o',
-      group: 'Command options:',
-      choices: ['yaml', 'json'],
-      desc: 'Output format',
-      default: 'yaml'
-    })
-}
-
-exports.command = 'entity'
-exports.desc = 'Print entity'
-exports.builder = builder
-exports.handler = manifest

package/src/commands/replay.js

@@ -1,66 +0,0 @@
-// noinspection JSCheckFunctionSignatures
-
-'use strict'
-
-const { replay } = require('../handlers/replay')
-
-/*
-!!! OPTIONS MUST BE SYNCHRONIZED WITH ../handlers/.replay/args !!!
- */
-
-const builder = (yargs) => {
-  yargs
-    .positional('paths', {
-      type: 'string',
-      desc: 'Paths to components or context',
-      default: '.'
-    })
-    .option('component', {
-      alias: 'c',
-      type: 'string',
-      group: 'Command options:',
-      describe: 'Replay samples for specified component'
-    })
-    .option('autonomous', {
-      alias: 'a',
-      type: 'boolean',
-      group: 'Command options:',
-      describe: 'Replay autonomous tests only'
-    })
-    .option('integration', {
-      alias: 'i',
-      type: 'boolean',
-      group: 'Command options:',
-      describe: 'Replay integration tests only'
-    })
-    .option('operation', {
-      alias: 'o',
-      type: 'string',
-      group: 'Command options:',
-      describe: 'Replay samples for specified operation'
-    })
-    .option('title', {
-      alias: 't',
-      type: 'string',
-      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'
-    })
-    .option('context', {
-      group: 'Command options:',
-      type: 'string',
-      desc: 'Path to the Context (used with --dock)',
-      default: '.'
-    })
-}
-
-exports.command = 'replay [paths...]'
-exports.desc = 'Replay samples'
-exports.builder = builder
-exports.handler = replay

package/src/handlers/export/entity.js

@@ -1,27 +0,0 @@
-'use strict'
-
-const { component } = require('@toa.io/norm')
-const { console } = require('@toa.io/console')
-const yaml = require('@toa.io/yaml')
-
-const { components: find } = require('../../util/find')
-
-const print = async (argv) => {
-  const path = find(argv.path)
-
-  if (path === undefined) throw new Error(`No component found in ${argv.path}`)
-
-  const manifest = await component(path)
-  const entity = manifest.entity
-
-  if (entity === undefined)
-    return
-
-  const result = argv.output === 'json'
-    ? JSON.stringify(entity, null, 2)
-    : yaml.dump(entity)
-
-  console.log(result)
-}
-
-exports.manifest = print

package/src/handlers/replay.js

@@ -1,64 +0,0 @@
-'use strict'
-
-const { pick } = require('@toa.io/generic')
-const { context, components } = require('@toa.io/userland/samples')
-
-const find = require('../util/find')
-const docker = require('./docker')
-
-/**
- * @param {Record<string, string | string[] | boolean>} argv
- * @return {Promise<void>}
- */
-async function replay (argv) {
-  if (argv.dock) return dock(argv)
-
-  /** @type {boolean} */
-  let ok
-
-  const paths = find.components(argv.paths, true)
-
-  /** @type {toa.samples.suite.Options} */
-  const options = {
-    component: argv.component,
-    autonomous: argv.autonomous,
-    integration: argv.integration,
-    operation: argv.operation,
-    title: argv.title,
-    runner: { bail: true }
-  }
-
-  if (paths !== null) {
-    ok = await components(paths, options)
-  } else {
-    // no components found, checking context
-    const path = find.context(argv.paths[0], true)
-
-    if (path === null) throw new Error('Neither components nor context found in ' + argv.paths.join(','))
-
-    ok = await context(path, options)
-  }
-
-  const message = (ok ? GREEN + 'PASSED' : RED + 'FAILED') + RESET
-
-  // print after tap's output
-  process.on('beforeExit', () => console.log(message))
-}
-
-/**
- * @param {Record<string, string | string[] | boolean>} argv
- * @return {Promise<void>}
- */
-async function dock (argv) {
-  const repository = await docker.build(argv.context, argv.paths)
-  const args = pick(argv, ['component', 'operation', 'integration', 'title'])
-  const command = docker.command('toa replay *', args)
-
-  await docker.run(repository, command, argv.env)
-}
-
-const GREEN = '\x1b[32m'
-const RED = '\x1b[31m'
-const RESET = '\x1b[0m'
-
-exports.replay = replay