Merge remote-tracking branch 'origin/SAN-6464-make-all-iccs-unique' i…

…nto SAN-6464-make-all-iccs-unique

lib/models/services/cluster-config-service.js

@@ -191,6 +191,7 @@ module.exports = class ClusterConfigService {
           clusterCreateId,
           repoFullName,
           triggeredAction: data.triggeredAction,
+          shouldNotAutoFork: data.shouldNotAutoFork,
           mainInstanceServiceName
         }
         return ClusterConfigService.createFromRunnableConfig(
@@ -793,7 +794,7 @@ module.exports = class ClusterConfigService {
         inputInstanceOpts.name
       )
     }
-    const shouldNotAutofork = keypather.get(parsedInstanceData, 'metadata.name') !== buildOpts.mainInstanceServiceName
+    const shouldNotAutofork = !(keypather.get(parsedInstanceData, 'metadata.name') === buildOpts.mainInstanceServiceName && !buildOpts.shouldNotAutoFork)
     const defaultInstanceOpts = {
       // short name is service name
       shortName: serviceName,
@@ -803,7 +804,7 @@ module.exports = class ClusterConfigService {
       ipWhitelist: {
         enabled: false
       },
-      shouldNotAutofork: shouldNotAutofork,
+      shouldNotAutofork,
       isolated: buildOpts.isolated,
       isTesting: testingOpts.isTesting,
       isTestReporter: testingOpts.isTestReporter

lib/routes/docker-compose-cluster.js

@@ -24,7 +24,8 @@ const postSchema = joi.object({
   isTesting: joi.boolean().optional(),
   testReporters: joi.array().optional(),
   githubId: joi.number().optional(),
-  parentInputClusterConfigId: joi.string().allow('').optional()
+  parentInputClusterConfigId: joi.string().allow('').optional(),
+  shouldNotAutoFork: joi.boolean().optional()
 }).unknown().required()
 
 const multiPostSchema = joi.object({
@@ -61,6 +62,7 @@ function makeCreateOptsFromBody (sessionUser, body, mainInstanceServiceName) {
   const parentInputClusterConfigId = keypather.get(body, 'parentInputClusterConfigId')
   const isTesting = keypather.get(body, 'isTesting')
   const testReporters = keypather.get(body, 'testReporters')
+  const shouldNotAutoFork = keypather.get(body, 'shouldNotAutoFork')
   return {
     mainInstanceServiceName,
     clusterCreateId: uuid(),
@@ -73,6 +75,7 @@ function makeCreateOptsFromBody (sessionUser, body, mainInstanceServiceName) {
     isTesting: isTesting || false,
     testReporters: testReporters || [],
     clusterName,
+    shouldNotAutoFork,
     parentInputClusterConfigId: parentInputClusterConfigId || ''
   }
 }

lib/workers/cluster.create.js

@@ -25,7 +25,8 @@ module.exports.jobSchema = joi.object({
   clusterName: joi.string().required(),
   clusterCreateId: joi.string(),
   parentInputClusterConfigId: joi.string().allow(''),
-  testReporters: joi.array()
+  testReporters: joi.array(),
+  shouldNotAutoFork: joi.boolean().required()
 }).unknown().required()
 
 /**
@@ -50,6 +51,7 @@ module.exports.task = (job) => {
         'clusterCreateId',
         'testReporters',
         'parentInputClusterConfigId',
+        'shouldNotAutoFork',
         'mainInstanceServiceName'
       ]
       const opts = pick(job, props)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "description": "Runnable API Server",
-  "version": "12.10.2",
+  "version": "12.10.3",
   "repository": {
     "type": "git",
     "url": "http://github.com/CodeNow/api.git"

unit/models/services/cluster-config-service.js

@@ -193,6 +193,7 @@ describe('Cluster Config Service Unit Tests', function () {
     const repoFullName = orgName + '/' + repoName
     const branchName = 'feature-1'
     const clusterName = 'api-unit'
+    const shouldNotAutoFork = true
     const parsedInput = {
       repositoryName: clusterName,
       ownerUsername: orgName,
@@ -208,7 +209,7 @@ describe('Cluster Config Service Unit Tests', function () {
     }
 
     const testData = {
-      triggeredAction, repoFullName, branchName, filePath, isTesting, testReporters, clusterName, clusterCreateId, parentInputClusterConfigId
+      triggeredAction, repoFullName, branchName, filePath, isTesting, testReporters, clusterName, clusterCreateId, parentInputClusterConfigId, shouldNotAutoFork
     }
 
     beforeEach(function (done) {
@@ -268,7 +269,7 @@ describe('Cluster Config Service Unit Tests', function () {
             const args = ClusterConfigService.createFromRunnableConfig.getCall(0).args
             expect(args[0]).to.equal(testSessionUser)
             expect(args[1]).to.equal(testParsedContent.results)
-            expect(args[2]).to.equal( { triggeredAction, clusterCreateId, repoFullName, mainInstanceServiceName: 'api'  })
+            expect(args[2]).to.equal( { triggeredAction, clusterCreateId, repoFullName, shouldNotAutoFork, mainInstanceServiceName: 'api'  })
             expect(args[3]).to.equal({
               branch: branchName,
               commit: commitSha,
@@ -284,7 +285,7 @@ describe('Cluster Config Service Unit Tests', function () {
               ClusterConfigService.createFromRunnableConfig,
               testSessionUser,
               testParsedContent.results,
-              { triggeredAction, clusterCreateId, repoFullName, mainInstanceServiceName: 'api' },
+              { triggeredAction, clusterCreateId, repoFullName, shouldNotAutoFork, mainInstanceServiceName: 'api' },
               sinon.match({
                 branch: branchName,
                 commit: commitSha,
@@ -973,6 +974,7 @@ describe('Cluster Config Service Unit Tests', function () {
       buildOpts = {
         isolated: objectId('407f191e810c19729de860e1'),
         masterShorthash: 'asdasdsad',
+        shouldNotAutoFork: true,
         clusterCreateId,
         mainInstanceServiceName: 'a1'
       }
@@ -1000,15 +1002,119 @@ describe('Cluster Config Service Unit Tests', function () {
       }
       const composeData = {
         metadata: {
-          name: 'a1',
-          isMain: true
+          name: 'a1'
+        },
+        instance: testParentComposeData,
+        build: {
+          dockerFilePath: 'Nathan219/hello'
+        }
+      }
+      const testInstance = 'build'
+      InstanceService.createInstance.resolves(testInstance)
+
+      return ClusterConfigService._createInstance(testSessionUser, composeData, testParentBuildId, testingOpts, buildOpts)
+        .then(instance => {
+          sinon.assert.calledOnce(InstanceService.createInstance)
+          sinon.assert.calledWithExactly(InstanceService.createInstance, {
+            shortName: composeData.metadata.name,
+            build: testParentBuildId,
+            aliases: testParentComposeData.aliases,
+            env: testParentComposeData.env,
+            clusterCreateId,
+            containerStartCommand: testParentComposeData.containerStartCommand,
+            name: buildOpts.masterShorthash + '--' + testParentComposeData.name,
+            isTesting,
+            isTestReporter,
+            isolated: buildOpts.isolated,
+            isIsolationGroupMaster: false,
+            shouldNotAutofork: true,
+            masterPod: false,
+            ipWhitelist: {
+              enabled: false
+            }
+          }, testSessionUser)
+
+          expect(instance).to.equal(testInstance)
+        })
+    })
+
+    it('should set shouldNotAutoFork to true if it is not supplied', () => {
+      const testParentBuildId = objectId('407f191e810c19729de860ef')
+      const testParentComposeData = {
+        env: 'env',
+        aliases: {
+          'dGhyZWUtY2hhbmdpbmctdGhlLWhvc3RuYW1l': {
+            'instanceName': 'compose-test-5-1-rethinkdb4',
+            'alias': 'three-changing-the-hostname'
+          }
+        },
+        containerStartCommand: 'containerStartCommand',
+        name: 'name'
+      }
+      const composeData = {
+        metadata: {
+          name: 'a2'
+        },
+        instance: testParentComposeData,
+        build: {
+          dockerFilePath: 'Nathan219/hello'
+        }
+      }
+      const testInstance = 'build'
+      buildOpts.shouldNotAutoFork = undefined
+      InstanceService.createInstance.resolves(testInstance)
+
+      return ClusterConfigService._createInstance(testSessionUser, composeData, testParentBuildId, testingOpts, buildOpts)
+        .then(instance => {
+          sinon.assert.calledOnce(InstanceService.createInstance)
+          sinon.assert.calledWithExactly(InstanceService.createInstance, {
+            shortName: composeData.metadata.name,
+            build: testParentBuildId,
+            aliases: testParentComposeData.aliases,
+            clusterCreateId,
+            env: testParentComposeData.env,
+            containerStartCommand: testParentComposeData.containerStartCommand,
+            name: buildOpts.masterShorthash + '--' + testParentComposeData.name,
+            isTesting,
+            isTestReporter,
+            clusterCreateId,
+            isolated: buildOpts.isolated,
+            isIsolationGroupMaster: false,
+            shouldNotAutofork: true,
+            masterPod: false,
+            ipWhitelist: {
+              enabled: false
+            }
+          }, testSessionUser)
+
+          expect(instance).to.equal(testInstance)
+        })
+    })
+
+    it('should set shouldNotAutoFork to false by default for non-main instances', () => {
+      const testParentBuildId = objectId('407f191e810c19729de860ef')
+      const testParentComposeData = {
+        env: 'env',
+        aliases: {
+          'dGhyZWUtY2hhbmdpbmctdGhlLWhvc3RuYW1l': {
+            'instanceName': 'compose-test-5-1-rethinkdb4',
+            'alias': 'three-changing-the-hostname'
+          }
+        },
+        containerStartCommand: 'containerStartCommand',
+        name: 'name'
+      }
+      const composeData = {
+        metadata: {
+          name: 'a1'
         },
         instance: testParentComposeData,
         build: {
           dockerFilePath: 'Nathan219/hello'
         }
       }
       const testInstance = 'build'
+      buildOpts.shouldNotAutoFork = undefined
       InstanceService.createInstance.resolves(testInstance)
 
       return ClusterConfigService._createInstance(testSessionUser, composeData, testParentBuildId, testingOpts, buildOpts)

unit/routes/docker-compose-cluster.js

@@ -42,6 +42,7 @@ describe('/docker-compose-cluster', function () {
   const sessionUserBigPoppaId = 8084808
   const parentInputClusterConfigId = 'funk flex'
   const githubId = sessionUserGithubId
+  const shouldNotAutoFork = true
   const mockSessionUser ={
     accounts: {
       github: { id: sessionUserGithubId }
@@ -69,7 +70,7 @@ describe('/docker-compose-cluster', function () {
       createClusterStub = sinon.stub(rabbitMQ, 'createCluster')
       validateOrBoomStub = sinon.spy(joi, 'validateOrBoomAsync')
       reqMock = {
-        body: { repo, branch, filePath, name, parentInputClusterConfigId, githubId },
+        body: { repo, branch, filePath, name, parentInputClusterConfigId, githubId, shouldNotAutoFork },
         sessionUser: {
           accounts: {
             github: { id: sessionUserGithubId }
@@ -122,6 +123,7 @@ describe('/docker-compose-cluster', function () {
               isTesting,
               parentInputClusterConfigId,
               testReporters,
+              shouldNotAutoFork,
               clusterCreateId,
               clusterName: name
             })
@@ -150,6 +152,7 @@ describe('/docker-compose-cluster', function () {
     const branch = 'master'
     const filePath = '/docker-compose.yml'
     const name = 'super-cool-name'
+    const shouldNotAutoFork = true
     const mains = {
       builds: {
         hello: {},
@@ -164,7 +167,7 @@ describe('/docker-compose-cluster', function () {
       builds: ['hello'],
       externals: ['cheese', 'rain']
     }
-    const body = { repo, branch, filePath, name, parentInputClusterConfigId, githubId }
+    const body = { repo, branch, filePath, name, parentInputClusterConfigId, githubId, shouldNotAutoFork }
     beforeEach(function (done) {
       createClusterStub = sinon.stub(rabbitMQ, 'createCluster')
       validateOrBoomStub = sinon.spy(joi, 'validateOrBoomAsync')
@@ -216,6 +219,7 @@ describe('/docker-compose-cluster', function () {
               isTesting,
               clusterCreateId,
               parentInputClusterConfigId,
+              shouldNotAutoFork,
               testReporters,
               clusterName: sinon.match.string
             })