Skip to content

OCPBUGS-4986: pkg/payload/precondition: Do not claim warnings would have blocked #876

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
Dec 17, 2022
Merged

OCPBUGS-4986: pkg/payload/precondition: Do not claim warnings would have blocked #876

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion pkg/payload/precondition/precondition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func Summarize(errs []error, force bool) (bool, error) {
}
continue
}
isWarning = false
msgs = append(msgs, e.Error())

}
Expand All @@ -91,7 +92,7 @@ func Summarize(errs []error, force bool) (bool, error) {
msg = fmt.Sprintf("Multiple precondition checks failed:\n* %s", strings.Join(msgs, "\n* "))
}

if force {
if force && !isWarning {
msg = fmt.Sprintf("Forced through blocking failures: %s", msg)
isWarning = true
}
Expand Down
26 changes: 24 additions & 2 deletions pkg/payload/precondition/precondition_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,36 @@ func TestSummarize(t *testing.T) {
}, {
name: "unrecognized error type",
errors: []error{fmt.Errorf("random error")},
expectedBlock: false,
expectedBlock: true,
expectedError: "random error",
}, {
name: "forced unrecognized error type",
errors: []error{fmt.Errorf("random error")},
force: true,
expectedBlock: false,
expectedError: "Forced through blocking failures: random error",
}, {
name: "unforced warning",
errors: []error{&Error{
Nested: nil,
Reason: "UnknownUpdate",
Message: "update from A to B is probably neither recommended nor supported.",
NonBlockingWarning: true,
Name: "ClusterVersionRecommendedUpdate",
}},
expectedBlock: false,
expectedError: `Precondition "ClusterVersionRecommendedUpdate" failed because of "UnknownUpdate": update from A to B is probably neither recommended nor supported.`,
}, {
name: "forced through warning",
errors: []error{&Error{
Nested: nil,
Reason: "UnknownUpdate",
Message: "update from A to B is probably neither recommended nor supported.",
NonBlockingWarning: true,
Name: "ClusterVersionRecommendedUpdate",
}},
force: true,
expectedError: `Precondition "ClusterVersionRecommendedUpdate" failed because of "UnknownUpdate": update from A to B is probably neither recommended nor supported.`,
}, {
name: "single feature-gate error",
errors: []error{&Error{
Expand All @@ -42,7 +64,7 @@ func TestSummarize(t *testing.T) {
}, {
name: "two unrecognized error types",
errors: []error{fmt.Errorf("random error"), fmt.Errorf("random error 2")},
expectedBlock: false,
expectedBlock: true,
expectedError: `Multiple precondition checks failed:
* random error
* random error 2`,
Expand Down