fail start if depependency is missing

ndeloof · ndeloof · commit 662f8b45ef50 · 2023-10-19T09:29:32.000+02:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/pkg/compose/convergence.go b/pkg/compose/convergence.go
@@ -306,7 +306,7 @@ func containerReasonEvents(containers Containers, eventFunc func(string, string)
 const ServiceConditionRunningOrHealthy = "running_or_healthy"
 
 //nolint:gocyclo
-func (s *composeService) waitDependencies(ctx context.Context, project *types.Project, dependencies types.DependsOnConfig, containers Containers) error {
+func (s *composeService) waitDependencies(ctx context.Context, project *types.Project, service string, dependencies types.DependsOnConfig, containers Containers) error {
 	eg, _ := errgroup.WithContext(ctx)
 	w := progress.ContextWriter(ctx)
 	for dep, config := range dependencies {
@@ -318,6 +318,13 @@ func (s *composeService) waitDependencies(ctx context.Context, project *types.Pr
 
 		waitingFor := containers.filter(isService(dep))
 		w.Events(containerEvents(waitingFor, progress.Waiting))
+		if len(waitingFor) == 0 {
+			if config.Required {
+				return fmt.Errorf("%s is missing dependency %s", service, dep)
+			}
+			logrus.Warnf("%s is missing dependency %s", service, dep)
+			continue
+		}
 
 		dep, config := dep, config
 		eg.Go(func() error {
@@ -717,7 +724,7 @@ func (s *composeService) startService(ctx context.Context, project *types.Projec
 		return nil
 	}
 
-	err := s.waitDependencies(ctx, project, service.DependsOn, containers)
+	err := s.waitDependencies(ctx, project, service.Name, service.DependsOn, containers)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/compose/convergence_test.go b/pkg/compose/convergence_test.go
@@ -229,7 +229,7 @@ func TestWaitDependencies(t *testing.T) {
 			"db":    {Condition: ServiceConditionRunningOrHealthy},
 			"redis": {Condition: ServiceConditionRunningOrHealthy},
 		}
-		assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies, nil))
+		assert.NilError(t, tested.waitDependencies(context.Background(), &project, "", dependencies, nil))
 	})
 	t.Run("should skip dependencies with condition service_started", func(t *testing.T) {
 		dbService := types.ServiceConfig{Name: "db", Scale: 1}
@@ -239,6 +239,6 @@ func TestWaitDependencies(t *testing.T) {
 			"db":    {Condition: types.ServiceConditionStarted, Required: true},
 			"redis": {Condition: types.ServiceConditionStarted, Required: true},
 		}
-		assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies, nil))
+		assert.NilError(t, tested.waitDependencies(context.Background(), &project, "", dependencies, nil))
 	})
 }
diff --git a/pkg/compose/run.go b/pkg/compose/run.go
@@ -96,7 +96,7 @@ func (s *composeService) prepareRun(ctx context.Context, project *types.Project,
 	updateServices(&service, observedState)
 
 	if !opts.NoDeps {
-		if err := s.waitDependencies(ctx, project, service.DependsOn, observedState); err != nil {
+		if err := s.waitDependencies(ctx, project, service.Name, service.DependsOn, observedState); err != nil {
 			return "", err
 		}
 	}
diff --git a/pkg/compose/start.go b/pkg/compose/start.go
@@ -117,7 +117,7 @@ func (s *composeService) start(ctx context.Context, projectName string, options
 			defer cancel()
 		}
 
-		err = s.waitDependencies(ctx, project, depends, containers)
+		err = s.waitDependencies(ctx, project, project.Name, depends, containers)
 		if err != nil {
 			if ctx.Err() == context.DeadlineExceeded {
 				return fmt.Errorf("application not healthy after %s", options.WaitTimeout)

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ func TestWaitDependencies(t *testing.T) {`
`229`	`229`	`"db": {Condition: ServiceConditionRunningOrHealthy},`
`230`	`230`	`"redis": {Condition: ServiceConditionRunningOrHealthy},`
`231`	`231`	`}`
`232`		`- assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies, nil))`
	`232`	`+ assert.NilError(t, tested.waitDependencies(context.Background(), &project, "", dependencies, nil))`
`233`	`233`	`})`
`234`	`234`	`t.Run("should skip dependencies with condition service_started", func(t *testing.T) {`
`235`	`235`	`dbService := types.ServiceConfig{Name: "db", Scale: 1}`
`@@ -239,6 +239,6 @@ func TestWaitDependencies(t *testing.T) {`
`239`	`239`	`"db": {Condition: types.ServiceConditionStarted, Required: true},`
`240`	`240`	`"redis": {Condition: types.ServiceConditionStarted, Required: true},`
`241`	`241`	`}`
`242`		`- assert.NilError(t, tested.waitDependencies(context.Background(), &project, dependencies, nil))`
	`242`	`+ assert.NilError(t, tested.waitDependencies(context.Background(), &project, "", dependencies, nil))`
`243`	`243`	`})`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func (s composeService) prepareRun(ctx context.Context, project types.Project,`
`96`	`96`	`updateServices(&service, observedState)`
`97`	`97`
`98`	`98`	`if !opts.NoDeps {`
`99`		`- if err := s.waitDependencies(ctx, project, service.DependsOn, observedState); err != nil {`
	`99`	`+ if err := s.waitDependencies(ctx, project, service.Name, service.DependsOn, observedState); err != nil {`
`100`	`100`	`return "", err`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (s *composeService) start(ctx context.Context, projectName string, options`
`117`	`117`	`defer cancel()`
`118`	`118`	`}`
`119`	`119`
`120`		`- err = s.waitDependencies(ctx, project, depends, containers)`
	`120`	`+ err = s.waitDependencies(ctx, project, project.Name, depends, containers)`
`121`	`121`	`if err != nil {`
`122`	`122`	`if ctx.Err() == context.DeadlineExceeded {`
`123`	`123`	`return fmt.Errorf("application not healthy after %s", options.WaitTimeout)`