feat(1415): Add logic to handle webhook events from external repos (#…

…2187)
screwdriver-cd · Oct 13, 2020 · 0933d72 · 0933d72
1 parent 776384e
commit 0933d72
Show file tree

Hide file tree

Showing 5 changed files with 309 additions and 82 deletions.
diff --git a/plugins/pipelines/create.js b/plugins/pipelines/create.js
@@ -113,18 +113,17 @@ module.exports = () => ({
                 });
             }
 
-            const results = await Promise.all([
-                pipeline.sync(),
-                pipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`)
-            ]);
+            const results = await pipeline.sync();
+
+            await pipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`);
 
             const location = urlLib.format({
                 host: request.headers.host,
                 port: request.headers.port,
                 protocol: request.server.info.protocol,
                 pathname: `${request.path}/${pipeline.id}`
             });
-            const data = await results[0].toJson();
+            const data = await results.toJson();
 
             return h
                 .response(data)

diff --git a/plugins/pipelines/update.js b/plugins/pipelines/update.js
@@ -135,17 +135,15 @@ module.exports = () => ({
                                             oldPipeline.name = scmRepo.name;
 
                                             // update pipeline with new scmRepo and branch
-                                            return oldPipeline
-                                                .update()
-                                                .then(updatedPipeline =>
-                                                    Promise.all([
-                                                        updatedPipeline.sync(),
-                                                        updatedPipeline.addWebhooks(
-                                                            `${request.server.info.uri}/v4/webhooks`
-                                                        )
-                                                    ])
-                                                )
-                                                .then(results => h.response(results[0].toJson()).code(200));
+                                            return oldPipeline.update().then(async updatedPipeline => {
+                                                await updatedPipeline.addWebhooks(
+                                                    `${request.server.info.uri}/v4/webhooks`
+                                                );
+
+                                                const result = await updatedPipeline.sync();
+
+                                                return h.response(result.toJson()).code(200);
+                                            });
                                         })
                                 )
                         );