@toa.io/cli 1.0.1 → 1.1.0-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "1.0.1",
+  "version": "1.1.0-dev.0",
   "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.10.0",
-    "@toa.io/kubernetes": "0.7.4",
-    "@toa.io/norm": "1.0.1",
-    "@toa.io/yaml": "0.7.5",
+    "@toa.io/generic": "0.11.0-dev.0",
+    "@toa.io/kubernetes": "0.7.5-dev.0",
+    "@toa.io/norm": "1.0.2-dev.0",
+    "@toa.io/yaml": "0.7.6-dev.0",
     "find-up": "5.0.0",
     "yargs": "17.6.2"
   },
-  "gitHead": "25fdf15b413338d49b16ddefe17807e4e746f37e"
+  "gitHead": "44a59b3ec335a1be8655b543891767bae799dba1"
 }

package/readme.md

@@ -2,43 +2,21 @@
 
 ## Development
 
-### configure
-
-Outputs shell commands to manipulate local environment variables, thus must be piped
-with `source /dev/stdin` to apply.
+### env
 
 <dl>
-<dt><code>toa configure &lt;key&gt; [value]</code></dt>
-<dd>
-Set Configuration Object key. Nested keys are addressed with dot notation.
-
-<code>--path</code> path to component (default <code>.</code>)<br/>
-<code>--reset</code> clear <code>key</code><br/>
-
-#### Examples
-
-> It is assumed you are in the component's directory, use `--path` otherwise.
-
-```shell
-# set new value
-$ toa configure foo 'new value' | source /dev/stdin
-```
-
-```shell
-# clear key
-$ toa configure bar.baz --reset | source /dev/stdin
-```
-
-</dd>
-<dt><code>toa configure reset</code></dt>
-<dd>Remove Configuration Object.</dd>
-<dt><code>toa configure print</code></dt>
-<dd>Output Configuration Object as YAML.
+<dt><code>toa env [environment]</code></dt>
+<dd>Set local environment variables to a <code>.env</code> file.
 
-<code>--json</code> as JSON
+<code>environment</code> deployment environment name (default <code>local</code>).<br/>
+<code>--path</code> path to context (default <code>.</code>)<br/>
 </dd>
 </dl>
 
+Credentials specified in `.env` 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)
@@ -66,11 +44,9 @@ $ toa replay ./path/to/context
 $ toa replay --title "should add numbers"
 ```
 
-If path is a context directory (containing `context.toa.yaml` file), samples for components within
+If a path is a context directory (containing `context.toa.yaml` file), samples for components within
 the context will be found and replayed sequentially.
 
-## Exporting
-
 ### export manifest
 
 <dl>
@@ -81,22 +57,6 @@ the context will be found and replayed sequentially.
 <code>--error</code> print errors only<br/>
 </dd>
 </dl>
-
-### env
-
-<dl>
-<dt><code>toa env [environment]</code></dt>
-<dd>Select environment. Set local environment variables to <code>.env</code> file.
-
-<code>environment</code> deployment environment name (default <code>local</code>).<br/>
-<code>--path</code> path to context (default <code>.</code>)<br/>
-</dd>
-</dl>
-
-> It is recommended to add `.env` to `.gitignore`.
-
-> Credentials specified in a `.env` file are preserved during environment selection.
-
 ## Deployment
 
 > Deployment commands use current `kubectl` context.
@@ -116,7 +76,6 @@ the context will be found and replayed sequentially.
 <dl>
 <dt>
 <code>toa conceal</code>
-<img src="https://img.shields.io/badge/Not_Implemented-red" alt="Not Implemented"/>
 </dt>
 <dd>Deploy new declared secrets.
 

package/src/handlers/conceal.js

@@ -4,8 +4,12 @@ const { secrets } = require('@toa.io/kubernetes')
 
 const conceal = async (argv) => {
   const { secret, key, value } = argv
+  const prefixed = PREFIX + secret
 
-  await secrets.store(secret, { [key]: value })
+  await secrets.store(prefixed, { [key]: value })
 }
 
+const PREFIX = 'toa-'
+
 exports.conceal = conceal
+exports.PREFIX = PREFIX

package/src/handlers/reveal.js

@@ -3,8 +3,11 @@
 const { secrets } = require('@toa.io/kubernetes')
 const { remap, decode } = require('@toa.io/generic')
 
+const { PREFIX } = require('./conceal')
+
 const reveal = async (argv) => {
-  const secret = await secrets.get(argv.secret)
+  const prefixed = PREFIX + argv.secret
+  const secret = await secrets.get(prefixed)
   const values = remap(secret.data, decode)
 
   for (const [key, value] of Object.entries(values)) {

package/src/commands/configure.js

@@ -1,43 +0,0 @@
-'use strict'
-
-const { configure } = require('../handlers/configure')
-
-const builder = (yargs) => {
-  yargs
-    .positional('key', {
-      type: 'string',
-      desc: 'Configuration Object key'
-    })
-    .positional('value', {
-      type: 'string',
-      desc: 'Key value'
-    })
-    .option('path', {
-      alias: 'p',
-      group: 'Command options:',
-      describe: 'Path to component',
-      type: 'string',
-      default: '.'
-    })
-    .option('reset', {
-      group: 'Command options:',
-      type: 'boolean',
-      desc: 'Remove Configuration Object key'
-    })
-    .option('json', {
-      group: 'Command options:',
-      type: 'boolean',
-      desc: 'Print as JSON'
-    })
-    .example([
-      ['$0 configure myKey \'new value\' | source /dev/stdin'],
-      ['$0 configure myObject.myKey --reset | source /dev/stdin'],
-      ['$0 configure reset | source /dev/stdin'],
-      ['$0 configure print --json']
-    ])
-}
-
-exports.command = 'configure [key] [value]'
-exports.desc = 'Output shell command to update local environment Configuration Object'
-exports.builder = builder
-exports.handler = configure

package/src/handlers/.configure/subcommands.js

@@ -1,15 +0,0 @@
-'use strict'
-
-const { dump } = require('@toa.io/yaml')
-
-const reset = (provider) => console.log('unset ' + provider.key)
-
-const print = async (provider, argv) => {
-  await provider.connect()
-
-  const formatter = argv.json ? JSON.stringify : dump
-
-  console.log(formatter(provider.object))
-}
-
-exports.subcommands = { print, reset }

package/src/handlers/configure.js

@@ -1,46 +0,0 @@
-'use strict'
-
-const boot = require('@toa.io/boot')
-
-const { Factory } = require('@toa.io/extensions.configuration')
-
-const { subcommands } = require('./.configure/subcommands')
-const { components: find } = require('../util/find')
-
-async function configure (argv) {
-  const path = find(argv.path)
-  const manifest = await boot.manifest(path)
-  const factory = new Factory()
-  const provider = factory.provider(manifest)
-
-  if (argv.value === undefined && subcommands[argv.key] !== undefined) {
-    await subcommands[argv.key](provider, argv)
-
-    return
-  }
-
-  await provider.connect()
-
-  let key = argv.key
-  let value = argv.value
-
-  // :(
-  if (key !== undefined) {
-    if (value === undefined && key.includes('=')) [key, value] = key.split('=')
-
-    if (value === undefined) {
-      if (argv.reset !== true) throw new Error('Key value expected')
-      else provider.unset(key)
-    } else provider.set(key, value)
-  }
-
-  let command
-  const exported = provider.export()
-
-  if (exported === undefined) command = `unset ${provider.key}`
-  else command = `export ${provider.key}=` + exported
-
-  console.log(command)
-}
-
-exports.configure = configure