feat(1167): Remove calling exchangeTokenForBuild method (#23)

screwdriver-cd · Jul 31, 2018 · 9f6eb42 · 9f6eb42
1 parent 6b1a397
commit 9f6eb42
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/index.js b/index.js
@@ -279,25 +279,20 @@ class JenkinsExecutor extends Executor {
 
         await this._jenkinsJobCreateOrUpdate(jobName, xml);
 
-        // exchange temporal JWT to build JWT
-        return this.exchangeTokenForBuild(config).then((buildToken) => {
-            config.token = buildToken;
-
-            return this.breaker.runCommand({
-                module: 'job',
-                action: 'build',
-                params: [{
-                    name: jobName,
-                    parameters: {
-                        SD_BUILD_ID: String(config.buildId),
-                        SD_TOKEN: config.token,
-                        SD_CONTAINER: config.container,
-                        SD_API: this.ecosystem.api,
-                        SD_STORE: this.ecosystem.store,
-                        SD_BUILD_TIMEOUT: buildTimeout
-                    }
-                }]
-            });
+        return this.breaker.runCommand({
+            module: 'job',
+            action: 'build',
+            params: [{
+                name: jobName,
+                parameters: {
+                    SD_BUILD_ID: String(config.buildId),
+                    SD_TOKEN: config.token,
+                    SD_CONTAINER: config.container,
+                    SD_API: this.ecosystem.api,
+                    SD_STORE: this.ecosystem.store,
+                    SD_BUILD_TIMEOUT: buildTimeout
+                }
+            }]
         });
     }
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -93,7 +93,7 @@ describe('index', () => {
 
     const buildParams = {
         SD_BUILD_ID: String(config.buildId),
-        SD_TOKEN: 'someBuildToken',
+        SD_TOKEN: config.token,
         SD_CONTAINER: config.container,
         SD_API: ecosystem.api,
         SD_STORE: ecosystem.store,
@@ -197,7 +197,6 @@ describe('index', () => {
         let buildOpts;
         let configuredBuildTimeoutOpts;
         let maxBuildTimeoutOpts;
-        let exchangeTokenStub;
         const fakeXml = 'fake_xml';
 
         beforeEach(() => {
@@ -247,8 +246,6 @@ describe('index', () => {
             };
 
             sinon.stub(executor, '_loadJobXml').returns(fakeXml);
-            exchangeTokenStub = sinon.stub(executor, 'exchangeTokenForBuild');
-            exchangeTokenStub.resolves('someBuildToken');
             config.annotations = {};
         });
 
@@ -632,7 +629,6 @@ rm -f docker-compose.yml
 
     describe('run without Mocked Breaker', () => {
         const fakeXml = 'fake_xml';
-        let exchangeTokenStub;
 
         beforeEach(() => {
             mockery.deregisterMock('circuit-fuses');
@@ -657,8 +653,6 @@ rm -f docker-compose.yml
             jenkinsMock.job.build = sinon.stub(executor.jenkinsClient.job, 'build');
 
             sinon.stub(executor, '_loadJobXml').returns(fakeXml);
-            exchangeTokenStub = sinon.stub(executor, 'exchangeTokenForBuild');
-            exchangeTokenStub.resolves('someBuildToken');
         });
 
         it('calls jenkins function correctly', (done) => {