katello 4.14.1 → 4.15.0.rc2

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -1,4 +1,3 @@
-require 'proxy_api'
 require 'proxy_api/pulp'
 require 'proxy_api/pulp_node'
 require 'proxy_api/container_gateway'
@@ -63,7 +62,7 @@ module Katello
 
         validates :download_policy, inclusion: {
           :in => DOWNLOAD_POLICIES,
-          :message => _("must be one of the following: %s") % DOWNLOAD_POLICIES.join(', ')
+          :message => _("must be one of the following: %s") % DOWNLOAD_POLICIES.join(', '),
         }
         scope :with_content, -> { with_features(PULP_FEATURE, PULP_NODE_FEATURE, PULP3_FEATURE) }
 
@@ -141,43 +140,88 @@ module Katello
         URI.parse(self.url).host != self.registration_host
       end
 
-      def update_content_counts!
-        # {:content_view_versions=>{87=>{:repositories=>{1=>{:metadata=>{},:counts=>{:rpms=>98, :module_streams=>9898}}}}}
-        new_content_counts = { content_view_versions: {} }
-        smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
-        repos = smart_proxy_helper.repositories_available_to_capsule
-
-        repos&.each do |repo|
-          repo_mirror_service = repo.backend_service(self).with_mirror_adapter
-          repo_content_counts = repo_mirror_service.latest_content_counts
-          translated_counts = {metadata: {}, counts: {}}
-          translated_counts[:metadata] = {
-            env_id: repo.environment_id,
-            library_instance_id: repo.library_instance_or_self.id,
-            product_id: repo.product_id,
-            content_type: repo.content_type
-          }
-          repo_content_counts&.each do |name, count|
-            count = count[:count]
-            # Some content units in Pulp have the same model
-            if name == 'rpm.package' && repo.content_counts['srpm'] > 0
-              translated_counts[:counts]['srpm'] = repo_mirror_service.count_by_pulpcore_type(::Katello::Pulp3::Srpm)
-              translated_counts[:counts]['rpm'] = count - translated_counts[:counts]['srpm']
-            elsif name == 'container.manifest' && repo.content_counts['docker_manifest_list'] > 0
-              translated_counts[:counts]['docker_manifest_list'] = repo_mirror_service.count_by_pulpcore_type(::Katello::Pulp3::DockerManifestList)
-              translated_counts[:counts]['docker_manifest'] = count - translated_counts[:counts]['docker_manifest_list']
-            else
-              translated_counts[:counts][::Katello::Pulp3::PulpContentUnit.katello_name_from_pulpcore_name(name, repo)] = count
-            end
+      def update_content_counts!(environment: nil, content_view: nil, repository: nil)
+        if environment.nil? && content_view.nil? && repository.nil?
+          global_content_counts
+        else
+          smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
+          repos = repository ? [repository] : smart_proxy_helper.repositories_available_to_capsule(environment, content_view)
+          self.with_lock do
+            repos_content_count(repos)
           end
-          new_content_counts[:content_view_versions][repo.content_view_version_id] ||= { repositories: {}}
-          # Store counts on capsule of archived repos which are reused across environment copies
-          # of the archived repo corresponding to each environment CV version is promoted to.
-          new_content_counts[:content_view_versions][repo.content_view_version_id][:repositories][repo.id] = translated_counts
         end
