Support HTCondor's funky _ schemes #69
Merged
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
…to the file transfer scheme, causing transfers with the OSDF plugin to fail. Introduced a new function, `correctURLWithUnderscore()`, which corrects URLs before they are passed to the URL parsing library. This function replaces any underscore in the scheme part of the URL with a period, ensuring compatibility with URL parsing. The source and destination URL parsing code have been updated to first pass the URL through the new correction function, before parsing it. After parsing the URL, the original scheme (potentially containing underscores) is restored to ensure integrity and prevent potential misinterpretation of the URL.
…eviously introduced to resolve the issue of HTCondor adding underscores into the file transfer scheme. The function initially lacked a condition to return the original string if the scheme separator '://' was not found. This could have led to the function returning an incorrect scheme index. The function has now been updated to return the original source file and an empty string for the scheme when the separator is not present. This ensures that URLs without a scheme will not be altered incorrectly.
djw8605
requested changes
May 23, 2023
Implemented a unit test, `TestCorrectURLWithUnderscore()`, for the `correctURLWithUnderscore()` function to ensure its correct behavior. The test covers several potential URL scenarios, including: 1. LIGO URLs that include an underscore in the scheme. 2. URLs that do not contain an underscore in the scheme. 3. URLs that lack a scheme altogether.
|
@CohenQU - can you please resolve the conflict? Then I think it's ready to go. |
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.
No description provided.