Merge pull request #28 from screwdriver-cd/revert-25-use-admin-func

fix: Revert "[2] fix(854): Use pipeline.admin function"
screwdriver-cd · Jun 4, 2018 · 308fc68 · 308fc68
2 parents a030b07 + bf1786c
commit 308fc68
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/index.js b/index.js
@@ -163,8 +163,7 @@ class ExecutorQueue extends Executor {
      * @return {Promise}
      */
     async postBuildEvent({ pipeline, job, apiUri }) {
-        const admin = await pipeline.admin;
-        const jwt = this.tokenGen(admin.username, {}, pipeline.scmContext);
+        const jwt = this.tokenGen(Object.keys(pipeline.admins)[0], {}, pipeline.scmContext);
 
         const options = {
             url: `${apiUri}/v4/events`,

diff --git a/test/index.test.js b/test/index.test.js
@@ -276,12 +276,6 @@ describe('index test', () => {
 
             executor.tokenGen = tokenGen;
 
-            const adminMock = Promise.resolve({
-                username: 'test'
-            });
-
-            testDelayedConfig.pipeline.admin = adminMock;
-
             executor.startPeriodic(testDelayedConfig).then(() => {
                 assert.calledOnce(queueMock.connect);
                 assert.notCalled(redisMock.hset);