+      end
+
+      #{"content_view_versions"=>
+      #   {"5"=>
+      #     {"repositories"=>
+      #       {"20"=>{"counts"=>{"rpm"=>32, "erratum"=>4}, "metadata"=>{"env_id"=>2, "product_id"=>1, "content_type"=>"yum", "library_instance_id"=>14}},
+      #        "21"=>{"counts"=>{"file"=>3}, "metadata"=>{"env_id"=>2, "product_id"=>1, "content_type"=>"file", "library_instance_id"=>15}},
+      #        "22"=>{"counts"=>{"file"=>3}, "metadata"=>{"env_id"=>3, "product_id"=>1, "content_type"=>"file", "library_instance_id"=>15}},
+      #        "23"=>{"counts"=>{"rpm"=>32, "erratum"=>4}, "metadata"=>{"env_id"=>3, "product_id"=>1, "content_type"=>"yum", "library_instance_id"=>14}}}}}}
+      #
+
+      def repos_content_count(repos, reset: false)
+        new_content_counts = initialize_content_counts(reset: reset)
+        repos.each do |repo|
+          process_repository(repo, new_content_counts)
+        end
+        remove_unavailable_versions(new_content_counts)
         update(content_counts: new_content_counts)
       end
 
+      def initialize_content_counts(reset: false)
+        if reset
+          { content_view_versions: {} }.with_indifferent_access
+        else
+          (content_counts&.deep_dup || { content_view_versions: {} }).with_indifferent_access
+        end
+      end
+
+      def process_repository(repo, content_counts)
+        repo_mirror_service = repo.backend_service(self).with_mirror_adapter
+        repo_content_counts = repo_mirror_service.latest_content_counts
+        translated_counts = translate_counts(repo, repo_mirror_service, repo_content_counts)
+        content_counts[:content_view_versions][repo.content_view_version_id.to_s] ||= { repositories: {}}
+        content_counts[:content_view_versions][repo.content_view_version_id.to_s][:repositories][repo.id.to_s] = translated_counts
+      end
+
+      def translate_counts(repo, repo_mirror_service, repo_content_counts)
+        translated_counts = {metadata: {}, counts: {}}
+        translated_counts[:metadata] = {
+          env_id: repo.environment_id,
+          library_instance_id: repo.library_instance_or_self.id,
+          product_id: repo.product_id,
+          content_type: repo.content_type,
+        }
+        repo_content_counts&.each do |name, count|
+          count = count[:count]
+          if name == 'rpm.package' && repo.content_counts['srpm'] > 0
+            translated_counts[:counts]['srpm'] = repo_mirror_service.count_by_pulpcore_type(::Katello::Pulp3::Srpm)
+            translated_counts[:counts]['rpm'] = count - translated_counts[:counts]['srpm']
+          elsif name == 'container.manifest' && repo.content_counts['docker_manifest_list'] > 0
+            translated_counts[:counts]['docker_manifest_list'] = repo_mirror_service.count_by_pulpcore_type(::Katello::Pulp3::DockerManifestList)
+            translated_counts[:counts]['docker_manifest'] = count - translated_counts[:counts]['docker_manifest_list']
+          else
+            translated_counts[:counts][::Katello::Pulp3::PulpContentUnit.katello_name_from_pulpcore_name(name, repo)] = count
+          end
+        end
+        translated_counts
+      end
+
+      def remove_unavailable_versions(content_counts)
+        version_ids_available_to_proxy = Katello::ContentViewVersion.in_environment(lifecycle_environments)&.pluck(:id)&.uniq
+        version_ids_in_count_map = content_counts[:content_view_versions].keys&.map(&:to_i)
+        version_ids_to_remove = version_ids_in_count_map - version_ids_available_to_proxy
+        version_ids_to_remove.each { |id| content_counts[:content_view_versions].delete(id.to_s) }
+      end
+
+      def global_content_counts
+        smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
+        repos = smart_proxy_helper.repositories_available_to_capsule
+        repos_content_count(repos, reset: true)
+      end
+
       def sync_container_gateway
         if has_feature?(::SmartProxy::CONTAINER_GATEWAY_FEATURE)
           update_container_repo_list
@@ -253,6 +297,7 @@ module Katello
       end
 
       def pulp3_ssl_configuration(config, connection_adapter = Faraday.default_adapter)
+        config.ssl_ca_file = ::Cert::Certs.backend_ca_cert_file(:pulp)
         case connection_adapter
         when :excon
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename
@@ -261,7 +306,7 @@ module Katello
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
           config.ssl_client_key = ::Cert::Certs.ssl_client_key
         else
