feat(#2830): format and store buildCluster name (#572)

screwdriver-cd · Feb 2, 2023 · 4ffe088 · 4ffe088
1 parent 0a43a7b
commit 4ffe088
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 22 deletions.
diff --git a/lib/buildFactory.js b/lib/buildFactory.js
@@ -207,18 +207,21 @@ class BuildFactory extends BaseFactory {
                     const permutation = job.permutations[index];
                     const annotations = hoek.reach(job.permutations[0], 'annotations', { default: {} });
                     let buildClusterName;
+                    let bookendClusterName;
 
                     if (String(this.multiBuildClusterEnabled) === 'true') {
                         buildClusterName = await helper.getBuildClusterName({
                             annotations,
                             pipeline
                         });
+                        bookendClusterName = buildClusterName;
                     }
                     if (hoek.reach(permutation, 'provider')) {
                         const { provider } = permutation;
 
-                        if (provider && provider.name) {
-                            buildClusterName = provider.name;
+                        if (provider) {
+                            buildClusterName = `${provider.name}-${provider.executor}-${provider.accountId}`;
+                            bookendClusterName = provider.name;
                         }
                     }
 
@@ -251,8 +254,8 @@ class BuildFactory extends BaseFactory {
                     }
 
                     const [setup, teardown] = await Promise.all([
-                        this.bookend.getSetupCommands(bookendConfig, buildClusterName),
-                        this.bookend.getTeardownCommands(bookendConfig, buildClusterName)
+                        this.bookend.getSetupCommands(bookendConfig, bookendClusterName),
+                        this.bookend.getTeardownCommands(bookendConfig, bookendClusterName)
                     ]);
 
                     modelConfig.createTime = new Date(number).toISOString();

diff --git a/test/lib/buildClusterFacotory.test.js → test/lib/buildClusterFactory.test.js b/test/lib/buildClusterFacotory.test.js → test/lib/buildClusterFactory.test.js
diff --git a/test/lib/buildFactory.test.js b/test/lib/buildFactory.test.js
@@ -254,7 +254,9 @@ describe('Build Factory', () => {
                 environment: { NODE_ENV: 'test', NODE_VERSION: '4' },
                 image: 'node:4',
                 provider: {
-                    name: 'aws'
+                    name: 'aws',
+                    executor: 'sls',
+                    accountId: '123456789012'
                 }
             },
             {
@@ -639,7 +641,7 @@ describe('Build Factory', () => {
                 });
         });
 
-        it('sets build cluster from provider if available', () => {
+        it('sets build cluster from provider as providerName-executor-accountId if available', () => {
             const user = { unsealToken: sinon.stub().resolves('foo') };
             const jobMock = {
                 permutations: permutationsWithProvider,
@@ -650,7 +652,7 @@ describe('Build Factory', () => {
             jobFactoryMock.get.resolves(jobMock);
             userFactoryMock.get.resolves(user);
             delete saveConfig.params.commit;
-            saveConfig.params.buildClusterName = 'aws';
+            saveConfig.params.buildClusterName = 'aws-sls-123456789012';
 
             return factory
                 .create({
@@ -1000,11 +1002,12 @@ describe('Build Factory', () => {
                 });
         });
 
-        it('passes buildClusterName from provider config to the bookend config', () => {
+        it('passes buildClusterName as provider.name from provider config to the bookend config', () => {
             const pipelineMock = {
                 configPipelineId: 2,
                 configPipeline: Promise.resolve({ spooky: 'ghost' })
             };
+            const bookendClusterName = 'aws';
             const jobMock = {
                 permutations: permutationsWithProvider,
                 pipeline: Promise.resolve(pipelineMock)
@@ -1023,20 +1026,28 @@ describe('Build Factory', () => {
                     meta
                 })
                 .then(() => {
-                    assert.calledWith(bookendMock.getSetupCommands, {
-                        pipeline: pipelineMock,
-                        job: jobMock,
-                        build: sinon.match.object,
-                        configPipeline: { spooky: 'ghost' },
-                        configPipelineSha
-                    });
-                    assert.calledWith(bookendMock.getTeardownCommands, {
-                        pipeline: pipelineMock,
-                        job: jobMock,
-                        build: sinon.match.object,
-                        configPipeline: { spooky: 'ghost' },
-                        configPipelineSha
-                    });
+                    assert.calledWith(
+                        bookendMock.getSetupCommands,
+                        {
+                            pipeline: pipelineMock,
+                            job: jobMock,
+                            build: sinon.match.object,
+                            configPipeline: { spooky: 'ghost' },
+                            configPipelineSha
+                        },
+                        bookendClusterName
+                    );
+                    assert.calledWith(
+                        bookendMock.getTeardownCommands,
+                        {
+                            pipeline: pipelineMock,
+                            job: jobMock,
+                            build: sinon.match.object,
+                            configPipeline: { spooky: 'ghost' },
+                            configPipelineSha
+                        },
+                        bookendClusterName
+                    );
                 });
         });
     });