Stop appending '/api' to galaxy server url #63238
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
Since not all galaxy REST api server URLs live at '/api', stop always appending it to the 'url' value loaded from config.
chouseknecht
changed the title
ansibot
added
WIP
Since we retry now with an added /api/, mock it as well.
chouseknecht
changed the title
|
All unit tests are passing. One test is marked as |
chouseknecht
approved these changes
Oct 8, 2019
ansibot
added
needs_revision
ansibot
added
shipit
|
@alikins Oh, I overlooked that this could use a changelog. |
|
@alikins @chouseknecht Merged. Please add a changelog when you open the backport to stable-2.9 and then I'll get the backpotr merged tomorrow. Thanks! |
abadger
pushed a commit
that referenced
this pull request
Oct 10, 2019
* Stop appending '/api' to galaxy server url (#63238) * Stop appending '/api' to configured galaxy server url Since not all galaxy REST api server URLs live at '/api', stop always appending it to the 'url' value loaded from config. * Add note about manually migrated galaxy configs and /api * Add '/api/' to galaxy url and guessing if galaxy API * Fix most unit tests (update to expect /api/) * Fix test_initialise_unknown unit test Since we retry now with an added /api/, mock it as well. * Update fallback default avail_ver to new format (cherry picked from commit bad7269) * Add changelog fragment galaxy_api_config * Fix galaxy url use everywhere when url is set in config. (#63286) In addition to trying the configured url (for ex, a migrated 'https://galaxy.ansible.com/') there is an attempt at that URL with '/api' postpended. If the extended URL works, update GalaxyAPI.api_server to use the extended URL. Previously it only used it for finding the API root info ('available_versions', etc) (cherry picked from commit ed203c5)
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
Stop appending '/api' to configured galaxy server url. Since not all Galaxy REST api server URLs live at
/api, the client can no longer blindly append/apito the URL found in the config.ISSUE TYPE
COMPONENT NAME
ansible-galaxy
ADDITIONAL INFORMATION