@toa.io/cli 0.24.0-alpha.2 → 0.24.0-alpha.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "0.24.0-alpha.2",
+  "version": "0.24.0-alpha.21",
   "description": "Toa CLI",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -22,15 +22,16 @@
     "@toa.io/runtime": "*"
   },
   "dependencies": {
-    "@toa.io/console": "0.24.0-alpha.2",
-    "@toa.io/generic": "0.24.0-alpha.2",
-    "@toa.io/kubernetes": "0.24.0-alpha.2",
-    "@toa.io/norm": "0.24.0-alpha.2",
-    "@toa.io/yaml": "0.24.0-alpha.2",
+    "@toa.io/console": "0.24.0-alpha.21",
+    "@toa.io/generic": "0.24.0-alpha.21",
+    "@toa.io/kubernetes": "0.24.0-alpha.21",
+    "@toa.io/norm": "0.24.0-alpha.21",
+    "@toa.io/operations": "0.24.0-alpha.21",
+    "@toa.io/yaml": "0.24.0-alpha.21",
     "dotenv": "16.1.1",
     "find-up": "5.0.0",
     "paseto": "3.1.4",
     "yargs": "17.6.2"
   },
-  "gitHead": "36cea9ed2e8add73748dc921b670ec92a227fed4"
+  "gitHead": "b30bbcf178be9339914e2e5203c61c0da2c3daf2"
 }

package/readme.md

@@ -100,7 +100,8 @@ found and replayed sequentially.
 <dd>Print normalized manifest.
 
 <code>--path</code> path to component (default <code>.</code>)<br/>
-<code>--error</code> print errors only
+<code>--error</code> print errors only<br/>
+<code>--output</code> output format (default <code>yaml</code>)
 </dd>
 </dl>
 

package/src/commands/export/manifest.js

@@ -17,6 +17,13 @@ const builder = (yargs) => {
       desc: 'Path to component',
       default: '.'
     })
+    .option('output', {
+      alias: 'o',
+      group: 'Command options:',
+      choices: ['yaml', 'json'],
+      desc: 'Output format',
+      default: 'yaml'
+    })
 }
 
 exports.command = ['manifest', 'man']

package/src/handlers/build.js

@@ -1,12 +1,12 @@
 'use strict'
 
-const boot = require('@toa.io/boot')
-
 const { context: find } = require('../util/find')
+const { deployment: { Factory } } = require('@toa.io/operations')
 
 const build = async (argv) => {
   const path = find(argv.path)
-  const registry = await boot.registry(path)
+  const factory = await Factory.create(path, argv.environment)
+  const registry = factory.registry()
 
   await registry.build()
 }

package/src/handlers/conceal.js

@@ -1,7 +1,7 @@
 'use strict'
 
+const { deployment: { Factory } } = require('@toa.io/operations')
 const { secrets } = require('@toa.io/kubernetes')
-const boot = require('@toa.io/boot')
 const { context: find } = require('../util/find')
 const { promptSecrets } = require('./env')
 
