Fixes #31197 - adjust ansible URLs

Katello · Jun 14, 2021 · d6dd2a6 · d6dd2a6
1 parent a1e0372
commit d6dd2a6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/app/services/katello/pulp3/repository/ansible_collection.rb b/app/services/katello/pulp3/repository/ansible_collection.rb
@@ -25,7 +25,7 @@ def distribution_options(path)
         end
 
         def partial_repo_path
-          "/pulp_ansible/galaxy/#{repo.relative_path}/api/v2/collections"
+          "/pulp_ansible/galaxy/#{repo.relative_path}/api/"
         end
 
         def mirror_remote_options

diff --git a/...avascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js b/...avascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
@@ -144,13 +144,11 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.collectionURLPopover = $sce.trustAsHtml("You can sync collections utilizing just the url:<br/>" +
           "<b>1. For all collections in Ansible Galaxy:</b><br/>" +
-          "https://galaxy.ansible.com/api/v2/collections <br/>" +
-          "<b>2. For specific collection with URL filtering:</b><br/>" +
-          "https://galaxy.ansible.com/api/v2/collections/testing/k8s_demo_collection <br/>" +
-          "<b>3. For specific collections with Requirements.yml:</b><br/>" +
+          "https://galaxy.ansible.com/api/<br/>" +
+          "<b>2. For specific collections with Requirements.yml:</b><br/>" +
           "Use base URL https://galaxy.ansible.com/ and specify requirements.yml below to specify collections");
 
-            $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
+            $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
 
             $scope.displayHttpProxyPolicyName = function (policy) {
                 return HttpProxyPolicy.displayHttpProxyPolicyName(policy);

diff --git a/test/services/katello/pulp3/repository/ansible_collection/repository_mirror_options_test.rb b/test/services/katello/pulp3/repository/ansible_collection/repository_mirror_options_test.rb
@@ -19,7 +19,7 @@ def setup
         def test_feed_url_is_prepended_with_pulp_rpm_content_path
           pulp3_repo = Katello::Pulp3::Repository::AnsibleCollection.new(@repo, @mock_smart_proxy)
 
-          assert_equal '/pulp_ansible/galaxy/' + @repo.relative_path + '/api/v2/collections', pulp3_repo.partial_repo_path
+          assert_equal '/pulp_ansible/galaxy/' + @repo.relative_path + '/api/', pulp3_repo.partial_repo_path
         end
 
         def test_remote_options