-          fail "Unexpected connection_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
+          fail "Unexpected connection_adapter #{connection_adapter}!  Cannot continue, this is likely a bug."
         end
       end
 
@@ -276,8 +321,8 @@ module Katello
                 used: -1,
                 free: -1,
                 percentage: -1,
-                label: 'cloud-storage'
-              }.with_indifferent_access
+                label: 'cloud-storage',
+              }.with_indifferent_access,
             ]
           else
             [
@@ -287,8 +332,8 @@ module Katello
                 used: storage['used'],
                 free: storage['free'],
                 percentage: (storage['used'] / storage['total'].to_f * 100).to_i,
-                label: 'pulp_dir'
-              }.with_indifferent_access
+                label: 'pulp_dir',
+              }.with_indifferent_access,
             ]
           end
         end

data/app/models/katello/content.rb

@@ -73,18 +73,18 @@ module Katello
       current_subs == new_url_subs
     end
 
-    def self.substitute_content_path(arch: nil, releasever: nil, content_path:)
+    def self.substitute_content_path(content_path:, arch: nil, releasever: nil)
       arch = nil if arch == "noarch"
       substitutions = {
         :releasever => releasever,
-        :basearch => arch
+        :basearch => arch,
       }.compact
       path = substitutions.inject(content_path) do |path_url, (key, value)|
         path_url.gsub("$#{key}", value)
       end
       {
         path: path,
-        substitutions: substitutions
+        substitutions: substitutions,
       }
     end
   end

data/app/models/katello/content_view.rb

@@ -38,8 +38,6 @@ module Katello
 
     has_many :filters, :dependent => :destroy, :class_name => "Katello::ContentViewFilter"
 
-    has_many :activation_keys, :class_name => "Katello::ActivationKey", :dependent => :restrict_with_exception
-
     has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet",
              :through => :content_view_environments
     has_many :content_facets, :class_name => "Katello::Host::ContentFacet", :through => :content_view_environment_content_facets,
@@ -47,6 +45,11 @@ module Katello
     has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets,
              :inverse_of => :content_views
 
+    has_many :content_view_environment_activation_keys, :class_name => "Katello::ContentViewEnvironmentActivationKey",
+             :through => :content_view_environments
+    has_many :activation_keys, :class_name => "Katello::ActivationKey", :through => :content_view_environment_activation_keys,
+             :inverse_of => :content_views
+
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet",
              :inverse_of => :content_view, :dependent => :nullify
     has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
@@ -121,7 +124,7 @@ module Katello
       kcv = Katello::ContentView.table_name
       kcvc = Katello::ContentViewComponent.table_name
       { :conditions => "#{kcv}.composite = 't' AND #{kcv}.id IN (SELECT #{kcvc}.composite_content_view_id FROM #{kcvc} WHERE #{kcvc}.content_view_id IN (SELECT #{kcv}.id FROM #{kcv} WHERE #{kcv}.name #{operator} ?))",
-        :parameter => [value]
+        :parameter => [value],
       }
     end
 
@@ -141,7 +144,7 @@ module Katello
       library_import: 3,
       repository_import: 4,
       library_export_syncable: 5,
-      repository_export_syncable: 6
+      repository_export_syncable: 6,
     }, _prefix: true
 
     set_crud_hooks :content_view
@@ -298,7 +301,7 @@ module Katello
         {
           :version => v.version,
           :published => v.created_at.to_s,
-          :environments => v.environments.map { |e| e.name }
+          :environments => v.environments.map { |e| e.name },
         }
       end
 
@@ -448,10 +451,7 @@ module Katello
       # update errata applicability counts for all hosts in the CV & LE
       Location.no_taxonomy_scope do
         User.as_anonymous_admin do
