[master] Fix urlunparse for salt file urls on python-3.12 #66948
+8
−1
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
salt-project-bot-prod-environment
bot
changed the title
dmurphy18
previously approved these changes
Oct 7, 2024
jfindlay
changed the title
jfindlay
force-pushed
the
urlunparse
branch
2 times, most recently
from
a4baa23
to
023e875
Compare
|
Essentially duplicate of #66899 |
bdrx312
reviewed
Oct 7, 2024
salt/utils/url.py
Outdated
| return "salt://{}".format(url[len("file:///") :]) | ||
| url = salt.utils.data.decode(urlunparse(("salt", "", path, "", query, ""))) | ||
| # urllib returns `salt:` but salt wants `salt://`, so normalize here | ||
| if url.startswith("salt:{path}"): |
There was a problem hiding this comment.
Missing the f: if url.startswith(f"salt:{path}"):
bdrx312
reviewed
Oct 7, 2024
salt/utils/url.py
Outdated
| @@ -46,8 +46,11 @@ def create(path, saltenv=None): | |||
| path = salt.utils.data.decode(path) | |||
|
|
|||
| query = f"saltenv={saltenv}" if saltenv else "" | |||
| url = salt.utils.data.decode(urlunparse(("file", "", path, "", query, ""))) | |||
| return "salt://{}".format(url[len("file:///") :]) | |||
| url = salt.utils.data.decode(urlunparse(("salt", "", path, "", query, ""))) | |||
There was a problem hiding this comment.
I am not sure that you can safely just replace "file" with "salt". There is special handling for a file scheme; I am not sure the extent of what is different but it could affect how the path and query are handled.
There was a problem hiding this comment.
ok, reverted to original format with file:.
Previously, the `salt.utils.url.create()` method naively assumed the compiled URL provided by `urllib.parse.urlunparse()` always starts with the literal string `file:///`, that is, the begininning of the URL string starting with the `scheme` and including an empty `authority` section. Beginning with [python-3.12](python/cpython@0edfc66), however, generating a URL with `urlunparse()` results in the syntax `file:` for the portion of the URL including the `scheme` and `authority` sections.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Previously, the
salt.utils.url.create()method naively assumed the compiled URL provided byurllib.parse.urlunparse()always starts with the literal stringfile:///, that is, the begininning of the URL string starting with theschemeand including an emptyauthoritysection. Beginning with python-3.12, however, generating a URL withurlunparse()results in the syntaxfile:for the portion of the URL including theschemeandauthoritysections.Since
urlunparse()accepts the arbitrary schemesalt, use it instead and then normalize the rendered scheme tosalt://as SaltStack expects.Without this change, salt can't even find its own top file:
Previous Behavior
New Behavior
Commits signed with GPG?
Yes