katello 3.15.1 → 3.16.0.rc2.1

data/app/services/katello/product_content_importer.rb

@@ -114,11 +114,11 @@ module Katello
                       { content: content.inspect, content_url: content.content_url, new_url: new_url })
         end
       end
-      content.update_attributes!(attrs_to_update) unless attrs_to_update.blank?
+      content.update!(attrs_to_update) unless attrs_to_update.blank?
     end
 
     private def update_product_content(product_content, new_enabled_value)
-      product_content.update_attributes!(enabled: new_enabled_value) if product_content.enabled != new_enabled_value
+      product_content.update!(enabled: new_enabled_value) if product_content.enabled != new_enabled_value
     end
   end
 end

data/app/services/katello/pulp/consumer.rb

@@ -65,21 +65,17 @@ module Katello
 
       def unbind_repo_ids(repo_ids, distributor_type)
         repo_ids.each do |repo_id|
-          begin
-            Katello.pulp_server.extensions.consumer.unbind_all(uuid, repo_id, distributor_type)
-          rescue => e
-            Rails.logger.error "Failed to unbind repo #{repo_id}: #{e}, #{e.backtrace.join("\n")}"
-          end
+          Katello.pulp_server.extensions.consumer.unbind_all(uuid, repo_id, distributor_type)
+        rescue => e
+          Rails.logger.error "Failed to unbind repo #{repo_id}: #{e}, #{e.backtrace.join("\n")}"
         end
       end
 
       def bind_repo_ids(repo_ids, distributor_type, bind_options)
         repo_ids.each do |repo_id|
-          begin
-            Katello.pulp_server.extensions.consumer.bind_all(uuid, repo_id, distributor_type, bind_options)
-          rescue => e
-            Rails.logger.error "Failed to bind repo #{repo_id}: #{e}, #{e.backtrace.join("\n")}"
-          end
+          Katello.pulp_server.extensions.consumer.bind_all(uuid, repo_id, distributor_type, bind_options)
+        rescue => e
+          Rails.logger.error "Failed to bind repo #{repo_id}: #{e}, #{e.backtrace.join("\n")}"
         end
       end
     end

data/app/services/katello/pulp/docker_manifest.rb

@@ -4,7 +4,7 @@ module Katello
       CONTENT_TYPE = "docker_manifest".freeze
 
       def update_model(model)