-          ::Katello::Host::ContentFacet.in_content_views_and_environments(
-            content_views: [self],
-            lifecycle_environments: [environment]
-          ).each do |facet|
+          ::Katello::Host::ContentFacet.with_content_views(self).with_environments(environment).each do |facet|
             facet.update_applicability_counts
             facet.update_errata_status
           rescue NoMethodError
@@ -699,10 +699,7 @@ module Katello
     def check_orphaned_content_facets!(environments: [])
       Location.no_taxonomy_scope do
         User.as_anonymous_admin do
-          ::Katello::Host::ContentFacet.in_content_views_and_environments(
-            content_views: [self],
-            lifecycle_environments: environments
-          ).each do |facet|
+          ::Katello::Host::ContentFacet.with_content_views(self).with_environments(environments).each do |facet|
             unless facet.host
               fail _("Orphaned content facets for deleted hosts exist for the content view and environment. Please run rake task : katello:clean_orphaned_facets and try again!")
             end
@@ -716,11 +713,11 @@ module Katello
       errors = []
 
       dependencies = { hosts: _("hosts"),
-                       activation_keys: _("activation keys")
+                       activation_keys: _("activation keys"),
       }
 
       dependencies.each do |key, name|
-        if (models = self.association(key).scope.in_environment(env)).any?
+        if (models = self.association(key).scope.in_environments(env)).any?
           errors << _("Cannot remove '%{view}' from environment '%{env}' due to associated %{dependent}: %{names}.") %
             { view: self.name, env: env.name, dependent: name, names: models.map(&:name).join(", ") }
         end
@@ -736,7 +733,7 @@ module Katello
 
       dependencies = { environments: _("environments"),
                        hosts: _("hosts"),
-                       activation_keys: _("activation keys")
+                       activation_keys: _("activation keys"),
       }
 
       dependencies.each do |key, name|
@@ -778,7 +775,7 @@ module Katello
         content_views.push(
           {
             id: cv_id,
-            name: cv_name
+            name: cv_name,
           }
         )
       end
@@ -893,7 +890,7 @@ module Katello
 
     def blocking_task
       blocking_task_labels = [
-        ::Actions::Katello::ContentView::Publish.name
+        ::Actions::Katello::ContentView::Publish.name,
       ]
       ForemanTasks::Task::DynflowTask.where(:label => blocking_task_labels)
                                      .where.not(state: 'stopped')

data/app/models/katello/content_view_environment.rb

@@ -15,6 +15,9 @@ module Katello
     has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet", :dependent => :destroy, :inverse_of => :content_view_environment
     has_many :content_facets, through: :content_view_environment_content_facets, :class_name => "::Katello::Host::ContentFacet", :inverse_of => :content_view_environments
 
+    has_many :content_view_environment_activation_keys, :class_name => "Katello::ContentViewEnvironmentActivationKey", :dependent => :destroy, :inverse_of => :content_view_environment
+    has_many :activation_keys, through: :content_view_environment_activation_keys, :class_name => "::Katello::ActivationKey", :inverse_of => :content_view_environments
+
     validates_lengths_from_database
     validates :environment_id, uniqueness: {scope: :content_view_id}, presence: true
     validates :content_view_id, presence: true
@@ -25,20 +28,24 @@ module Katello
 
     scope :non_default, -> { joins(:content_view).where("katello_content_views.default" => false) }
     scope :default, -> { joins(:content_view).where("katello_content_views.default" => true) }
+    scope :non_generated, -> { where(content_view: ::Katello::ContentView.ignore_generated) }
+
+    scoped_search :on => :id, :complete_value => true
+
     alias :lifecycle_environment :environment
+    has_one :organization, :through => :environment
+
+    def self.in_organization(org)
+      where(environment_id: org.kt_environments)
+    end
 
     def self.for_content_facets(content_facets)
-      joins(:content_view_environment_content_facets, :content_facets).where("#{Katello::ContentViewEnvironmentContentFacet.table_name}.content_facet_id" => content_facets).uniq
+      joins(:content_facets).
+        where("#{Katello::ContentViewEnvironmentContentFacet.table_name}.content_facet_id" => content_facets)
     end
 
