Skip to content

refactor: deduplicate optional variable checks #797

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

Draft
tomatotomata wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: deduplicate optional variable checks #797

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
27 changes: 12 additions & 15 deletions internal/doctor/doctor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,16 +783,8 @@ func CheckVariables(cfg *complytime.WorkspaceConfig, healthData []ProviderHealth
}
}
for _, group := range ph.OptionalTargetVariableGroups {
members := strings.Split(group, "|")
targetTotal++
found := false
for _, m := range members {
if _, ok := target.Variables[m]; ok {
found = true
break
}
}
if found {
if groupSatisfied(group, target.Variables) {
targetResolved++
} else {
missingTargetVars = append(missingTargetVars,
Expand Down Expand Up @@ -891,13 +883,9 @@ func CheckVariables(cfg *complytime.WorkspaceConfig, healthData []ProviderHealth
})
}
for _, group := range ph.OptionalTargetVariableGroups {
members := strings.Split(group, "|")
detailStatus := StatusFail
for _, m := range members {
if _, ok := target.Variables[m]; ok {
detailStatus = StatusPass
break
}
if groupSatisfied(group, target.Variables) {
detailStatus = StatusPass
}
details = append(details, CheckResult{
Name: fmt.Sprintf("variables/%s/detail", ph.EvaluatorID),
Expand Down Expand Up @@ -1055,6 +1043,15 @@ func countResolved(required []string, vars map[string]string) (resolved, total i
return resolved, total
}

func groupSatisfied(group string, vars map[string]string) bool {
for _, member := range strings.Split(group, "|") {
if _, ok := vars[member]; ok {
return true
}
}
return false
}

func unmappedReason(resolver PolicyGraphResolver, resolveFailures int) string {
if resolver == nil {
return "no policy resolver available"
Expand Down