Skip to content

Commit b19fe61

Browse files
[code-simplifier] refactor: combine requestedTools and paramsList building into single pass (#23515 follow-up) (#23522)
1 parent 0b76aaa commit b19fe61

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

pkg/cli/docker_images.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,26 +200,27 @@ func CheckAndPrepareDockerImages(ctx context.Context, useZizmor, usePoutine, use
200200
// Check if Docker daemon is available before attempting any image operations
201201
if !IsDockerAvailable() {
202202
var requestedTools []string
203+
var paramsList []string
203204
if useZizmor {
204-
requestedTools = append(requestedTools, "zizmor")
205+
tool := "zizmor"
206+
requestedTools = append(requestedTools, tool)
207+
paramsList = append(paramsList, tool+": false")
205208
}
206209
if usePoutine {
207-
requestedTools = append(requestedTools, "poutine")
210+
tool := "poutine"
211+
requestedTools = append(requestedTools, tool)
212+
paramsList = append(paramsList, tool+": false")
208213
}
209214
if useActionlint {
210-
requestedTools = append(requestedTools, "actionlint")
211-
}
212-
toolsList := strings.Join(requestedTools, " and ")
213-
var paramsList []string
214-
for _, tool := range requestedTools {
215+
tool := "actionlint"
216+
requestedTools = append(requestedTools, tool)
215217
paramsList = append(paramsList, tool+": false")
216218
}
217-
paramsSuggestion := strings.Join(paramsList, " and ")
218219
verb := "requires"
219220
if len(requestedTools) > 1 {
220221
verb = "require"
221222
}
222-
return fmt.Errorf("docker is not available (cannot connect to Docker daemon). %s %s Docker. Please install and start Docker, or set %s to skip static analysis", toolsList, verb, paramsSuggestion)
223+
return fmt.Errorf("docker is not available (cannot connect to Docker daemon). %s %s Docker. Please install and start Docker, or set %s to skip static analysis", strings.Join(requestedTools, " and "), verb, strings.Join(paramsList, " and "))
223224
}
224225

225226
var missingImages []string

0 commit comments

Comments
 (0)