screwdriver-api 4.1.166 → 4.1.170

package/design/diagrams/sd-zip-artifacts-overview.puml

@@ -11,16 +11,22 @@ queue "Resque(Redis)" as resque
 participant "unzip worker" as worker
 
 
-build -> store: store-cli
-store -> s3: upload zip file
+build -> store: store-cli\nPUT /builds/{id}/ARTIFACTS/SD_ARTIFACT.zip
+store -> s3: upload zip artifact
 build -> api: POST /builds/{id}/artifacts/unzip
-api -> qservice: POST /queue/message
+api -> qservice: POST /queue/message?type=unzip
 qservice -> resque: enqueue
-qservice --> api: response\n(POST /queue/message)
+qservice --> api: response\n(POST /queue/message?type=unzip)
 api --> build: response\n(POST /builds/{id}/artifacts/unzip)
 worker -> resque : dequeue
-worker -> store: GET zip artifact
-store --> worker: response\nGET zip artifact
-worker -> store: upload unzip artifacts
+worker -> store: GET /builds/{id}/ARTIFACTS/SD_ARTIFACT.zip
+store -> s3: download zip artifact
+store --> worker: response\n(GET /builds/{id}/ARTIFACTS/SD_ARTIFACT.zip)
+worker -> store: PUT /builds/{id}/ARTIFACTS/*
+store -> s3: upload unzip artifacts
+store --> worker: response\n(PUT /builds/{id}/ARTIFACTS/*)
+worker -> store: DELETE /builds/{id}/ARTIFACTS/SD_ARTIFACT.zip
+store -> s3: delete zip artifact
+store --> worker: response\n(DELETE /builds/{id}/ARTIFACTS/SD_ARTIFACT.zip)
 
 @enduml

package/design/sd-zip-artifacts.md

@@ -18,7 +18,7 @@ Outline:
 1. upload zip file to Object Storage(S3) (sd build -> store -> S3)  
 1. notify to queue-service after upload zip file (sd build -> api -> queue-service)  
 1. send a message to unzip file (queue-service -> Resque)  
-1. a consumer(unzip worker) receives the message, then the consumer downloads the zip file and unzips it, re-uploads unzipped files 
+1. a consumer(unzip worker) receives the message, then the consumer downloads the zip file and unzips it, re-uploads unzipped files, deletes the zip file
 
 ## Flow(Details)
 
@@ -41,7 +41,7 @@ Outline:
 
 Use sd-token to allow only requests when the build ID in the token and the id in the path are the same.
 
-##### POST DATA
+##### Parameters
 
 |Name|Type|In|Description|Example|
 |:--|:--|:--|:--|:--|
@@ -97,7 +97,7 @@ Status(Error):
 
 Use sd-token to only allow requests from SD API
 
-##### POST DATA
+##### Parameters
 
 |Name|Type|In|Description|Example|
 |:--|:--|:--|:--|:--|
@@ -134,12 +134,28 @@ This is a new component.
 1. If retry fails
     1. Add a statusMessage to the build to notify the user that the unzip has failed
     1. Log the failure.
+1. Delete SD_ARTIFACT.zip
 
 ### SD Store (store)
+Enable the following operations from unzip worker
+1. Download SD_ARTIFACT.zip
+1. Upload unzipped artifact files
+1. Delete SD_ARTIFACT.zip
 
-1. Upload and Download artifact files
+#### API
 
-SD Store do not need to add new function, but need to add new Authentication.
+|Method|URL|Description|
+|:--|:--|:--|
+|DELETE|/builds/{id}/{artifact*}|delete zipped artifact files|
+
+##### Authentication & Authorization
 
-- Able to Upload and Download artifact files by unzip worker scope token
+- Able to Upload, Download, and Delete artifact files by unzip worker scope token
 - Return an error if the build id of the build artifacts to be operated is different from the build id contained in the token
+
+##### Parameters
+
+|Name|Type|In|Description|Example|
+|:--|:--|:--|:--|:--|
+|id|integer|path|build ID|12|
+|artifact*|string|path|path to artifact|ARTIFACTS/SD_ARTIFACT.zip|

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "4.1.166",
+  "version": "4.1.170",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -73,12 +73,12 @@
     "@hapi/good": "^9.0.1",
     "@hapi/good-console": "^9.0.1",
     "@hapi/good-squeeze": "^6.0.0",
-    "@hapi/hapi": "^20.1.5",
+    "@hapi/hapi": "^20.2.1",
     "@hapi/hoek": "^9.1.1",
     "@hapi/inert": "^6.0.4",
     "@hapi/vision": "^6.1.0",
     "@promster/hapi": "^4.2.1",
-    "async": "^3.2.1",
+    "async": "^3.2.2",
     "badge-maker": "^3.3.1",
     "config": "^1.31.0",
     "date-fns": "^1.30.1",
@@ -87,7 +87,7 @@
     "hapi-auth-jwt2": "^10.2.0",
     "hapi-rate-limit": "^5.0.1",
     "hapi-swagger": "^14.2.4",
-    "ioredis": "^4.27.9",
+    "ioredis": "^4.28.0",
     "joi": "^17.4.2",
     "js-yaml": "^3.14.1",
     "jsonwebtoken": "^8.5.1",
@@ -101,26 +101,26 @@
     "screwdriver-build-bookend": "^2.4.0",
     "screwdriver-cache-bookend": "^2.0.2",
     "screwdriver-command-validator": "^2.1.0",
-    "screwdriver-config-parser": "^7.2.0",
+    "screwdriver-config-parser": "^7.4.0",
     "screwdriver-coverage-bookend": "^1.0.3",
-    "screwdriver-coverage-sonar": "^3.3.1",
-    "screwdriver-data-schema": "^21.8.2",
+    "screwdriver-coverage-sonar": "^3.3.3",
+    "screwdriver-data-schema": "^21.12.0",
     "screwdriver-datastore-sequelize": "^7.2.7",
     "screwdriver-executor-base": "^8.4.0",
     "screwdriver-executor-docker": "^5.0.1",
-    "screwdriver-executor-k8s": "^14.14.4",
+    "screwdriver-executor-k8s": "^14.16.0",
     "screwdriver-executor-k8s-vm": "^4.3.2",
     "screwdriver-executor-queue": "^3.1.2",
     "screwdriver-executor-router": "^2.3.0",
     "screwdriver-logger": "^1.1.0",
-    "screwdriver-models": "^28.8.7",
+    "screwdriver-models": "^28.11.0",
     "screwdriver-notifications-email": "^2.2.0",
     "screwdriver-notifications-slack": "^3.2.1",
     "screwdriver-request": "^1.0.3",
     "screwdriver-scm-base": "^7.3.0",
     "screwdriver-scm-bitbucket": "^4.5.1",
-    "screwdriver-scm-github": "^11.6.1",
-    "screwdriver-scm-gitlab": "^2.7.0",
+    "screwdriver-scm-github": "^11.6.3",
+    "screwdriver-scm-gitlab": "^2.7.2",
     "screwdriver-scm-router": "^6.3.0",
     "screwdriver-template-validator": "^5.2.0",
     "screwdriver-workflow-parser": "^3.2.0",
@@ -128,7 +128,7 @@
     "stream": "0.0.2",
     "tinytim": "^0.1.1",
     "uuid": "^8.3.2",
-    "verror": "^1.6.1"
+    "verror": "^1.10.1"
   },
   "release": {
     "debug": false,
@@ -137,7 +137,7 @@
     }
   },
   "devDependencies": {
-    "@octokit/rest": "^18.10.0",
+    "@octokit/rest": "^18.12.0",
     "chai": "~3.5.0",
     "chai-as-promised": "^6.0.0",
     "chai-jwt": "^2.0.0",
@@ -152,7 +152,7 @@
     "mocha-sonarqube-reporter": "^1.0.2",
     "mockery": "^2.0.0",
     "mz": "^2.6.0",
-    "nock": "^13.0.0",
+    "nock": "^13.2.1",
     "node-plantuml": "^0.5.0",
     "npm-auto-version": "^1.0.0",
     "nyc": "^15.0.0",

package/plugins/pipelines/helper.js

@@ -37,16 +37,7 @@ const formatCheckoutUrl = checkoutUrl => {
  * @return {String}                 Root dir with no leading/trailing slashes
  */
 const sanitizeRootDir = (rootDir = '') => {
-    // eslint-disable-next-line max-len
-    const DIR_PATH_REGEX = /^([a-zA-Z0-9\s_@\-^!#$%&+={}[\]]+)(\/[a-zA-Z0-9\s_@\-^!#$%&+={}[\]]+)*$/;
-    const sanitizedRootDir = rootDir.replace(/^(\/+|.\/)|\/+$/g, '');
-
-    // Set rootDir as empty string if invalid
-    if (!DIR_PATH_REGEX.test(sanitizedRootDir)) {
-        return '';
-    }
-
-    return sanitizedRootDir;
+    return rootDir.replace(/^(\/+|.\/|..\/)|\/+$/g, '');
 };
 
 /**