-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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.
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
Fix 3812; Error message changed and check for MalformedYamlError #4497
Conversation
….accumulateResources checks for this new error type
@m-Bilal: This PR has multiple commits, and the default merge method is: merge. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Hi @m-Bilal. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: m-Bilal The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/ok-to-test Thank you for working on this! |
I think this would also partially fix #4348 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great! Very minor comment, I'd like to have the test compare the full actual error string.
err := th.RunWithErr(".", th.MakeDefaultOptions()) | ||
if !kusterr.IsMalformedYAMLError(err) { | ||
t.Fatalf("unexpected error: %q", err) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also add a check for the error contents, e.g. assert.Equal(t, err.Error(), expectedErr)
@@ -159,8 +159,8 @@ func demandDirectoryRoot( | |||
} | |||
if f != "" { | |||
return "", fmt.Errorf( | |||
"got file '%s', but '%s' must be a directory to be a root", | |||
f, path) | |||
"'%s' must be a directory so that it can used as a build root", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is so much better, thank you!
/lgtm |
Merging so it can be part of today's release |
Fixes #3812
I have created a new Error type MalformedYamlError and introduced a check for it at:
kustomize/api/internal/target/kusttarget.go
Lines 407 to 412 in c65ef48