@toa.io/extensions.origins 0.20.0-dev.2 → 0.20.0-dev.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.origins",
-  "version": "0.20.0-dev.2",
+  "version": "0.20.0-dev.21",
   "description": "Toa Origins",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,15 +19,15 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "0.20.0-dev.2",
-    "@toa.io/generic": "0.20.0-dev.2",
-    "@toa.io/schemas": "0.20.0-dev.2",
-    "@toa.io/yaml": "0.20.0-dev.2",
-    "comq": "0.7.0",
+    "@toa.io/core": "0.20.0-dev.21",
+    "@toa.io/generic": "0.20.0-dev.21",
+    "@toa.io/schemas": "0.20.0-dev.21",
+    "@toa.io/yaml": "0.20.0-dev.21",
+    "comq": "0.8.0",
     "node-fetch": "2.6.7"
   },
   "devDependencies": {
     "@types/node-fetch": "2.6.2"
   },
-  "gitHead": "3e767a32bf4705bacee7b2e8312ed0b0805a5260"
+  "gitHead": "7dbe313e05e714e35401adb5f0507e140f3f1215"
 }

package/readme.md

@@ -125,6 +125,7 @@ and `password`.
 
 ```shell
 # deploy credentials to the current kubectl context
-$ toa conceal origins-dummies-dummiy-messages username developer
-$ toa conceal origins-dummies-dummiy-messages password secret
+$ toa conceal origins-dummies-dummiy-messages username=developer password=secret
 ```
+
+See [`toa conceal`](/runtime/cli/readme.md#conceal).

package/source/.credentials.js

@@ -6,7 +6,13 @@
 function check (reference) {
   if (typeof reference !== 'string') return // aspect properties object
 
-  const url = new URL(reference)
+  let url
+
+  try {
+    url = new URL(reference)
+  } catch {
+    return
+  }
 
   if (url.username !== '' || url.password !== '') throw new Error('Origins must not contain credentials. Please use environment secrets instead.')
 }

package/source/deployment.test.js

@@ -62,16 +62,6 @@ describe('validation', () => {
 
     expect(() => deployment(components, annotations)).toThrow('must be object')
   })
-
-  it('should throw if annotation is URI is not valid', async () => {
-    const annotations = {
-      [component.locator.id]: {
-        [origin]: 'hello!'
-      }
-    }
-
-    expect(() => deployment(components, annotations)).toThrow('must match format')
-  })
 })
 
 it('should create variables', () => {

package/source/manifest.test.js

@@ -32,12 +32,6 @@ it('should pass if valid', async () => {
   expect(() => manifest(input)).not.toThrow()
 })
 
-it('should fail if not uri', async () => {
-  const input = { [generate()]: generate() }
-
-  expect(() => manifest(input)).toThrow('must match format')
-})
-
 it('should throw if protocol is not supported', async () => {
   const input = { foo: 'wat://' + generate() }
 

package/source/protocols/amqp/.test/mock.comq.js

@@ -2,7 +2,7 @@
 
 const { generate } = require('randomstring')
 
-const connect = jest.fn(async () => ({
+const assert = jest.fn(async () => ({
   emit: jest.fn(async () => undefined),
   request: jest.fn(async () => generate()),
   reply: jest.fn(async () => undefined),
@@ -10,4 +10,4 @@ const connect = jest.fn(async () => ({
   close: jest.fn(async () => undefined)
 }))
 
-exports.connect = connect
+exports.assert = assert

package/source/protocols/amqp/aspect.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { connect } = require('comq')
+const { assert } = require('comq')
 const { Connector } = require('@toa.io/core')
 const { shards } = require('@toa.io/generic')
 
@@ -44,7 +44,7 @@ class Aspect extends Connector {
 
   #open = async ([origin, reference]) => {
     const references = shards(reference)
-    const io = await connect(...references)
+    const io = await assert(...references)
 
     this.#origins[origin] = restrict(io)
   }

package/source/protocols/amqp/aspect.test.js

@@ -41,7 +41,7 @@ it('should connect', async () => {
   await aspect.open()
 
   for (const reference of Object.values(manifest)) {
-    expect(comq.connect).toHaveBeenCalledWith(reference)
+    expect(comq.assert).toHaveBeenCalledWith(reference)
   }
 })
 
@@ -60,7 +60,7 @@ it('should connect to shards', async () => {
 
   await aspect.open()
 
-  expect(comq.connect).toHaveBeenCalledWith(...shards)
+  expect(comq.assert).toHaveBeenCalledWith(...shards)
 })
 
 it('should disconnect', async () => {
@@ -68,8 +68,8 @@ it('should disconnect', async () => {
   await aspect.close()
 
   for (const reference of Object.values(manifest)) {
-    const index = comq.connect.mock.calls.findIndex((call) => call[0] === reference)
-    const io = await comq.connect.mock.results[index].value
+    const index = comq.assert.mock.calls.findIndex((call) => call[0] === reference)
+    const io = await comq.assert.mock.results[index].value
 
     expect(io.close).toHaveBeenCalled()
   }
@@ -92,9 +92,9 @@ describe('invoke', () => {
     origin = sample(origins)
 
     const reference = manifest[origin]
-    const index = comq.connect.mock.calls.findIndex((call) => call[0] === reference)
+    const index = comq.assert.mock.calls.findIndex((call) => call[0] === reference)
 
-    io = await comq.connect.mock.results[index].value
+    io = await comq.assert.mock.results[index].value
     args = [generate(), generate(), generate()]
   })
 

package/source/protocols/amqp/deployment.js

@@ -15,9 +15,13 @@ function deployment (instances) {
     const secrets = []
 
     for (const [origin, reference] of Object.entries(manifest)) {
-      const url = new URL(reference)
+      let protocol
 
-      if (protocols.includes(url.protocol)) {
+      const match = reference.match(RX)
+
+      if (match !== null) protocol = match.groups.protocol
+
+      if (protocols.includes(protocol)) {
         const originSecrets = createSecrets(locator, origin)
 
         secrets.push(...originSecrets)
@@ -60,4 +64,6 @@ function createSecret (locator, origin, property) {
   }
 }
 
+const RX = /^(?<protocol>\w{1,12}:)/
+
 exports.deployment = deployment

package/source/schemas/manifest.cos.yaml

@@ -1,2 +1,2 @@
 /^\./: <boolean>
-/^[^.]/: uri
+/^[a-zA-Z0-9]{1,32}$/: string