Merge pull request #11661 from sbueringer/pr-hook-msg

k8s-ci-robot · web-flow · commit 5a7ab0ba1ef4 · 2025-01-10T11:42:30.000-08:00
🌱 Fix formatting of blocking lifecycle hook condition message
diff --git a/exp/topology/scope/hookresponsetracker.go b/exp/topology/scope/hookresponsetracker.go
@@ -91,7 +91,11 @@ func (h *HookResponseTracker) AggregateMessage() string {
 
 	hookAndMessages := []string{}
 	for hook, message := range blockingHooks {
-		hookAndMessages = append(hookAndMessages, fmt.Sprintf("hook %q is blocking: %s", hook, message))
+		if message == "" {
+			hookAndMessages = append(hookAndMessages, fmt.Sprintf("hook %q is blocking", hook))
+		} else {
+			hookAndMessages = append(hookAndMessages, fmt.Sprintf("hook %q is blocking: %s", hook, message))
+		}
 	}
 	return strings.Join(hookAndMessages, "; ")
 }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,11 @@ func (h *HookResponseTracker) AggregateMessage() string {`
`91`	`91`
`92`	`92`	`hookAndMessages := []string{}`
`93`	`93`	`for hook, message := range blockingHooks {`
`94`		`- hookAndMessages = append(hookAndMessages, fmt.Sprintf("hook %q is blocking: %s", hook, message))`
	`94`	`+ if message == "" {`
	`95`	`+ hookAndMessages = append(hookAndMessages, fmt.Sprintf("hook %q is blocking", hook))`
	`96`	`+ } else {`
	`97`	`+ hookAndMessages = append(hookAndMessages, fmt.Sprintf("hook %q is blocking: %s", hook, message))`
	`98`	`+ }`
`95`	`99`	`}`
`96`	`100`	`return strings.Join(hookAndMessages, "; ")`
`97`	`101`	`}`