screwdriver-api 8.0.162 → 8.0.164

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.162",
+  "version": "8.0.164",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -85,7 +85,7 @@
     "@hapi/inert": "^7.0.0",
     "@hapi/vision": "^7.0.0",
     "@promster/hapi": "^15.0.0",
-    "archiver": "^7.0.1",
+    "archiver": "^8.0.0",
     "async": "^3.2.4",
     "badge-maker": "^3.3.1",
     "config": "^3.3.8",

package/plugins/builds/artifacts/get.js

@@ -5,7 +5,6 @@ const joi = require('joi');
 const jwt = require('jsonwebtoken');
 const request = require('got');
 const schema = require('screwdriver-data-schema');
-const archiver = require('archiver');
 const { PassThrough } = require('stream');
 const logger = require('screwdriver-logger');
 const { v4: uuidv4 } = require('uuid');
@@ -13,6 +12,12 @@ const idSchema = schema.models.build.base.extract('id');
 const artifactSchema = joi.string().label('Artifact Name');
 const typeSchema = joi.string().default('preview').valid('download', 'preview').label('Flag to trigger type either to download or preview');
 
+async function createZipArchive() {
+    const { ZipArchive } = await import('archiver');
+
+    return new ZipArchive({ zlib: { level: 9 } });
+}
+
 module.exports = config => ({
     method: 'GET',
     path: '/builds/{id}/artifacts/{name*}',
@@ -90,7 +95,7 @@ module.exports = config => ({
                             }
 
                             // Create a stream and set up archiver
-                            const archive = archiver('zip', { zlib: { level: 9 } });
+                            const archive = await createZipArchive();
                             const passThrough = new PassThrough();
 
                             // Handle archiver errors

package/plugins/builds/artifacts/getAll.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const archiver = require('archiver');
 const boom = require('@hapi/boom');
 const request = require('got');
 const joi = require('joi');
@@ -11,6 +10,12 @@ const schema = require('screwdriver-data-schema');
 const { v4: uuidv4 } = require('uuid');
 const idSchema = schema.models.build.base.extract('id');
 
+async function createZipArchive() {
+    const { ZipArchive } = await import('archiver');
+
+    return new ZipArchive({ zlib: { level: 9 } });
+}
+
 
 module.exports = config => ({
     method: 'GET',
@@ -63,7 +68,7 @@ module.exports = config => ({
                     const manifestArray = manifest.trim().split('\n');
 
                     // Create a stream and set up archiver
-                    const archive = archiver('zip', { zlib: { level: 9 } });
+                    const archive = await createZipArchive();
                     // PassThrough stream to make archiver readable by Hapi
                     const passThrough = new PassThrough();
 

package/plugins/versions.js

@@ -179,8 +179,9 @@ function collectPackage(pkgDir, data) {
 
     const json = readJson(packageJsonPath);
     const key = `${json.name}@${json.version}`;
+    const hasIdentity = json.name && json.version;
 
-    if (!json.name || !json.version || data[key]) {
+    if (hasIdentity && data[key]) {
         return data;
     }
 
@@ -234,7 +235,9 @@ function collectPackage(pkgDir, data) {
         moduleInfo.licenses = UNLICENSED;
     }
 
-    data[key] = moduleInfo;
+    if (hasIdentity) {
+        data[key] = moduleInfo;
+    }
 
     [json.dependencies, json.optionalDependencies, json.peerDependencies].forEach(dependencies => {
         Object.keys(dependencies || {}).forEach(depName => {