Skip to content
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

Jump to bottom

Fix usage of absolute windows paths with --image-path #17266

Merged
merged 1 commit into from
Jan 29, 2023
Merged

Fix usage of absolute windows paths with --image-path #17266

merged 1 commit into from
Jan 29, 2023

Conversation

n1hility
Copy link
Member

@n1hility n1hility commented Jan 28, 2023 •
edited
Loading

Fixes: #15995

Only assume that http(s) scheme URLs (only ones supported by http.Client anyway) are URLs. Treat everything else as a file path. (Windows paths can look like a URL scheme)

Fixed usage of absolute image paths on Windows when specified with --image-path on machine init

[NO NEW TESTS NEEDED]

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 28, 2023
@n1hility n1hility added the 4.4 label Jan 28, 2023
@n1hility
Copy link
Member Author

PTAL @ashley-cui @baude

Note: this does also affect macos codepath. Let me know if you have any concerns. I did double check both behave as expected.

@n1hility
Fix usage of absolute windows paths with --image-path
063e273 
Only assume that http(s) scheme URLs (only ones supported by http.Client anyway) are URLs.
Treat everything else as a file path. (Windows paths can look like a URL scheme)

Signed-off-by: Jason T. Greene <[email protected]>
rhatdan
rhatdan reviewed Jan 29, 2023
View reviewed changes
pkg/machine/pull.go
func supportedURL(path string) (url *url2.URL) {
getURL, err := url2.Parse(path)
if err != nil {
return nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks wrong.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I get what you are doing, might be nice to say that you are ignoring failure.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, good point, created a follow-up pr for this: #17269

@rhatdan
Copy link
Member

rhatdan commented Jan 29, 2023

LGTM

vrothberg
vrothberg approved these changes Jan 29, 2023
View reviewed changes
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 29, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 29, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: n1hility, vrothberg

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit b7987ca into containers:main Jan 29, 2023
@n1hility n1hility mentioned this pull request Jan 29, 2023
Merged
@edsantiago edsantiago mentioned this pull request Jan 30, 2023
Open
@n1hility
Copy link
Member Author

/cherry-pick v4.4

@openshift-cherrypick-robot
Copy link
Collaborator

@n1hility: #17266 failed to apply on top of branch "v4.4":

Applying: Fix usage of absolute windows paths with --image-path
Using index info to reconstruct a base tree...
M	pkg/machine/pull.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/machine/pull.go
CONFLICT (content): Merge conflict in pkg/machine/pull.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix usage of absolute windows paths with --image-path
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick v4.4

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.

@n1hility n1hility mentioned this pull request Jan 30, 2023
Merged
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 13, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rhatdan rhatdan rhatdan left review comments

@vrothberg vrothberg vrothberg approved these changes

Assignees

@vrothberg vrothberg

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Create Image without Internet connection on Windows
5 participants
@n1hility @rhatdan @openshift-cherrypick-robot @vrothberg @openshift-merge-robot