-        model.update_attributes(:schema_version => backend_data[:schema_version],
+        model.update(:schema_version => backend_data[:schema_version],
                           :digest => backend_data[:digest]
          )
       end

data/app/services/katello/pulp/docker_manifest_list.rb

@@ -4,7 +4,7 @@ module Katello
       CONTENT_TYPE = "docker_manifest_list".freeze
 
       def update_model(model)
-        model.update_attributes(:schema_version => backend_data[:schema_version],
+        model.update(:schema_version => backend_data[:schema_version],
                           :digest => backend_data[:digest],
                           :docker_manifests => ::Katello::DockerManifest.where(:digest => backend_data[:manifests].pluck(:digest))
                          )

data/app/services/katello/pulp/erratum.rb

@@ -20,7 +20,7 @@ module Katello
           custom_json['errata_id'] = custom_json.delete('id')
           custom_json['errata_type'] = custom_json.delete('type')
           custom_json['updated'] = custom_json['updated'].blank? ? custom_json['issued'] : custom_json['updated']
-          model.update_attributes!(custom_json)
+          model.update!(custom_json)
 
           unless backend_data['references'].blank?
             update_bugzillas(model, backend_data['references'].select { |r| r['type'] == 'bugzilla' })

data/app/services/katello/pulp/file_unit.rb

@@ -14,7 +14,7 @@ module Katello
         custom_json['checksum'] = backend_data['checksum']
         custom_json['path'] = backend_data['name']
         custom_json['name'] = File.basename(backend_data['name'])
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
       end
     end
   end

data/app/services/katello/pulp/module_stream.rb

@@ -8,7 +8,7 @@ module Katello
       def update_model(model)
         shared_attributes = backend_data.keys & model.class.column_names
         shared_json = backend_data.select { |key, _v| shared_attributes.include?(key) }
-        model.update_attributes!(shared_json)
+        model.update!(shared_json)
 
         create_stream_artifacts(model, backend_data['artifacts']) if backend_data.key?('artifacts')
         create_profiles(model, backend_data['profiles']) if backend_data.key?('profiles')

data/app/services/katello/pulp/ostree_branch.rb

@@ -4,7 +4,7 @@ module Katello
       CONTENT_TYPE = "ostree".freeze
 
       def update_model(model)
-        model.update_attributes(:name => backend_data[:branch],
+        model.update(:name => backend_data[:branch],
                           :version => backend_data[:metadata][:version],
                           :commit => backend_data[:commit]
                          )

data/app/services/katello/pulp/package_group.rb

@@ -13,7 +13,7 @@ module Katello
                     :initializer => :pulp_facts
 
       def update_model(model)
-        model.update_attributes!(backend_data.slice('name', 'description'))
+        model.update!(backend_data.slice('name', 'description'))
       end
     end
   end

data/app/services/katello/pulp/pulp_content_unit.rb

@@ -30,6 +30,14 @@ module Katello
         "_id"
       end
 
+      def self.backend_unit_identifier
+        nil
+      end
+
+      def self.supports_id_fetch?
+        true
+      end
+
       def self.content_type
         self::CONTENT_TYPE
       end

data/app/services/katello/pulp/puppet_module.rb

@@ -14,7 +14,7 @@ module Katello
 
       def update_model(model)
         custom_json = backend_data.slice('name', 'author', 'title', 'version', 'summary')
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
       end
     end
   end

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

@@ -130,7 +130,7 @@ module Katello
                                               solve_dependencies: solve_dependencies))
 
           [:srpm, :errata, :package_group, :package_environment,
-           :yum_repo_metadata_file, :distribution, :module_default].each do |type|
+           :yum_repo_metadata_file, :distribution, :module_default, :drpm].each do |type|
             tasks << smart_proxy.pulp_api.extensions.send(type).copy(repo.pulp_id, destination_repo.pulp_id)
           end
           tasks
@@ -139,7 +139,7 @@ module Katello
         def import_distribution_data
           distribution = smart_proxy.pulp_api.extensions.repository.distributions(repo.pulp_id).first
           if distribution
