@toa.io/cli 0.24.0-alpha.11 → 0.24.0-alpha.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "0.24.0-alpha.11",
+  "version": "0.24.0-alpha.13",
   "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.11",
-    "@toa.io/generic": "0.24.0-alpha.11",
-    "@toa.io/kubernetes": "0.24.0-alpha.11",
-    "@toa.io/norm": "0.24.0-alpha.11",
-    "@toa.io/yaml": "0.24.0-alpha.11",
+    "@toa.io/console": "0.24.0-alpha.13",
+    "@toa.io/generic": "0.24.0-alpha.13",
+    "@toa.io/kubernetes": "0.24.0-alpha.13",
+    "@toa.io/norm": "0.24.0-alpha.13",
+    "@toa.io/operations": "0.24.0-alpha.13",
+    "@toa.io/yaml": "0.24.0-alpha.13",
     "dotenv": "16.1.1",
     "find-up": "5.0.0",
     "paseto": "3.1.4",
     "yargs": "17.6.2"
   },
-  "gitHead": "13f93202a38369ed387707c9d08a16c865f799e1"
+  "gitHead": "80310f947c7a1dc9bb9831e98faf2d32ade6a67f"
 }

package/src/handlers/build.js

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

package/src/handlers/conceal.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const { deployment: { Factory } } = require('@toa.io/operations')
 const { secrets } = require('@toa.io/kubernetes')
 const { context: find } = require('../util/find')
 const { promptSecrets } = require('./env')
-const operations = require('./operations')
 
 const conceal = async (argv) => {
   if (argv.interactive) await concealValues(argv)
@@ -28,7 +28,8 @@ async function concealValue (argv) {
 
 async function concealValues (argv) {
   const path = find(argv.path)
-  const operator = await operations.operator(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,6 +1,6 @@
 'use strict'
 
-const operations = require('./operations')
+const { deployment: { Factory } } = require('@toa.io/operations')
 const { context: find } = require('../util/find')
 
 /**
@@ -9,7 +9,8 @@ const { context: find } = require('../util/find')
  */
 const deploy = async (argv) => {
   const path = find(argv.path)
-  const operator = await operations.operator(path, argv.environment)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
 
   if (argv.dry === true) {
     const options = {}

package/src/handlers/env.js

@@ -4,14 +4,15 @@ 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 operations = require('./operations')
 const { context: find } = require('../util/find')
 
 async function env (argv) {
   const path = find(argv.path)
   const filepath = join(path, argv.as)
-  const operator = await operations.operator(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

@@ -2,7 +2,7 @@
 
 const { console } = require('@toa.io/console')
 const { context: find } = require('../../util/find')
-const operations = require('../operations')
+const { deployment: { Factory } } = require('@toa.io/operations')
 
 /**
  * @param {{ path: string, target: string, environment?: string }} argv
@@ -10,7 +10,8 @@ const operations = require('../operations')
  */
 const dump = async (argv) => {
   const path = find(argv.path)
-  const operator = await operations.operator(path, argv.environment)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
   const target = await operator.export(argv.target)
 
   console.log(target)

package/src/handlers/export/images.js

@@ -2,11 +2,12 @@
 
 const { console } = require('@toa.io/console')
 const { context: find } = require('../../util/find')
-const operations = require('../operations')
+const { deployment: { Factory } } = require('@toa.io/operations')
 
 const prepare = async (argv) => {
   const path = find(argv.path)
-  const operator = await operations.operator(path, argv.environment)
+  const factory = await Factory.create(path, argv.environment)
+  const operator = factory.operator()
   const target = await operator.prepare(argv.target)
 
   console.log(target)

package/src/handlers/push.js

@@ -1,11 +1,12 @@
 'use strict'
 
-const operations = require('./operations')
+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 operations.registry(path)
+  const factory = await Factory.create(path)
+  const registry = factory.registry()
 
   await registry.push()
 }

package/src/handlers/operations/index.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const { operator } = require('./operator')
-const { registry } = require('./registry')
-
-exports.operator = operator
-exports.registry = registry

package/src/handlers/operations/operator.js

@@ -1,13 +0,0 @@
-'use strict'
-
-const { context: load } = require('@toa.io/norm')
-const { deployment: { Factory } } = require('@toa.io/operations')
-
-async function operator (path, environment) {
-  const context = await load(path, environment)
-  const factory = new Factory(context)
-
-  return factory.operator()
-}
-
-exports.operator = operator

package/src/handlers/operations/registry.js

@@ -1,13 +0,0 @@
-'use strict'
-
-const { context: load } = require('@toa.io/norm')
-const { deployment: { Factory } } = require('@toa.io/operations')
-
-async function registry (path) {
-  const context = await load(path)
-  const factory = new Factory(context)
-
-  return factory.registry()
-}
-
-exports.registry = registry