bug 1960378: Relax the imageContentSource validation #5346
Conversation
kirankt
changed the title
|
/bugzilla refresh |
openshift-ci
bot
added
the
bugzilla/severity-medium
|
@kirankt: This pull request references Bugzilla bug 1960378, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gpei@redhat.com), skipping review request. In response to this:
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. |
openshift-ci
bot
added
the
bugzilla/valid-bug
|
@kirankt: An error was encountered querying GitHub for users with public email (gpei@redhat.com) for bug 1960378 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details. Full error message.
non-200 OK status code: 403 Forbidden body: "{\n \"documentation_url\": \"https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#secondary-rate-limits\",\n \"message\": \"You have exceeded a secondary rate limit. Please wait a few minutes before you try again.\"\n}\n"
Please contact an administrator to resolve this issue, then request a bug refresh with In response to this:
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. |
|
/retest |
|
@kirankt: This pull request references Bugzilla bug 1960378, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gpei@redhat.com), skipping review request. In response to this:
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. |
|
/lgtm |
|
@kirankt: This pull request references Bugzilla bug 1960378, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gpei@redhat.com), skipping review request. In response to this:
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. |
| if err != nil { | ||
| host = r | ||
| } | ||
| if err = validate.Host(host); err != nil { | ||
| return fmt.Errorf("the repository provided is invalid") |
There was a problem hiding this comment.
Let's wrap around the error returned from validate.Host.
| return fmt.Errorf("the repository provided is invalid") | |
| return errors.Wrap(err, "the repository provided is invalid") |
There was a problem hiding this comment.
Usually I like wrapping things but this one is unnecessarily verbose. This is what gets spit out:
Invalid value: "ocp/release-x.y": the repository provided is invalid: a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*')
So, I'm not sure about the wrapping. Let me know what you think.
There was a problem hiding this comment.
I personally prefer the more verbose error rather than a statement that the repository is invalid without any details about how it is invalid.
There was a problem hiding this comment.
Done.
Just so that you know, I was cursing at you while escaping the regex in the validation. 😄
There was a problem hiding this comment.
Fair enough. For what it's worth, I would have happily accepted .* for the majority of the error message or omitting the end and the $.
…eck fails Return a more verbose invalid response for a bad host value
| @@ -566,9 +566,14 @@ func validateNamedRepository(r string) error { | |||
| // in an error. Instead we will check whether the input is | |||
| // a valid hostname as a workaround. | |||
| if err == dockerref.ErrNameNotCanonical { | |||
| _, err := url.ParseRequestURI(r) | |||
| // If the hostname string contains a port, lets attempt | |||
There was a problem hiding this comment.
nit
| // If the hostname string contains a port, lets attempt | |
| // If the hostname string contains a port, let's attempt |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: staebler The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
@kirankt: The following tests failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
@kirankt: All pull requests linked via external trackers have merged: Bugzilla bug 1960378 has been moved to the MODIFIED state. In response to this:
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. |
Relax the imageContentSource validation to allow for mirroring root registry.
This is a follow up to a previous attempt: #5297 which didn't quite fix the issue. The use of url.Parse does not work as expected. This PR utilized validate.Host function to check for a valid host name/IP when the canonical check fails.