-            repo.update_attributes!(
+            repo.update!(
               :distribution_version => distribution["version"],
               :distribution_arch => distribution["arch"],
               :distribution_family => distribution["family"],
@@ -250,7 +250,7 @@ module Katello
             remove_clauses = nil
           end
 
-          copy_clauses.merge!(fields: ::Katello::Pulp::Rpm::PULP_SELECT_FIELDS) if copy_clauses
+          copy_clauses&.merge!(fields: ::Katello::Pulp::Rpm::PULP_SELECT_FIELDS)
           [copy_clauses, remove_clauses]
         end
       end

data/app/services/katello/pulp/yum_metadata_file.rb

@@ -7,7 +7,7 @@ module Katello
         shared_attributes = backend_data.keys & model.class.column_names
         shared_json = backend_data.select { |key, _v| shared_attributes.include?(key) }
         repo = ::Katello::Repository.find_by(:pulp_id => backend_data['repo_id']).try(:id)
-        model.update_attributes!(shared_json.merge(repository_id: repo,
+        model.update!(shared_json.merge(repository_id: repo,
                                                   name: find_name_from_json(backend_data)))
       end
 

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

@@ -25,7 +25,7 @@ module Katello
         custom_json['version'] = backend_data['version']
         custom_json['name'] = backend_data['name']
         custom_json['description'] = backend_data['description']
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
 
         tags = backend_data['tags'].map { |tag| Katello::AnsibleTag.find_or_create_by(name: tag['name']) }
         model.tags = tags

data/app/services/katello/pulp3/api/ansible_collection.rb

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-# rubocop:disable ClassLength
 
 module Katello
   module Pulp3
@@ -21,6 +20,10 @@ module Katello
           PulpAnsibleClient::AnsibleAnsibleDistribution
         end
 
+        def self.repository_sync_url_class
+          PulpAnsibleClient::RepositorySyncURL
+        end
+
         def api_client
           PulpAnsibleClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpAnsibleClient::Configuration))
         end

data/app/services/katello/pulp3/api/content_guard.rb

@@ -0,0 +1,45 @@
+require 'pulp_certguard_client'
+
+module Katello
+  module Pulp3
+    module Api
+      class ContentGuard < Core
+        def self.client_module
+          PulpCertguardClient
+        end
+
+        def self.api_exception_class
+          PulpCertguardClient::ApiError
+        end
+
+        def api_client
+          PulpCertguardClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpCertguardClient::Configuration))
+        end
+
+        def rhsm_api_client
+          PulpCertguardClient::ContentguardsRhsmApi.new(api_client)
+        end
+
+        def create(name = "RHSMCertGuard", ca_certificate = Cert::Certs.ca_cert)
+          data = PulpCertguardClient::CertguardRHSMCertGuard.new(name: name, ca_certificate: ca_certificate)
+          rhsm_api_client.create(data)
+        rescue self.class.api_exception_class => e
+          raise e unless list&.results&.first
+        end
+
+        def list(options = {})
+          rhsm_api_client.list options
+        end
+
+        def partial_update(href, ca_certificate = Cert::Certs.ca_cert)
+          data = PulpCertguardClient::CertguardRHSMCertGuard.new(ca_certificate: ca_certificate)
+          rhsm_api_client.partial_update(href, data)
+        end
+
+        def delete(href)
+          rhsm_api_client.delete(href) if href
+        end
+      end
+    end
+  end
+end

data/app/services/katello/pulp3/api/core.rb

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-# rubocop:disable ClassLength
 
 module Katello
   module Pulp3
@@ -31,6 +30,10 @@ module Katello
           fail NotImplementedError
         end
 
+        def self.repository_sync_url_class
+          fail NotImplementedError
+        end
+
         def api_client
           fail NotImplementedError
         end
@@ -75,12 +78,23 @@ module Katello
           PulpcoreClient::Upload
         end
 
+        def ignore_404_exception(*)
+          yield
+        rescue self.class.api_exception_class => e
+          raise e unless e.code == 404
+          nil
+        end
+
         def delete_orphans
           [orphans_api.delete]
         end
 
         def delete_remote(remote_href)
-          remotes_api.delete(remote_href)
+          ignore_404_exception { remotes_api.delete(remote_href) }
+        end
+
+        def repository_version_hrefs(options = {})
+          repository_versions(options).map(&:pulp_href).uniq
         end
 
         def repository_versions(options = {})
@@ -88,10 +102,10 @@ module Katello
           repo_hrefs = current_pulp_repositories.collect { |repo| repo.pulp_href }.uniq
 
           version_hrefs = repo_hrefs.collect do |href|
-            versions_list_for_repository(href, options).map(&:pulp_href)
+            versions_list_for_repository(href, options)
           end
 
-          version_hrefs.flatten.uniq
+          version_hrefs.flatten
         end
 
         def versions_list_for_repository(repository_href, options)
@@ -105,17 +119,11 @@ module Katello
         end
 
         def get_distribution(href)
-          distributions_api.read(href)
-        rescue self.class.api_exception_class => e
-          raise e if e.code != 404
-          nil
+          ignore_404_exception { distributions_api.read(href) }
         end
 
         def delete_distribution(href)
-          distributions_api.delete(href)
-        rescue self.class.api_exception_class => e
-          raise e if e.code != 404
-          nil
+          ignore_404_exception { distributions_api.delete(href) }
         end
 
         def list_all(options = {})

data/app/services/katello/pulp3/api/docker.rb

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-# rubocop:disable ClassLength
 
 module Katello
   module Pulp3
@@ -25,6 +24,10 @@ module Katello
           PulpContainerClient::ContainerPublication
         end
 
