@toa.io/extensions.origins 0.20.0-dev.16 → 0.20.0-dev.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.origins",
-  "version": "0.20.0-dev.16",
+  "version": "0.20.0-dev.18",
   "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.16",
-    "@toa.io/generic": "0.20.0-dev.16",
-    "@toa.io/schemas": "0.20.0-dev.16",
-    "@toa.io/yaml": "0.20.0-dev.16",
+    "@toa.io/core": "0.20.0-dev.18",
+    "@toa.io/generic": "0.20.0-dev.18",
+    "@toa.io/schemas": "0.20.0-dev.18",
+    "@toa.io/yaml": "0.20.0-dev.18",
     "comq": "0.8.0",
     "node-fetch": "2.6.7"
   },
   "devDependencies": {
     "@types/node-fetch": "2.6.2"
   },
-  "gitHead": "ea33b54b708fe3f97949143c72c5e1d6606fd5ec"
+  "gitHead": "24c2fccf1af324fc4b0e32d5e3e012786618f5bb"
 }

package/source/.credentials.js

@@ -5,6 +5,7 @@
  */
 function check (reference) {
   if (typeof reference !== 'string') return // aspect properties object
+  if (!URL.canParse(reference)) return
 
   const url = new URL(reference)
 

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/factory.js

@@ -32,6 +32,8 @@ class Factory {
         continue
       }
 
+      if (!URL.canParse(reference)) throw new Error(`${reference} is invalid URL`)
+
       const url = new URL(reference)
 
       if (protocol.protocols.includes(url.protocol)) protocolManifest[origin] = reference

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/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>
-/^[a-zA-Z0-9]{1,32}$/: uri
+/^[a-zA-Z0-9]{1,32}$/: string