Merge pull request #409 from ndeloof/normalize_deps

Author: ndeloof

loader/normalize.go

@@ -155,6 +155,8 @@ func Normalize(project *types.Project, resolvePaths bool) error {
 			return err
 		}
 
+		inferImplicitDependencies(&s)
+
 		project.Services[i] = s
 	}
 
@@ -171,6 +173,61 @@ func Normalize(project *types.Project, resolvePaths bool) error {
 	return nil
 }
 
+// IsServiceDependency check the relation set by ref refers to a service
+func IsServiceDependency(ref string) (string, bool) {
+	if strings.HasPrefix(
+		ref,
+		types.ServicePrefix,
+	) {
+		return ref[len(types.ServicePrefix):], true
+	}
+	return "", false
+}
+
+func inferImplicitDependencies(service *types.ServiceConfig) {
+	var dependencies []string
+
+	maybeReferences := []string{
+		service.NetworkMode,
+		service.Ipc,
+		service.Pid,
+		service.Uts,
+		service.Cgroup,
+	}
+	for _, ref := range maybeReferences {
+		if dep, ok := IsServiceDependency(ref); ok {
+			dependencies = append(dependencies, dep)
+		}
+	}
+
+	for _, vol := range service.VolumesFrom {
+		spec := strings.Split(vol, ":")
+		if len(spec) == 0 {
+			continue
+		}
+		if spec[0] == "container" {
+			continue
+		}
+		dependencies = append(dependencies, spec[0])
+	}
+
+	for _, link := range service.Links {
+		dependencies = append(dependencies, strings.Split(link, ":")[0])
+	}
+
+	if len(dependencies) > 0 && service.DependsOn == nil {
+		service.DependsOn = make(types.DependsOnConfig)
+	}
+
+	for _, d := range dependencies {
+		if _, ok := service.DependsOn[d]; !ok {
+			service.DependsOn[d] = types.ServiceDependency{
+				Condition: types.ServiceConditionStarted,
+			}
+		}
+	}
+}
+
 // setIfMissing adds a ServiceDependency for service if not already defined
 func setIfMissing(d types.DependsOnConfig, service string, dep types.ServiceDependency) types.DependsOnConfig {
 	if d == nil {

loader/normalize_test.go

@@ -297,3 +297,36 @@ func TestNormalizeAdditionalContexts(t *testing.T) {
 	assert.NilError(t, err)
 	assert.DeepEqual(t, expected, project)
 }
+
+func TestNormalizeImplicitDependencies(t *testing.T) {
+	project := types.Project{
+		Name: "myProject",
+		Services: types.Services{
+			types.ServiceConfig{
+				Name:        "test",
+				Ipc:         "service:foo",
+				Cgroup:      "service:bar",
+				Uts:         "service:baz",
+				Pid:         "service:qux",
+				VolumesFrom: []string{"quux"},
+				Links:       []string{"corge"},
+				DependsOn: map[string]types.ServiceDependency{
+					// explicit dependency MUST not be overridden
+					"foo": {Condition: types.ServiceConditionHealthy, Restart: false},
+				},
+			},
+		},
+	}
+
+	expected := types.DependsOnConfig{
+		"foo":   {Condition: types.ServiceConditionHealthy, Restart: false},
+		"bar":   {Condition: types.ServiceConditionStarted, Restart: true},
+		"baz":   {Condition: types.ServiceConditionStarted, Restart: true},
+		"qux":   {Condition: types.ServiceConditionStarted, Restart: true},
+		"quux":  {Condition: types.ServiceConditionStarted},
+		"corge": {Condition: types.ServiceConditionStarted, Restart: true},
+	}
+	err := Normalize(&project, true)
+	assert.NilError(t, err)
+	assert.DeepEqual(t, expected, project.Services[0].DependsOn)
+}