+        def self.repository_sync_url_class
+          PulpContainerClient::RepositorySyncURL
+        end
+
         def self.recursive_manage_class
           PulpContainerClient::RecursiveManage
         end

data/app/services/katello/pulp3/api/file.rb

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-# rubocop:disable ClassLength
 
 module Katello
   module Pulp3
@@ -25,6 +24,10 @@ module Katello
           PulpFileClient::FileFilePublication
         end
 
+        def self.repository_sync_url_class
+          PulpFileClient::RepositorySyncURL
+        end
+
         def api_client
           PulpFileClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpFileClient::Configuration))
         end

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

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-# rubocop:disable ClassLength
 
 module Katello
   module Pulp3
@@ -25,6 +24,14 @@ module Katello
           PulpRpmClient::RpmRpmPublication
         end
 
+        def self.repository_sync_url_class
+          PulpRpmClient::RpmRepositorySyncURL
+        end
+
+        def self.rpm_package_group_class
+          PulpRpmClient::RpmPackageGroup
+        end
+
         def api_client
           PulpRpmClient::ApiClient.new(smart_proxy.pulp3_configuration(PulpRpmClient::Configuration))
         end
@@ -48,6 +55,26 @@ module Katello
         def distributions_api
           PulpRpmClient::DistributionsRpmApi.new(api_client)
         end
+
+        def copy_api
+          PulpRpmClient::RpmCopyApi.new(api_client)
+        end
+
+        def content_package_groups_api
+          PulpRpmClient::ContentPackagegroupsApi.new(api_client)
+        end
+
+        def content_package_environments_api
+          PulpRpmClient::ContentPackageenvironmentsApi.new(api_client)
+        end
+
+        def content_repo_metadata_files_api
+          PulpRpmClient::ContentRepoMetadataFilesApi.new(api_client)
+        end
+
+        def content_distribution_trees_api
+          PulpRpmClient::ContentDistributionTreesApi.new(api_client)
+        end
       end
     end
   end

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

@@ -6,9 +6,9 @@ module Katello
       class << self
         def create_upload(size = 0, checksum = nil, content_type = nil)
           content_unit_href = nil
-          if checksum && content_type
+          if checksum
             content_backend_service = SmartProxy.pulp_master.content_service(content_type)
-            content_list = content_backend_service.content_api.list("digest": checksum)
+            content_list = content_backend_service.content_api.list("sha256": checksum)
             content_unit_href = content_list.results.first.pulp_href unless content_list.results.empty?
             return {"content_unit_href" => content_unit_href} if content_unit_href
           end

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

@@ -29,7 +29,7 @@ module Katello
         custom_json = {}
         custom_json['schema_version'], = backend_data['schema_version']
         custom_json['digest'], = backend_data['digest']
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
       end
     end
   end

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

@@ -23,7 +23,7 @@ module Katello
         custom_json['schema_version'], = backend_data['schema_version']
         custom_json['digest'], = backend_data['digest']
         custom_json['docker_manifests'] = ::Katello::DockerManifest.where(:pulp_id => backend_data[:listed_manifests])
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
       end
     end
   end

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

@@ -21,7 +21,7 @@ module Katello
         end
         custom_json['docker_taggable'] = taggable
         custom_json['name'] = backend_data['name']
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
       end
     end
   end

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

@@ -11,6 +11,14 @@ module Katello
         "id"
       end
 
+      def self.backend_unit_identifier
+        "pulp_href"
+      end
+
+      def self.supports_id_fetch?
+        false
+      end
+
       def self.ids_for_repository(repo_id)
         repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
         repo_content_list = repo.content_list
@@ -29,7 +37,7 @@ module Katello
           custom_json['errata_id'] = custom_json.delete('id')
           custom_json['errata_type'] = custom_json.delete('type')
           custom_json['updated'] = custom_json['updated'].blank? ? custom_json['issued'] : custom_json['updated']
-          model.update_attributes!(custom_json)
+          model.update!(custom_json)
 
           unless backend_data['references'].blank?
             update_bugzillas(model, backend_data['references'])