katello 4.2.0.rc1 → 4.2.0.rc2

data/app/services/katello/pulp3/repository/yum.rb

@@ -319,6 +319,11 @@ module Katello
             dest_repo_map[:content_unit_hrefs] = content_unit_hrefs.uniq.sort
           end
 
+          errata_to_include = errata_to_include_from_map(repo_id_map)
+          repo_id_map.each do |_, dest_repo_map|
+            dest_repo_map[:content_unit_hrefs] |= errata_to_include.flat_map { |erratum| erratum.repository_errata.pluck(:erratum_pulp3_href) }
+          end
+
           dependency_solving = options[:solve_dependencies] || false
 
           multi_copy_units(repo_id_map, dependency_solving)
@@ -353,13 +358,19 @@ module Katello
           blacklist_ids += modular_packages(source_repository, exclusion_modular_filters) unless exclusion_modular_filters.empty?
           content_unit_hrefs = whitelist_ids - blacklist_ids
           if content_unit_hrefs.any?
-            content_unit_hrefs += additional_content_hrefs(source_repository, content_unit_hrefs)
+            content_unit_hrefs += additional_content_hrefs(source_repository, content_unit_hrefs, true)
           end
           content_unit_hrefs += source_repository.srpms.pluck(:pulp_id)
           dependency_solving = options[:solve_dependencies] || false
           copy_units(source_repository, content_unit_hrefs.uniq, dependency_solving)
         end
 
+        def errata_to_include_from_map(repo_id_map)
+          all_errata = ::Katello::Erratum.in_repositories(repo_id_map.keys.flatten.uniq)
+          all_content_units = repo_id_map.values.pluck(:content_unit_hrefs).flatten.uniq
+          filter_errata_by_pulp_href(all_errata, all_content_units)
+        end
+
         def modular_packages(source_repository, filters)
           list_ids = []
           filters.each do |filter|
@@ -368,12 +379,14 @@ module Katello
           list_ids
         end
 
-        def additional_content_hrefs(source_repository, content_unit_hrefs)
+        def additional_content_hrefs(source_repository, content_unit_hrefs, copy_errata = false)
           repo_service = source_repository.backend_service(SmartProxy.pulp_primary)
           options = { :repository_version => source_repository.version_href }
 
-          errata_to_include = filter_errata_by_pulp_href(source_repository.errata, content_unit_hrefs)
-          content_unit_hrefs += errata_to_include.collect { |erratum| erratum.repository_errata.pluck(:erratum_pulp3_href) }.flatten
+          if copy_errata
+            errata_to_include = filter_errata_by_pulp_href(source_repository.errata, content_unit_hrefs)
+            content_unit_hrefs += errata_to_include.collect { |erratum| erratum.repository_errata.pluck(:erratum_pulp3_href) }.flatten
+          end
 
           package_groups_to_include = filter_package_groups_by_pulp_href(source_repository.package_groups, content_unit_hrefs)
           content_unit_hrefs += package_groups_to_include.pluck(:pulp_id)

data/app/services/katello/pulp3/repository.rb

@@ -75,8 +75,39 @@ module Katello
 
       def create_remote
         remote_file_data = api.class.remote_class.new(remote_options)
-        response = api.remotes_api.create(remote_file_data)
-        repo.update!(:remote_href => response.pulp_href)
+        reformat_api_exception do
+          response = api.remotes_api.create(remote_file_data)
+          repo.update!(:remote_href => response.pulp_href)
+        end
+      end
+
+      # When updating a repository, we need to update the remote, but this is
+      # an async task.  If some validation occurs, we won't know about it until
+      # the task runs.  Errors during a repository update task are very difficult to
+      # handle once the task is in its run phase, so this creates a test remote
+      # with a random name in order to validate the remote's configuration
+      def create_test_remote
+        test_remote_options = remote_options
+        test_remote_options[:name] = test_remote_name
+        remote_file_data = api.class.remote_class.new(test_remote_options)
+
+        reformat_api_exception do
+          response = api.remotes_api.create(remote_file_data)
+          #delete is async, but if its not properly deleted, orphan cleanup will take care of it later
+          delete_remote(response.pulp_href)
+        end
+      end
+
+      def test_remote_name
+        "test_remote_#{SecureRandom.uuid}"
+      end
+
+      def reformat_api_exception
+        yield
+      rescue api.class.client_module::ApiError => exception
+        body = JSON.parse(exception.response_body) rescue body
+        body = body.values.join(',') if body.respond_to?(:values)
+        raise ::Katello::Errors::Pulp3Error, body
       end
 
       def update_remote
