notary-rest validation up & running through notary-hive

notaryio · Oct 3, 2017 · 5c853e7 · 5c853e7
1 parent af1c0e5
commit 5c853e7
Show file tree

Hide file tree

Showing 14 changed files with 1,529 additions and 182 deletions.
diff --git a/packages/notary-core/src/contracts/contract.js b/packages/notary-core/src/contracts/contract.js
@@ -18,7 +18,15 @@ export default class Contract {
     this.validate();
 
     if (!this.name) {
-      this.name = this.meta.name ? this.meta.name : `default__${this.type}__${this.integrationType}`;
+      if (this.meta.name) {
+        this.name = this.meta.name
+      } else {
+        if (this.type === 'expectation') {
+          this.name = `expectation_upstream_${Buffer.from(`${this.upstream.repo}|${this.upstream.dir}`).toString('base64')}__${this.integrationType}`;
+        } else {
+          this.name = `promise__default__${this.integrationType}`;
+        }
+      }
     }
   }
 

diff --git a/packages/notary-core/src/contracts/repository.js b/packages/notary-core/src/contracts/repository.js
@@ -36,7 +36,7 @@ export default {
         err,
         `Failed to fetch contracts for workspace: ${workspace.project.repo}/${workspace.project
           .dir}` +
-          `@ ${workspace.rev}` +
+          ` @ ${workspace.rev}` +
           err.message
       );
     }

diff --git a/packages/notary-core/src/contracts/validation.js b/packages/notary-core/src/contracts/validation.js
@@ -8,7 +8,7 @@ import ProjectRevisionRepository from '../projects/project_revision_repository';
 import Contract from './contract';
 import { Project } from '../projects/models';
 import Definitions from './definition-validator';