-    def self.with_candlepin_name(cp_name, organization: Organization.current)
-      lce_name, cv_name = cp_name.split('/')
-      if cv_name.blank? && lce_name == 'Library'
-        return default.find_by(
-          environment: ::Katello::KTEnvironment.library.where(organization: organization)&.first
-        )
-      end
-      joins(:environment, :content_view).where("#{Katello::KTEnvironment.table_name}.label" => lce_name, "#{Katello::ContentView.table_name}.label" => cv_name).first
+    def self.with_label_and_org(label, organization: Organization.current)
+      joins(:environment, :content_view).where("#{Katello::KTEnvironment.table_name}.organization_id" => organization, label: label).first
     end
 
     # retrieve the owning environment for this content view environment.
@@ -51,20 +58,54 @@ module Katello
     end
 
     def activation_keys
-      content_view.activation_keys.in_environment(environment)
+      ::Katello::ActivationKey.with_content_views(self.content_view).with_environments(self.environment)
     end
 
     def default_environment?
       content_view.default? && environment.library?
     end
 
-    def candlepin_name
-      return environment.label if default_environment?
-      "#{environment.label}/#{content_view.label}"
+    def priority(content_object)
+      case content_object
+      when Katello::ActivationKey
+        content_view_environment_activation_keys.find_by(:activation_key_id => content_object.id).try(:priority)
+      when Katello::Host::ContentFacet
+        content_view_environment_content_facets.find_by(:content_facet_id => content_object.id).try(:priority)
+      end
     end
 
-    def priority(content_facet)
-      content_view_environment_content_facets.find_by(:content_facet_id => content_facet.id).try(:priority)
+    def self.fetch_content_view_environments(organization:, labels: [], ids: [])
+      # Must ensure CVEs remain in the same order.
+      # Using ActiveRecord .where will return them in a different order.
+      id_errors = []
+      label_errors = []
+      cves = []
+      if ids.present?
+        ids.each do |id|
+          cve = ::Katello::ContentViewEnvironment.find_by(id: id)
+          if cve.blank?
+            id_errors << id
+          else
+            cves << cve
+          end
+        end
+      elsif labels.present?
+        environment_names = labels.map(&:strip)
+        environment_names.each do |name|
+          cve = with_label_and_org(name, organization: organization)
+          if cve.blank?
+            label_errors << name
+          else
+            cves << cve
+          end
+        end
+      end
+      if labels.present? && labels.length != cves.length
+        fail HttpErrors::UnprocessableEntity, _("No content view environments found with names: %{names}") % {names: label_errors.join(', ')} if label_errors.present?
+      elsif ids.present? && ids.length != cves.length
+        fail HttpErrors::UnprocessableEntity, _("No content view environments found with ids: %{ids}") % {ids: id_errors.join(', ')} if id_errors.present?
+      end
+      cves
     end
 
     private

data/app/models/katello/content_view_environment_activation_key.rb

@@ -0,0 +1,20 @@
+module Katello
+  class ContentViewEnvironmentActivationKey < Katello::Model
+    belongs_to :content_view_environment, :class_name => "::Katello::ContentViewEnvironment", :inverse_of => :content_view_environment_activation_keys
+    belongs_to :activation_key, :class_name => "::Katello::ActivationKey", :inverse_of => :content_view_environment_activation_keys
+
+    default_scope { order(:priority => :asc) }
+
+    validates :content_view_environment_id, presence: true
+    validates :activation_key_id, presence: true, unless: :new_record?
+
+    def self.reprioritize_for_activation_key(activation_key, new_cves)
+      new_order = new_cves.map do |cve|
+        activation_key.content_view_environment_activation_keys.find_by(:content_view_environment_id => cve.id)
+      end
+      new_order.compact.each_with_index do |cveak, index|
+        cveak.update_column(:priority, index)
+      end
+    end
+  end
+end