@@ -166,13 +197,16 @@ module Katello
         computed_options.except(:name, :client_key)
       end
 
-      def create
-        unless repository_reference
+      def create(force = false)
+        if force || !repository_reference
           response = api.repositories_api.create(create_options)
-          RepositoryReference.create!(
-           root_repository_id: repo.root_id,
-           content_view_id: repo.content_view.id,
-           repository_href: response.pulp_href)
+          RepositoryReference.where(
+            root_repository_id: repo.root_id,
+            content_view_id: repo.content_view.id).destroy_all
+          RepositoryReference.where(
+            root_repository_id: repo.root_id,
+            content_view_id: repo.content_view.id,
+            repository_href: response.pulp_href).create!
           response
         end
       end

data/app/services/katello/pulp3/repository_mirror.rb

@@ -47,7 +47,7 @@ module Katello
         create_remote unless fetch_remote
       end
 
-      def create
+      def create(_force = false)
         api.repositories_api.create(name: backend_object_name)
       end
 

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -57,6 +57,7 @@ attributes :ostree_branch_names => :ostree_branches
 attributes :relative_path
 attributes :promoted? => :promoted
 attributes :content_view_version_id, :library_instance_id
+attributes :last_contents_changed
 
 if @resource.is_a?(Katello::Repository)
   if @resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant

data/app/views/smart_proxies/plugins/_pulpcore.html.erb

@@ -1,5 +1,5 @@
 <div class="row">
-  <h3><%= _('Pulpcore') %></h3>
+  <h3><%= _('Content') %></h3>
 </div>
 <%= show_feature_version('pulpcore') %>
 <div class="row">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -37,7 +37,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
                 errata: IncrementalUpdate.getErrataIds().join(','),
-                hostIds: IncrementalUpdate.getBulkContentHosts().included.ids.join(','),
+                bulkHostIds: angular.toJson({ included: { ids: IncrementalUpdate.getBulkContentHosts().included.ids }}),
                 customize: false
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -18,7 +18,7 @@
   <form id="errataActionForm" method="post" action="/katello/remote_execution">
     <input type="hidden" name="remote_action" value="errata_install"/>
     <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-    <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+    <input type="hidden" name="bulk_host_ids" ng-value="errataActionFormValues.bulkHostIds"/>
     <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
     <input type="hidden" name="install_all" ng-value="table.allResultsSelected" />
@@ -132,4 +132,3 @@
     </button>
   </form>
 </section>
