screwdriver-api 4.1.211 → 4.1.214

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "screwdriver-api",
-  "version": "4.1.211",
+  "version": "4.1.214",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
+    "pretest": "eslint . --quiet",
     "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 10000 --retries 1 --exit --allow-uncaught true --color true",
     "start": "./bin/server",
     "debug": "node --nolazy ./bin/server",

package/plugins/events/create.js

@@ -135,7 +135,7 @@ module.exports = () => ({
             try {
                 permissions = await user.getPermissions(scmUri);
             } catch (err) {
-                if (err.statusCode === 403 && (pipeline.scmRepo && pipeline.scmRepo.private)) {
+                if (err.statusCode === 403 && pipeline.scmRepo && pipeline.scmRepo.private) {
                     throw boom.notFound();
                 }
                 throw boom.boomify(err, { statusCode: err.statusCode });

package/plugins/pipelines/create.js

@@ -3,6 +3,7 @@
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
 const urlLib = require('url');
+const logger = require('screwdriver-logger');
 const { formatCheckoutUrl, sanitizeRootDir } = require('./helper');
 const { getUserPermissions } = require('../helper');
 const ANNOTATION_USE_DEPLOY_KEY = 'screwdriver.cd/useDeployKey';
@@ -30,12 +31,20 @@ module.exports = () => ({
             // fetch the user
             const user = await userFactory.get({ username, scmContext });
             const token = await user.unsealToken();
-            const scmUri = await pipelineFactory.scm.parseUrl({
-                scmContext,
-                rootDir,
-                checkoutUrl,
-                token
-            });
+
+            let scmUri;
+
+            try {
+                scmUri = await pipelineFactory.scm.parseUrl({
+                    scmContext,
+                    rootDir,
+                    checkoutUrl,
+                    token
+                });
+            } catch (error) {
+                logger.error(error.message);
+                throw boom.boomify(error, { statusCode: error.statusCode });
+            }
 
             // get the user permissions for the repo
             await getUserPermissions({ user, scmUri });