data/app/models/katello/content_view_erratum_filter_rule.rb

@@ -23,7 +23,7 @@ module Katello
       :inclusion => {
         :in => DATE_TYPES,
         :allow_blank => false,
-        :message => (_("must be one of the following: %s") % DATE_TYPES.join(', '))
+        :message => (_("must be one of the following: %s") % DATE_TYPES.join(', ')),
       }
 
     def self.in_content_views(content_view_ids)

data/app/models/katello/content_view_filter.rb

@@ -41,7 +41,7 @@ module Katello
     def self.yum(include_module_streams = true)
       types = [::Katello::ContentViewPackageGroupFilter.name,
                ::Katello::ContentViewErratumFilter.name,
-               ::Katello::ContentViewPackageFilter.name
+               ::Katello::ContentViewPackageFilter.name,
               ]
       types << ::Katello::ContentViewModuleStreamFilter.name if include_module_streams
       where(:type => types)
@@ -74,7 +74,7 @@ module Katello
         ContentViewErratumFilter => ERRATA,
         ContentViewPackageGroupFilter => PACKAGE_GROUP,
         ContentViewDockerFilter => DOCKER,
-        ContentViewModuleStreamFilter => MODULE_STREAM
+        ContentViewModuleStreamFilter => MODULE_STREAM,
       }[self.class]
     end
 

data/app/models/katello/content_view_history.rb

@@ -33,7 +33,7 @@ module Katello
       promotion: 2,
       removal: 3,
       export: 4,
-      importing: 5
+      importing: 5,
     }
 
     def content_view

data/app/models/katello/content_view_repository.rb

@@ -6,7 +6,7 @@ module Katello
                                 Repository::FILE_TYPE,
                                 Repository::DEB_TYPE,
                                 Repository::ANSIBLE_COLLECTION_TYPE,
-                                Katello::RepositoryTypeManager.generic_repository_types(false).keys.flatten
+                                Katello::RepositoryTypeManager.generic_repository_types(false).keys.flatten,
                                ].flatten.freeze
 
     ALLOWED_IMPORT_REPOSITORY_TYPES = Repository::EXPORTABLE_TYPES

data/app/models/katello/content_view_version.rb

@@ -357,7 +357,7 @@ module Katello
     def auto_publish_composites!
       metadata = {
         description: _("Auto Publish - Triggered by '%s'") % self.name,
-        triggered_by: self.id
+        triggered_by: self.id,
       }
       self.content_view.auto_publish_components.pluck(:composite_content_view_id).each do |composite_id|
         ::Katello::EventQueue.push_event(::Katello::Events::AutoPublishCompositeView::EVENT_TYPE, composite_id) do |attrs|
@@ -443,12 +443,12 @@ module Katello
             repo.slice(:id, :name, :label, :arch, :major, :minor,
                        :content_type, :os_versions, :url, :content_id).merge(redhat: repo.redhat?, root: repo.root.id,
                                                                              product: repo.product.slice(:id, :label))
-          end
+          end,
         }
       end
       self.applied_filters = {
         applied_filters: applied_filters_and_rules,
-        dependency_solving: content_view.solve_dependencies
+        dependency_solving: content_view.solve_dependencies,
       }
       save!
     end

data/app/models/katello/content_view_version_export_history.rb

@@ -18,7 +18,7 @@ module Katello
     validates :export_type, :presence => true,
               :inclusion => { :in => EXPORT_TYPES,
                               :allow_blank => false,
-                              :message => _("must be one of the following: %s" % EXPORT_TYPES.join(', '))
+                              :message => _("must be one of the following: %s" % EXPORT_TYPES.join(', ')),
                             }
     validates :metadata, :presence => true
     serialize :metadata, Hash
@@ -51,7 +51,7 @@ module Katello
       self.export_type ||= self.class.export_type_from_metadata(metadata)
     end
 