@@ -28,7 +28,8 @@ async function concealValue (argv) {
 
 async function concealValues (argv) {
   const path = find(argv.path)
-  const operator = await boot.deployment(path, argv.environment)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
   const variables = operator.variables()
   const values = await promptSecrets(variables)
   const groups = groupValues(values)

package/src/handlers/deploy.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const boot = require('@toa.io/boot')
-
+const { deployment: { Factory } } = require('@toa.io/operations')
 const { context: find } = require('../util/find')
 
 /**
@@ -10,7 +9,8 @@ const { context: find } = require('../util/find')
  */
 const deploy = async (argv) => {
   const path = find(argv.path)
-  const operator = await boot.deployment(path, argv.environment)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
 
   if (argv.dry === true) {
     const options = {}

package/src/handlers/docker/build.js

@@ -6,11 +6,6 @@ const { deployment: { Factory } } = require('@toa.io/operations')
 
 const find = require('../../util/find')
 
-/**
- * @param {string} contextPath
- * @param {string[]} componentPatterns
- * @return {Promise<string>}
- */
 async function build (contextPath, componentPatterns) {
   const context = await createContext(contextPath, componentPatterns)
   const factory = new Factory(context)
@@ -23,14 +18,9 @@ async function build (contextPath, componentPatterns) {
   return `${context.registry.base === undefined ? '' : context.registry.base + '/'}${context.name}/composition-${composition}`
 }
 
-/**
- * @param {string} contextPath
- * @param {string[]} componentPatterns
- * @return {Promise<toa.norm.Context>}
- */
 async function createContext (contextPath, componentPatterns) {
   const contextRoot = find.context(contextPath)
-  const context = await norm.context(contextRoot)
+  const context = await norm.context(contextRoot, 'docker')
   const paths = componentPatterns.map((pattern) => find.components(pattern))
   const components = await loadComponents(paths)
   const rnd = newid().substring(0, 6)

package/src/handlers/docker/run.js

@@ -27,11 +27,11 @@ async function run (repository, command, envFile) {
   const args = ['run', '--rm', ...envArgs, id, 'sh', '-c', command]
   const done = promex()
 
-  const running = await spawn('docker', args, { stdio: 'inherit' })
+  const running = spawn('docker', args, { stdio: 'inherit' })
 
   running.on('exit', done.resolve)
 
-  await done
+  const code = await done
 
   await execute(`docker rmi --force ${id}`)
 }

package/src/handlers/env.js

@@ -3,16 +3,16 @@
 const { join } = require('node:path')
 const readline = require('node:readline/promises')
 const { stdin: input, stdout: output } = require('node:process')
-
 const dotenv = require('dotenv')
+const { deployment: { Factory } } = require('@toa.io/operations')
 const { file } = require('@toa.io/filesystem')
-const boot = require('@toa.io/boot')
 const { context: find } = require('../util/find')
 
 async function env (argv) {
   const path = find(argv.path)
   const filepath = join(path, argv.as)
-  const operator = await boot.deployment(path, argv.environment)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
   const variables = operator.variables()
   const currentValues = await read(filepath)
 

package/src/handlers/export/deployment.js

@@ -1,20 +1,20 @@
 'use strict'
 
-const boot = require('@toa.io/boot')
 const { console } = require('@toa.io/console')
-
 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 dump = async (argv) => {
-  const context = find(argv.path)
-  const operator = await boot.deployment(context, argv.environment)
-  const path = await operator.export(argv.target)
+  const path = find(argv.path)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
+  const target = await operator.export(argv.target)
 
-  console.log(path)
+  console.log(target)
 }
 
 exports.dump = dump

package/src/handlers/export/images.js

@@ -1,24 +1,16 @@
 'use strict'
 
-const boot = require('@toa.io/boot')
 const { console } = require('@toa.io/console')
-
 const { context: find } = require('../../util/find')
+const { deployment: { Factory } } = require('@toa.io/operations')
 
 const prepare = async (argv) => {
-  const context = find(argv.path)
-  const operator = await boot.deployment(context)
-  const path = await operator.prepare(argv.target)
+  const path = find(argv.path)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
+  const target = await operator.prepare(argv.target)
 
-  console.log(path)
+  console.log(target)
 }
 
-// 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/export/manifest.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const { component } = require('@toa.io/norm')
-const { dump } = require('@toa.io/yaml')
 const { console } = require('@toa.io/console')
+const yaml = require('@toa.io/yaml')
 
 const { components: find } = require('../../util/find')
 
@@ -13,7 +13,13 @@ const print = async (argv) => {
 
   const manifest = await component(path)
 
-  if (argv.error !== true) console.log(dump(manifest))
+  if (argv.error !== true) {
+    const result = argv.output === 'json'
+      ? JSON.stringify(manifest, null, 2)
+      : yaml.dump(manifest)
+
+    console.log(result)
+  }
 }
 
 exports.manifest = print

package/src/handlers/push.js

@@ -1,12 +1,12 @@
 'use strict'
 
-const boot = require('@toa.io/boot')
-
+const { deployment: { Factory } } = require('@toa.io/operations')
 const { context: find } = require('../util/find')
 
 const push = async (argv) => {
   const path = find(argv.path)
-  const registry = await boot.registry(path)
+  const factory = await Factory.create(path)
+  const registry = factory.registry()
 
   await registry.push()
 }