-import Integrations from './integrations';
+import config from '../config';
 
 /**
  * Two cases, a project might:
@@ -75,15 +75,28 @@ async function contractsPathsValidation(def, dirBasePath) {
 async function contractsSchemaValidation(projectRevision) {
   return Promise.all(
     projectRevision.contracts.map(async c => {
-      const facade = Integrations.get(c.integrationType);
-      return await facade.validateContractSchema(projectRevision, c).catch(err => {
+      const response = await config.hive.publish(`CONTRACT_VALIDATE_SCHEMA_${c.integrationType.toUpperCase()}`, {
+        projectDisplayName: `${projectRevision.project().repo}:${projectRevision.project().dir}`,
+        projectId: Buffer.from(`${projectRevision.project().repo}|${projectRevision.project().dir}`).toString('base64'),
+        revision: projectRevision.rev(),
+        contractDefinition: c
+      }, false, 'notary-core');
+
+      let err;
+      if (!response || response.length === 0) {
+        err = `No plugin available to validate ${c.integrationType}`;
+      } else if(response[0] && response[0].errors !== null) {
+        err = response[0].errors;
+      }
+
+      if (err) {
         throw new VError(
           `Error! contract at ${projectRevision.project().repo}:` +
-            `${projectRevision.project()
-              .dir}/${c.dir} of type ${c.integrationType} is not valid: ` +
-            err.message
+          `${projectRevision.project()
+            .dir}/${c.dir} of type ${c.integrationType} is not valid: ` +
+          err
         );
-      });
+      }
     })
   );
 }
@@ -136,21 +149,39 @@ async function producerPromisesValidation(projectRevision, def) {
           })
           .filter(pair => pair !== null)
           .map(async pair => {
-            const facade = Integrations.get(promise.integrationType);
-
-            return await facade
-              .validate(projectRevision, pair.consumerProjectRev, promise, pair.consumerExpectation)
-              .catch(err => {
-                throw new VError(
-                  `Consumer [ ${pair.consumerProjectRev.project()
-                    .repo}:${pair.consumerProjectRev.project()
-                    .dir}/ @ ${pair.consumerProjectRev.rev()} ] ` +
-                    `expectations of type (${pair.consumerExpectation
-                      .integrationType}) is broken: \n` +
-                    `============================================================================ \n` +
-                    err.message
-                );
-              });
+            const response = await config.hive.publish(`CONTRACT_VALIDATE_PROMISE_EXPECTATION_${promise.integrationType.toUpperCase()}`, {
+              promise: {
+                projectDisplayName: `${projectRevision.project().repo}:${projectRevision.project().dir}`,
+                projectId: Buffer.from(`${projectRevision.project().repo}|${projectRevision.project().dir}`).toString('base64'),
+                revision: projectRevision.rev(),
+                contractDefinition: promise
+              },
+              expectation: {
+                projectDisplayName: `${pair.consumerProjectRev.project().repo}:${pair.consumerProjectRev.project().dir}`,
+                projectId: Buffer.from(`${pair.consumerProjectRev.project().repo}|${pair.consumerProjectRev.project().dir}`).toString('base64'),
+                revision: pair.consumerProjectRev.rev(),
+                contractDefinition: pair.consumerExpectation
+              }
+            }, false, 'notary-core');
+
+            let err;
+            if (!response || response.length === 0) {
+              err = `No plugin available to validate ${promise.integrationType}`;
+            } else if(response[0] && response[0].errors !== null) {
+              err = response[0].errors;
+            }
+
+            if (err) {
+              throw new VError(
+                `Consumer [ ${pair.consumerProjectRev.project()
+                  .repo}:${pair.consumerProjectRev.project()
+                  .dir}/ @ ${pair.consumerProjectRev.rev()} ] ` +
+                `expectations of type (${pair.consumerExpectation
+                  .integrationType}) is broken: \n` +
+                `============================================================================ \n` +
+                err
+              );
+            }
           })
       );
     })
@@ -196,17 +227,37 @@ async function consumerExpectationsValidation(projectRevision, def) {
         });
       }
 
-      const facade = Integrations.get(e.integrationType);
+      const response = await config.hive.publish(`CONTRACT_VALIDATE_PROMISE_EXPECTATION_${e.integrationType.toUpperCase()}`, {
+        promise: {
+          projectDisplayName: `${upstream.project().repo}:${upstream.project().dir}`,
+          projectId: Buffer.from(`${upstream.project().repo}|${upstream.project().dir}`).toString('base64'),
+          revision: upstream.rev(),
+          contractDefinition: upstreamPromise
+        },
+        expectation: {
+          projectDisplayName: `${projectRevision.project().repo}:${projectRevision.project().dir}`,
+          projectId: Buffer.from(`${projectRevision.project().repo}|${projectRevision.project().dir}`).toString('base64'),
+          revision: projectRevision.rev(),
+          contractDefinition: e
+        }
+      }, false, 'notary-core');
 
-      return await facade.validate(upstream, projectRevision, upstreamPromise, e).catch(err => {
+      let err;
+      if (!response || response.length === 0) {
+        err = `No plugin available to validate ${e.integrationType}`;
+      } else if(response[0] && response[0].errors !== null) {
+        err = response[0].errors;
+      }
+
+      if (err) {
         throw new VError(
           `Producer [ ${upstream.project().repo}:${upstream.project()
             .dir}/ @ ${upstream.rev()} ] ` +
-            `expectations of type (${e.integrationType}) is broken: \n` +
-            `============================================================================ \n` +
-            err.message
+          `expectations of type (${e.integrationType}) is broken: \n` +
+          `============================================================================ \n` +
+          err
         );
-      });
+      }
     })
   );
 }

diff --git a/packages/notary-core/src/http.js b/packages/notary-core/src/http.js
@@ -49,7 +49,7 @@ server.post('/projects/:id/revisions/:revision', async (req, res) => {
   const [repo, dir] = Buffer.from(req.params['id'], 'base64').toString().split('|');
   await syncHelper.syncProjectWorkspace(
     new ProjectWorkspace({project: new Project({repo, dir}), rev: req.params['revision']}),
-    true
+    false
   );
 
   res.redirect(`/projects/${req.params['id']}/revisions/${req.params['revision']}`);