Expand user home on galaxy install src #70942
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ansibot
added
affects_2.11
bug
webknjaz
reviewed
Jul 28, 2020
ansibot
added
needs_revision
webknjaz
approved these changes
Jul 28, 2020
|
@ssbarnea this needs a change note file in order to get merged |
ansibot
added
core_review
ssbarnea
force-pushed
the
fix/galaxy-expand-user
branch
from
2fba277
to
c8aeede
Compare
ansibot
added
the
support:community
ssbarnea
force-pushed
the
fix/galaxy-expand-user
branch
from
c8aeede
to
5368b32
Compare
ansibot
added
needs_revision
ansibot
added
needs_revision
|
/me just restarted the failed job |
ansibot
added
core_review
acozine
added
P3
samdoran
reviewed
Jul 30, 2020
lib/ansible/galaxy/role.py
Outdated
| @@ -64,7 +64,7 @@ def __init__(self, galaxy, api, name, src=None, version=None, scm=None, path=Non | |||
|
|
|||
| self.name = name | |||
| self.version = version | |||
| self.src = src or name | |||
| self.src = os.path.expanduser(src or name) | |||
There was a problem hiding this comment.
This should use ansible.utils.path.unfrackpath.
|
I read through the code and I think think it will be ok. I would like to have tests. We should also make sure this works for collections (if it doesn't already) so we can maintain feature parity. |
|
we should also discuss if |
ansibot
added
the
stale_ci
|
just import and use as a normal python function |
samdoran
reviewed
Nov 3, 2020
lib/ansible/galaxy/role.py
Outdated
| @@ -64,7 +64,7 @@ def __init__(self, galaxy, api, name, src=None, version=None, scm=None, path=Non | |||
|
|
|||
| self.name = name | |||
| self.version = version | |||
| self.src = src or name | |||
| self.src = os.path.expanduser(src or name) | |||
There was a problem hiding this comment.
Suggested change
| self.src = os.path.expanduser(src or name) | |
| from ansible.utils.path import unfrackpath | |
| ... | |
| self.src = unfrackpath(src or name) |
There was a problem hiding this comment.
Sorry I gave you the wrong function name (unfrack_path) initially.
Fix bug where ansible-galaxy install would fail when given paths starting with tilde (user home). Related: ansible/galaxy#2030
ssbarnea
force-pushed
the
fix/galaxy-expand-user
branch
from
b5e04c1
to
2a449c6
Compare
ansibot
added
needs_revision
ansibot
added
the
stale_ci
ansibot
added
pre_azp
ansibot
added
the
needs_rebase
s-hertel
requested changes
Feb 9, 2021
| @@ -272,6 +272,9 @@ Use the following example as a guide for specifying roles in *requirements.yml*: | |||
|
|
|||
| # from locally cloned git repository (file:// requires full paths) | |||
| - src: file:///home/bennojoy/nginx | |||
|
|
|||
| # from locally cloned repository | |||
There was a problem hiding this comment.
This wording might be confusing since we have particular syntax for repos. The example above was recently changed 7762741.
# from local pathis maybe clearer
| @@ -64,7 +65,7 @@ def __init__(self, galaxy, api, name, src=None, version=None, scm=None, path=Non | |||
|
|
|||
| self.name = name | |||
| self.version = version | |||
| self.src = src or name | |||
| self.src = unfrackpath(src or name) | |||
There was a problem hiding this comment.
We could be using unfrackpath on a URL, git repo, or something that provides an absolute path prefixed with file://. This would break those scenarios since we automatically prepend a base dir in unfrackpath.
>>> from ansible.utils.path import unfrackpath
>>> unfrackpath('https://github.com/')
'/home/shertel/ansible/https:/github.com'
>>> unfrackpath('file:///path')
'/home/shertel/ansible/file:/path'
>>> unfrackpath('git+file:///path')
'/home/shertel/ansible/git+file:/path'
We might be able to move this somewhere that's only supposed to handle directories, or your original os.path.expanduser() may be a better choice.
This definitely needs tests.
ansibot
removed
the
support:community
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Fix bug where ansible-galaxy install would fail when given paths starting with tilde (user home).
ISSUE TYPE
COMPONENT NAME
galaxy
ADDITIONAL INFORMATION
Related: ansible/galaxy#2030