Skip to content

ci-operator: fix missing dependencies messages #27

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

Merged
openshift-merge-robot merged 1 commit into from
Jul 23, 2019
Merged

ci-operator: fix missing dependencies messages #27

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
15 changes: 3 additions & 12 deletions cmd/ci-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,15 +1109,6 @@ func nodeNames(nodes []*api.StepNode) []string {
return names
}

func linkNames(links []api.StepLink) []string {
var names []string
for _, link := range links {
name := fmt.Sprintf("<%#v>", link)
names = append(names, name)
}
return names
}

func topologicalSort(nodes []*api.StepNode) ([]*api.StepNode, error) {
var sortedNodes []*api.StepNode
var satisfied []api.StepLink
Expand Down Expand Up @@ -1145,13 +1136,13 @@ func topologicalSort(nodes []*api.StepNode) ([]*api.StepNode, error) {
}
if !changed && len(waiting) > 0 {
for _, node := range waiting {
var missing []api.StepLink
var missing []string
for _, link := range node.Step.Requires() {
if !api.HasAllLinks([]api.StepLink{link}, satisfied) {
missing = append(missing, link)
missing = append(missing, fmt.Sprintf("<%#v>", link))
}
log.Printf("step <%T> is missing dependencies: %s", node.Step, strings.Join(linkNames(missing), ", "))
}
log.Printf("step <%T> is missing dependencies: %s", node.Step, strings.Join(missing, ", "))
}
return nil, errors.New("steps are missing dependencies")
}
Expand Down