screwdriver-api 8.0.16 → 8.0.18

package/config/custom-environment-variables.yaml

@@ -484,6 +484,9 @@ log:
     scope:
       __name: LOG_AUDIT_SCOPE
       __format: json
+  payload:
+    # set true to enable payload logs for all API calls over 5s
+    enabled: LOG_PAYLOAD_ENABLED
 
 build:
   environment:

package/config/default.yaml

@@ -385,6 +385,9 @@ log:
     enabled: false
     # add target scope tokens(pipeline, build, temporal, admin, guest, user)
     scope: []
+  payload:
+    # set true to enable payload logs for all API calls over 5s
+    enabled: true
 
 # default cluster environment variables to inject into builds
 build:

package/lib/server.js

@@ -15,7 +15,7 @@ process.on('unhandledRejection', (reason, p) => {
  */
 function handlePreResponseLogs(request, h) {
     const { response } = request;
-    const { release } = request.server.app;
+    const { release, log } = request.server.app;
 
     if (release && release.cookieName && request.state && !request.state[release.cookieName]) {
         h.state(release.cookieName, release.cookieValue);
@@ -49,7 +49,15 @@ function handlePreResponseLogs(request, h) {
 
     // Log request payload when it takes longer than 5 seconds to respond
     // This is to prevent logging payloads for every request
-    if (request.info && request.info.received && Date.now() - request.info.received > 5000 && request.payload) {
+    if (
+        log &&
+        log.payload &&
+        log.payload.enabled &&
+        request.info &&
+        request.info.received &&
+        Date.now() - request.info.received > 5000 &&
+        request.payload
+    ) {
         request.log(['payload'], {
             method: request.method,
             path: request.path,
@@ -161,7 +169,8 @@ module.exports = async config => {
             ecosystem: config.ecosystem,
             release: config.release,
             queueWebhook: config.queueWebhook,
-            unzipArtifacts: config.unzipArtifactsEnabled
+            unzipArtifacts: config.unzipArtifactsEnabled,
+            log: config.log
         };
 
         const bellConfigs = await config.auth.scm.getBellConfiguration();

package/package.json

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

package/plugins/builds/create.js

@@ -52,6 +52,10 @@ module.exports = () => ({
                             if (!isValidToken(pipeline.id, request.auth.credentials)) {
                                 throw boom.unauthorized('Token does not have permission to this pipeline');
                             }
+                            // for mysql backward compatibility
+                            if (!pipeline.adminUserIds) {
+                                pipeline.adminUserIds = [];
+                            }
 
                             return (
                                 user

package/plugins/events/index.js

@@ -29,6 +29,10 @@ const eventsPlugin = {
         server.expose('updateAdmins', ({ permissions, pipeline, user }) => {
             const { username, id: userId } = user;
 
+            // for mysql backward compatibility
+            if (!pipeline.adminUserIds) {
+                pipeline.adminUserIds = [];
+            }
             // Delete user from admin list if bad permissions
             if (!permissions.push) {
                 const newAdmins = pipeline.admins;

package/plugins/pipelines/sync.js

@@ -41,6 +41,10 @@ module.exports = () => ({
             if (!user) {
                 throw boom.notFound(`User ${username} does not exist`);
             }
+            // for mysql backward compatibility
+            if (!pipeline.adminUserIds) {
+                pipeline.adminUserIds = [];
+            }
 
             // Use parent's scmUri if pipeline is child pipeline and using read-only SCM
             const scmUri = await getScmUri({ pipeline, pipelineFactory });

package/plugins/pipelines/update.js

@@ -21,6 +21,10 @@ function getPermissionsForOldPipeline({ scmContexts, pipeline, user }) {
     const isPipelineSCMContextObsolete = !scmContexts.includes(pipeline.scmContext);
     const isUserFromAnotherSCMContext = user.scmContext !== pipeline.scmContext;
 
+    // for mysql backward compatibility
+    if (!pipeline.adminUserIds) {
+        pipeline.adminUserIds = [];
+    }
     // this pipeline's scmContext has been removed, allow current admin to change it
     // also allow pipeline admins from other scmContexts to change it
     if (isPipelineSCMContextObsolete || isUserFromAnotherSCMContext) {
@@ -70,6 +74,11 @@ module.exports = () => ({
                 throw boom.notFound(`Pipeline ${id} does not exist`);
             }
 
+            // for mysql backward compatibility
+            if (!oldPipeline.adminUserIds) {
+                oldPipeline.adminUserIds = [];
+            }
+
             if (oldPipeline.configPipelineId) {
                 throw boom.forbidden(
                     `Child pipeline can only be modified by config pipeline ${oldPipeline.configPipelineId}`

package/plugins/webhooks/helper.js

@@ -90,6 +90,10 @@ async function updateAdmins(userFactory, username, scmContext, pipeline, pipelin
         const user = await userFactory.get({ username, scmContext });
         const userPermissions = await user.getPermissions(pipeline.scmUri, user.scmContext, pipeline.scmRepo);
 
+        // for mysql backward compatibility
+        if (!pipeline.adminUserIds) {
+            pipeline.adminUserIds = [];
+        }
         // Delete user from admin list if bad permissions
         if (!userPermissions.push) {
             const newAdmins = pipeline.admins;