do not remove service links

ICTU · Jul 24, 2017 · db054d6 · db054d6
1 parent 5f00e35
commit db054d6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/coffee/compose.coffee b/src/coffee/compose.coffee
@@ -23,7 +23,7 @@ module.exports = (config) ->
       for l in links
         deps[l] = condition: 'service_started' unless deps[l]
       service.depends_on = deps
-      delete service.links
+      # delete service.links
 
   _resolvePath: resolvePath = (root, path) ->
     path = path[1...] if path[0] is '/'

diff --git a/tests/coffee/compose.test.coffee b/tests/coffee/compose.test.coffee
@@ -50,24 +50,30 @@ describe 'Compose', ->
         links: ['db']
         depends_on: ['some_other_service']
       compose(standardCfg)._migrateLinksToDependsOn '', service
-      assert.deepEqual service, depends_on:
-        db: {condition: 'service_started'}
-        some_other_service: {condition: 'service_started'}
+      assert.deepEqual service,
+        links: ['db']
+        depends_on:
+          db: {condition: 'service_started'}
+          some_other_service: {condition: 'service_started'}
     it 'should merge all links with all depends_on (as object) services', ->
       service =
         links: ['db']
         depends_on: some_other_service: condition: 'some_condition'
       compose(standardCfg)._migrateLinksToDependsOn '', service
-      assert.deepEqual service, depends_on:
-        db: {condition: 'service_started'}
-        some_other_service: {condition: 'some_condition'}
+      assert.deepEqual service,
+        links: ['db']
+        depends_on:
+          db: {condition: 'service_started'}
+          some_other_service: {condition: 'some_condition'}
     it 'should prefer a dependency from depends_on over one from links if they are the same', ->
       service =
         links: ['db']
         depends_on: db: condition: 'my_specific_condition'
       compose(standardCfg)._migrateLinksToDependsOn '', service
-      assert.deepEqual service, depends_on:
-        db: {condition: 'my_specific_condition'}
+      assert.deepEqual service,
+        links: ['db']
+        depends_on:
+          db: {condition: 'my_specific_condition'}
 
   describe '_resolvePath', ->
     it 'should resolve a path relative to a given root', ->