Skip to content

refactor(compose): rename dependent service parameter #14243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vividvisit wants to merge 1 commit into from
+3 −3
Closed

refactor(compose): rename dependent service parameter #14243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/compose/service_containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func containerReasonEvents(containers Containers, eventFunc func(string, string)
// ServiceConditionRunningOrHealthy is a service condition on status running or healthy
const ServiceConditionRunningOrHealthy = "running_or_healthy"

func (s *composeService) waitDependencies(ctx context.Context, project *types.Project, dependant string, dependencies types.DependsOnConfig, containers Containers, timeout time.Duration) error {
func (s *composeService) waitDependencies(ctx context.Context, project *types.Project, dependent string, dependencies types.DependsOnConfig, containers Containers, timeout time.Duration) error {
if timeout > 0 {
withTimeout, cancelFunc := context.WithTimeout(ctx, timeout)
defer cancelFunc()
Expand All @@ -177,9 +177,9 @@ func (s *composeService) waitDependencies(ctx context.Context, project *types.Pr
s.events.On(containerEvents(waitingFor, waiting)...)
if len(waitingFor) == 0 {
if config.Required {
return fmt.Errorf("%s is missing dependency %s", dependant, dep)
return fmt.Errorf("%s is missing dependency %s", dependent, dep)
}
logrus.Warnf("%s is missing dependency %s", dependant, dep)
logrus.Warnf("%s is missing dependency %s", dependent, dep)
continue
}

Expand Down