screwdriver-api 7.0.94 → 7.0.96

package/Dockerfile

@@ -21,5 +21,11 @@ RUN ln -s /usr/src/app/node_modules/screwdriver-api/config /config
 # Expose the web service port
 EXPOSE 8080
 
+# Add Tini
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--"]
+
 # Run the service
-CMD [ "npm", "start" ]
+CMD [ "node", "./bin/server" ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.94",
+  "version": "7.0.96",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -106,7 +106,7 @@
     "screwdriver-coverage-bookend": "^2.0.0",
     "screwdriver-coverage-sonar": "^4.1.1",
     "screwdriver-data-schema": "^v23.0.0",
-    "screwdriver-datastore-sequelize": "^8.0.0",
+    "screwdriver-datastore-sequelize": "^8.1.1",
     "screwdriver-executor-base": "^9.0.1",
     "screwdriver-executor-docker": "^6.0.0",
     "screwdriver-executor-k8s": "^15.0.1",

package/plugins/pipelines/README.md

@@ -360,4 +360,24 @@ Delete the template tag. This does not delete the template itself.
 
 * `namespace` - Namespace of the template
 * `name` - Name of the template
-* `tag` - Tag name of the template
+* `tag` - Tag name of the template
+
+##### Update a pipeline template's trusted property
+
+Update a pipeline template's trusted property
+
+`PUT /pipeline/templates/{namespace}/{name}/trusted`
+
+###### Arguments
+
+'namespace', 'name'
+
+* `namespace` - Namespace of the template
+* `name` - Name of the template
+
+Example payload:
+```json
+{
+    "trusted": true
+}
+```

package/plugins/pipelines/index.js

@@ -41,6 +41,7 @@ const getVersionRoute = require('./templates/getVersion');
 const removeTemplateRoute = require('./templates/remove');
 const removeTemplateTagRoute = require('./templates/removeTag');
 const removeTemplateVersionRoute = require('./templates/removeVersion');
+const updateTrustedRoute = require('./templates/updateTrusted');
 
 /**
  * Pipeline API Plugin
@@ -272,7 +273,8 @@ const pipelinesPlugin = {
             createTagRoute(),
             removeTemplateRoute(),
             removeTemplateTagRoute(),
-            removeTemplateVersionRoute()
+            removeTemplateVersionRoute(),
+            updateTrustedRoute()
         ]);
     }
 };

package/plugins/pipelines/templates/updateTrusted.js

@@ -0,0 +1,55 @@
+'use strict';
+
+const boom = require('@hapi/boom');
+const joi = require('joi');
+const schema = require('screwdriver-data-schema');
+const metaSchema = schema.models.templateMeta.base;
+
+module.exports = () => ({
+    method: 'PUT',
+    path: '/pipeline/templates/{namespace}/{name}/trusted',
+    options: {
+        description: "Update a pipeline template's trusted property",
+        notes: 'Returns null if successful',
+        tags: ['api', 'pipeline', 'templates', 'trusted'],
+        auth: {
+            strategies: ['token'],
+            scope: ['admin', '!guest']
+        },
+
+        handler: async (request, h) => {
+            const { namespace, name } = request.params;
+            const { pipelineTemplateFactory } = request.server.app;
+            const { trusted } = request.payload;
+
+            const pipelineTemplateMeta = await pipelineTemplateFactory.get({
+                name,
+                namespace
+            });
+
+            if (!pipelineTemplateMeta) {
+                throw boom.notFound(`Pipeline template ${namespace}/${name} does not exist`);
+            }
+
+            if (!trusted) {
+                pipelineTemplateMeta.trustedSinceVersion = null;
+            } else if (trusted && !pipelineTemplateMeta.trustedSinceVersion) {
+                pipelineTemplateMeta.trustedSinceVersion = pipelineTemplateMeta.latestVersion;
+            }
+
+            return pipelineTemplateMeta.update().then(
+                () => h.response().code(204),
+                err => h.response(boom.boomify(err))
+            );
+        },
+        validate: {
+            params: joi.object({
+                namespace: metaSchema.extract('namespace'),
+                name: metaSchema.extract('name')
+            }),
+            payload: joi.object({
+                trusted: joi.boolean().description('Whether pipeline template is trusted')
+            })
+        }
+    }
+});