screwdriver-api 8.0.89 → 8.0.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.89",
+  "version": "8.0.91",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -101,6 +101,7 @@
     "js-yaml": "^3.14.1",
     "jsonwebtoken": "^9.0.0",
     "license-checker": "^25.0.1",
+    "lodash.isempty": "^4.4.0",
     "lodash.mergewith": "^4.6.2",
     "ndjson": "^2.0.0",
     "node-env-file": "^0.1.8",

package/plugins/builds/helper/updateBuild.js

@@ -3,6 +3,7 @@
 const boom = require('@hapi/boom');
 const hoek = require('@hapi/hoek');
 const merge = require('lodash.mergewith');
+const isEmpty = require('lodash.isempty');
 const { PR_JOB_NAME, PR_STAGE_NAME, STAGE_TEARDOWN_PATTERN } = require('screwdriver-data-schema').config.regex;
 const { getFullStageJobName } = require('../../helper');
 const { updateVirtualBuildSuccess, emitBuildStatusEvent } = require('../triggers/helpers');
@@ -370,7 +371,7 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
         build.statusMessage = statusMessage || build.statusMessage;
         build.statusMessageType = statusMessageType || build.statusMessageType;
     } else if (['SUCCESS', 'FAILURE', 'ABORTED'].includes(desiredStatus)) {
-        build.meta = meta || {};
+        build.meta = isEmpty(meta) ? build.meta || {} : meta;
         event.meta = merge({}, event.meta, build.meta);
         build.endTime = new Date().toISOString();
     } else if (desiredStatus === 'RUNNING') {

package/plugins/pipelines/badge.js

@@ -5,7 +5,6 @@ const schema = require('screwdriver-data-schema');
 const idSchema = schema.models.pipeline.base.extract('id');
 const logger = require('screwdriver-logger');
 const { getPipelineBadge } = require('./helper');
-const BUILD_META_KEYWORD = '%"build":%';
 
 module.exports = config => ({
     method: 'GET',
@@ -37,24 +36,7 @@ module.exports = config => ({
                 }
 
                 // Get latest pipeline events
-                const latestEvents = await eventFactory.list({
-                    params: {
-                        pipelineId,
-                        type: 'pipeline'
-                    },
-                    // Make sure build exists for event, meta will be {} for skipped builds
-                    search: {
-                        field: 'meta',
-                        keyword: BUILD_META_KEYWORD
-                    },
-                    // removing these fields trims most of the bytes
-                    exclude: ['workflowGraph', 'meta', 'commit'],
-                    paginate: {
-                        count: 1
-                    },
-                    sort: 'descending',
-                    sortBy: 'createTime'
-                });
+                const latestEvents = await eventFactory.getPipelineTypeBuildEvents(pipelineId);
 
                 if (!latestEvents || Object.keys(latestEvents).length === 0) {
                     return h.response(getPipelineBadge(badgeConfig)).header('Content-Type', contentType);