Refs #33147 - Allow Auth token without Auth URL #9529
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
|
Issues: #33147 |
sjha4
force-pushed
the
ref33147
branch
2 times, most recently
from
d102dd0
to
3643e33
Compare
sjha4
commented
Aug 4, 2021
| @@ -413,7 +413,7 @@ def full_path(smart_proxy = nil, force_http = false) | |||
| elsif ostree? | |||
| "#{scheme}://#{pulp_uri.host.downcase}/pulp/content/web/#{relative_path}" | |||
| elsif ansible_collection? | |||
| "#{scheme}://#{pulp_uri.host.downcase}/pulp_ansible/galaxy/#{relative_path}/api" | |||
| "#{scheme}://#{pulp_uri.host.downcase}/pulp_ansible/galaxy/#{relative_path}/api/" | |||
| else | |||
There was a problem hiding this comment.
Allows users to copy paste this path as remote for other pulp instance, (ex: hub) with a trailing slash.
sjha4
commented
Aug 4, 2021
| @@ -96,7 +96,7 @@ <h4 translate>Sync Settings</h4> | |||
| <input id="requirementFile" type="file" name="file_path" onclick="this.value = null" onchange="angular.element(this).scope().handleFiles(this)"/> | |||
| <p bst-alert='info' ng-show="repository.content_type == 'ansible_collection'"> | |||
| <span translate> | |||
| You can upload a requirements.yml file above to auto-fill contents <b>OR</b> paste contents of <a ng-href="https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file" target="_blank"> Requirements.yml </a>below. | |||
| You can upload a requirements.yml file above to auto-fill contents <b>OR</b> paste contents of <a ng-href="https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#install-multiple-collections-with-a-requirements-file" target="_blank"> Requirements.yml </a>below. | |||
jlsherrill
approved these changes
Aug 9, 2021
jlsherrill
pushed a commit
to jlsherrill/katello
that referenced
this pull request
Aug 30, 2021
(cherry picked from commit 7253124)
jlsherrill
pushed a commit
that referenced
this pull request
Aug 31, 2021
(cherry picked from commit 7253124)
jlsherrill
pushed a commit
to jlsherrill/katello
that referenced
this pull request
Nov 8, 2021
…n are supplied Fixes #33208 - Allow Auth token without Auth URL (Katello#9529) (cherry picked from commit 7253124)
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.
In the PR: #9500 we wrongly added the validation that auth_token can not be provided without an auth URL.
The only validation needed is that auth_url can not be provided without a token. The vice-versa is fine and both fields blank is also valid.
Another issue I notice around collections is updating auth_url and token wasn't triggering a pulp remote update. That is fixed with this PR too.