Fixes

screwdriver-cd · Nov 21, 2018 · 2b80b43 · 2b80b43
1 parent 87e7e5c
commit 2b80b43
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/helpers/aws.js b/helpers/aws.js
@@ -76,7 +76,7 @@ class AwsClient {
         return this.client.listObjects(params, (e, data) => {
             if (e) return callback(e);
 
-            if (data.isTruncated) return callback();
+            if (data.Contents.length === 0) return callback();
 
             params = { Bucket: this.bucket };
             params.Delete = { Objects: [] };
@@ -85,9 +85,9 @@ class AwsClient {
                 params.Delete.Objects.push({ Key: content.Key });
             });
 
-            return this.client.deleteObjects(params, (err, res) => {
+            return this.client.deleteObjects(params, (err) => {
                 if (err) return callback(err);
-                if (res.isTruncated) return self.invalidateCache(this.bucket, callback);
+                if (data.isTruncated) return self.invalidateCache(cachePath, callback);
 
                 return callback();
             });

diff --git a/plugins/caches.js b/plugins/caches.js
@@ -343,7 +343,7 @@ exports.plugin = {
 
                 let cachePath;
                 const apiUrl = config.get('ecosystem.api');
-                const payload = {
+                const opts = {
                     url: `${apiUrl}/v4/isAdmin`,
                     method: 'GET',
                     headers: {
@@ -355,12 +355,19 @@ exports.plugin = {
 
                 switch (request.params.scope) {
                 case 'events': {
-                    return h.response();
+                    const eventIdParam = request.params.id;
+
+                    opts.qs = {
+                        eventId: eventIdParam
+                    };
+
+                    cachePath = `events/${eventIdParam}/`;
+                    break;
                 }
                 case 'jobs': {
                     const jobIdParam = request.params.id;
 
-                    payload.qs = {
+                    opts.qs = {
                         jobId: jobIdParam
                     };
 
@@ -370,20 +377,20 @@ exports.plugin = {
                 case 'pipelines': {
                     const pipelineIdParam = request.params.id;
 
-                    payload.qs = {
+                    opts.qs = {
                         pipelineId: pipelineIdParam
                     };
 
-                    cachePath = `pipelines/${pipelineIdParam}`;
+                    cachePath = `pipelines/${pipelineIdParam}/`;
                     break;
                 }
                 default:
                     return boom.forbidden('Invalid scope');
                 }
 
                 try {
-                    await req(payload, (err, response) => {
-                        if (!err && response.statusCode === 200) {
+                    await req(opts, (err, response) => {
+                        if (!err && response === true) {
                             return awsClient.invalidateCache(cachePath, (e) => {
                                 if (e) {
                                     console.log('Failed to invalidate cache: ', e);