-    def self.generate_audit_comment(user:, content_view_version:, from_version: nil, metadata:)
+    def self.generate_audit_comment(user:, content_view_version:, metadata:, from_version: nil)
       export_type = export_type_from_metadata(metadata)
       if content_view_version.content_view.generated_for_library?
         export_descriptor = "library export"

data/app/models/katello/content_view_version_import_history.rb

@@ -35,7 +35,7 @@ module Katello
     def self.generate_audit_comment(user:, content_view_name:)
       truncate_audit_comment(_("Content imported by %{user} into content view '%{name}'") % {
         user: user.to_label,
-        name: content_view_name
+        name: content_view_name,
       })
     end
   end

data/app/models/katello/events/delete_latest_content_view_version.rb

@@ -33,7 +33,7 @@ module Katello
       private
 
       def deliver_failure_notification
-        ::Katello::UINotifications::ContentView::DelelteLatestVersionFailure.deliver!(content_view)
+        ::Katello::UINotifications::ContentView::DeleteLatestVersionFailure.deliver!(content_view)
       end
     end
   end

data/app/models/katello/flatpak_remote.rb

@@ -0,0 +1,11 @@
+module Katello
+  class FlatpakRemote < Katello::Model
+    has_many :remote_repositories, dependent: :destroy, class_name: 'Katello::FlatpakRemoteRepository'
+    has_many :remote_repository_manifests, through: :remote_repositories, source: :remote_repository_manifests
+    belongs_to :organization, inverse_of: :flatpak_remotes
+
+    validates :name, presence: true
+    validates :url, presence: true
+    validates :organization_id, presence: true
+  end
+end

data/app/models/katello/flatpak_remote_repository.rb

@@ -0,0 +1,12 @@
+module Katello
+  class FlatpakRemoteRepository < Katello::Model
+    belongs_to :flatpak_remote, inverse_of: :remote_repositories
+    has_many :remote_repository_manifests, dependent: :destroy, class_name: 'Katello::FlatpakRemoteRepositoryManifest'
+
+    validates :flatpak_remote_id, presence: true
+    validates :name, presence: true
+    validates :label, presence: true
+
+    alias_attribute :manifests, :remote_repository_manifests
+  end
+end

data/app/models/katello/flatpak_remote_repository_manifest.rb

@@ -0,0 +1,10 @@
+module Katello
+  class FlatpakRemoteRepositoryManifest < Katello::Model
+    belongs_to :remote_repository,
+               class_name: 'Katello::FlatpakRemoteRepository',
+               foreign_key: 'flatpak_remote_repository_id',
+               inverse_of: :remote_repository_manifests
+    validates :flatpak_remote_repository_id, presence: true
+    validates :name, presence: true
+  end
+end

data/app/models/katello/glue/candlepin/activation_key.rb

@@ -31,7 +31,7 @@ module Katello
         key_pools.map do |key_pool|
           {
             :amount => (key_pool[:quantity] || 0),
-            :id => key_pool[:poolId]
+            :id => key_pool[:poolId],
           }.with_indifferent_access
         end
       end

data/app/models/katello/glue/candlepin/candlepin_object.rb

@@ -21,7 +21,7 @@ module Katello
       def import_candlepin_record(record:, organization:)
         db_attrs = {
           cp_id: record['id'],
-          organization: organization
+          organization: organization,
         }
 
         yield(db_attrs) if block_given?

data/app/models/katello/glue/candlepin/pool.rb

@@ -74,7 +74,7 @@ module Katello
         end
       end
 
-      def determine_subscription(product_id: nil, source_stack_id: nil, organization:)
+      def determine_subscription(organization:, product_id: nil, source_stack_id: nil)
         if source_stack_id
           self.stacking_subscription(organization, source_stack_id)
           # isn't it an error if we have a sourceStackID but no stacking subscription?

data/app/models/katello/glue/pulp/repos.rb

@@ -95,7 +95,7 @@ module Katello
           :canceled,
           :error,
           :paused,
-          :running
+          :running,
         ]
 
         presented.each do |_repoid, task|