@toa.io/cli 1.0.0-alpha.9 → 1.0.0-alpha.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-alpha.91",
   "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.9",
-    "@toa.io/generic": "1.0.0-alpha.9",
-    "@toa.io/kubernetes": "1.0.0-alpha.9",
-    "@toa.io/norm": "1.0.0-alpha.9",
-    "@toa.io/operations": "1.0.0-alpha.9",
-    "@toa.io/yaml": "1.0.0-alpha.9",
+    "@toa.io/generic": "1.0.0-alpha.63",
+    "@toa.io/kubernetes": "1.0.0-alpha.63",
+    "@toa.io/norm": "1.0.0-alpha.91",
+    "@toa.io/operations": "1.0.0-alpha.91",
+    "@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.91",
     "paseto": "3.1.4",
     "yargs": "17.6.2"
   },
-  "gitHead": "017a3fa22e8c60654c240f8e55908773d44d4ed1"
+  "gitHead": "fb3644243517fad0327e75e055c1f663cee503d8"
 }

package/readme.md

@@ -66,15 +66,32 @@ Credentials specified in the output file are preserved.
 <dt><code>toa export manifest</code></dt>
 <dd>Print normalized manifest.
 
-<code>--path</code> path to component (default <code>.</code>)<br/>
+<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>
 
-### export entity
+### export secrets
 
-Same as `exprot manifest` but outputs only the `entity`.
+<dl>
+<dt><code>toa export secrets &lt;environment&gt;</code></dt>
+<dd>Print deployment secrets.
+
+<code>--path</code> path to context (default <code>.</code>)<br/>
+</dd>
+</dl>
+
+### export image tags
+
+<dl>
+<dt><code>toa export tags &lt;environment&gt;</code></dt>
+<dd>Print image tags.
+
+<code>--path</code> path to context (default <code>.</code>)<br/>
+</dd>
+</dl>
 
 ## Operations
 

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/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/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