screwdriver-api 7.0.137 → 7.0.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.137",
+  "version": "7.0.139",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/builds/triggers/helpers.js

@@ -464,8 +464,7 @@ function parseJobInfo({ joinObj, currentBuild, currentPipeline, currentJob, next
 
     return {
         parentBuilds,
-        joinListNames,
-        joinParentBuilds
+        joinListNames
     };
 }
 
@@ -480,11 +479,21 @@ async function getBuildsForGroupEvent(groupEventId, buildFactory) {
 
     builds.forEach(b => {
         try {
-            b.environment = JSON.parse(b.environment);
-            b.parentBuilds = JSON.parse(b.parentBuilds);
-            b.stats = JSON.parse(b.stats);
-            b.meta = JSON.parse(b.meta);
-            b.parentBuildId = JSON.parse(b.parentBuildId);
+            if (typeof b.environment === 'string') {
+                b.environment = JSON.parse(b.environment);
+            }
+            if (typeof b.parentBuilds === 'string') {
+                b.parentBuilds = JSON.parse(b.parentBuilds);
+            }
+            if (typeof b.stats === 'string') {
+                b.stats = JSON.parse(b.stats);
+            }
+            if (typeof b.meta === 'string') {
+                b.meta = JSON.parse(b.meta);
+            }
+            if (typeof b.parentBuildId === 'string') {
+                b.parentBuildId = JSON.parse(b.parentBuildId);
+            }
 
             if (b.parentBuildId) {
                 // parentBuildId could be the string '123', the number 123, or an array

package/plugins/pipelines/templates/validate.js

@@ -3,7 +3,7 @@
 const boom = require('@hapi/boom');
 const schema = require('screwdriver-data-schema');
 const templateSchema = schema.api.templateValidator;
-const pipelineValidator = require('screwdriver-template-validator').parsePipelineTemplate;
+const pipelineValidator = require('screwdriver-template-validator').validatePipelineTemplate;
 
 module.exports = () => ({
     method: 'POST',
@@ -15,8 +15,8 @@ module.exports = () => ({
         handler: async (request, h) => {
             try {
                 const { yaml: templateString } = request.payload;
-
-                const result = await pipelineValidator(templateString);
+                const { templateFactory } = request.server.app;
+                const result = await pipelineValidator(templateString, templateFactory);
 
                 return h.response(result);
             } catch (err) {