-

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -90,6 +90,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.save = function (repository, saveUpstreamAuth) {
                 var deferred = $q.defer();
+                var fields = ['upstream_password', 'upstream_username', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements'];
                 if (repository.content_type === 'yum' && typeof repository.ignore_srpms !== 'undefined') {
                     if (repository['ignore_srpms']) {
                         repository['ignorable_content'] = ["srpm"];
@@ -111,6 +112,12 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                     repository["docker_tags_whitelist"] = [];
                 }
                 /* eslint-disable camelcase */
+
+                angular.forEach(fields, function(field) {
+                    if (repository[field] === '') {
+                        repository[field] = null;
+                    }
+                });
                 repository.os_versions = $scope.osVersionsParam();
                 repository.$update(function (response) {
                     deferred.resolve(response);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -96,7 +96,7 @@
           <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.
           </span>
       </p>
         </dd>
@@ -477,7 +477,7 @@
       <div class="divider" ng-if="repository.content_type === 'ostree'"/>
     </section>
 
-    <section class="well" ng-if="permitted('edit_products', product) && !product.redhat && repository.content_type !== 'docker' && repository.content_type !== 'ostree'">
+    <section class="well" ng-if="permitted('edit_products', product) && !product.redhat && repository.content_type !== 'docker' && repository.content_type !== 'ostree' && repository.content_type !== 'ansible_collection'">
       <h5 translate ng-show="repository.content_type === 'yum'">Upload Package</h5>
       <h5 translate ng-show="repository.content_type === 'file'">Upload File</h5>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -118,6 +118,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             });
 
             $scope.save = function (repository) {
+                var fields = ['upstream_password', 'upstream_username', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements'];
                 if (repository.content_type === 'ostree') {
                     repository.unprotected = false;
                 }
@@ -135,6 +136,11 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                 if (repository.arch === 'No restriction') {
                     repository.arch = null;
                 }
+                angular.forEach(fields, function(field) {
+                    if (repository[field] === '') {
+                        repository[field] = null;
+                    }
+                });
                 repository.$save(success, error);
             };
 

data/lib/katello/tasks/repository.rake

@@ -114,20 +114,21 @@ namespace :katello do
   def repo_exists?(repo)
     if SmartProxy.pulp_primary!.pulp3_support?(repo)
       backend_service = repo.backend_service(SmartProxy.pulp_primary!)
+      return false unless backend_service&.repository_reference&.repository_href
       backend_service.api.repositories_api.read(backend_service.repository_reference.repository_href)
     else
       Katello.pulp_server.extensions.repository.retrieve(repo.pulp_id)
     end
     true
-  rescue RestClient::ResourceNotFound, PulpRpmClient::ApiError
-    false
+  rescue StandardError => e
+    return false if e.code == 404
   end
 
   def handle_missing_repo(repo)
     puts "Repository #{repo.id} Missing"
     if repo.content_view.default?
       puts "Recreating #{repo.id}"
-      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo) if commit?
+      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true) if commit?
     else
       puts "Deleting #{repo.id}"
       ForemanTasks.sync_task(::Actions::Katello::Repository::Destroy, repo) if commit?

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.2.0.rc1".freeze
+  VERSION = "4.2.0.rc2".freeze
 end

data/locale/bn/katello.po

@@ -363,7 +363,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy

data/locale/cs/katello.po

@@ -320,7 +320,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy

data/locale/de/katello.po

@@ -303,7 +303,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr "Ein Back-End-Dienst [ %s ] kann nicht erreicht werden"
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/en/katello.po

@@ -296,7 +296,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/es/katello.po

@@ -305,7 +305,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr "No se puede acceder a un servicio de segundo plano [ %s ]"
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/fr/katello.po

@@ -306,7 +306,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr "Un service d'arrière-plan [ %s ] est injoignable"
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/gu/katello.po

@@ -364,7 +364,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy

data/locale/hi/katello.po

@@ -362,7 +362,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy

data/locale/it/katello.po

@@ -304,7 +304,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr "Impossibile raggiungere un servizio backend [ %s ]"
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/ja/katello.po

@@ -312,7 +312,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr "バックエンドサービス [ %s ] には到達不能です"
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/katello.pot

@@ -9016,7 +9016,7 @@ msgid "You currently don't have any Content Views."
 msgstr ""
 
 #: ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:141
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #: ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:15

data/locale/kn/katello.po

@@ -364,7 +364,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy

data/locale/ko/katello.po

@@ -302,7 +302,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr "백엔드 서비스 [ %s ]를 사용할 수 없음 "
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 msgid "A content_type must be provided."

data/locale/mr/katello.po

@@ -361,7 +361,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy

data/locale/or/katello.po

@@ -363,7 +363,7 @@ msgstr ""
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-msgid "A content view can be added by using the \"New content view\" button below."
+msgid "A content view can be added by using the \"Create content view\" button above."
 msgstr ""
 
 #, fuzzy