katello 4.14.1 → 4.15.0.rc1

data/app/models/katello/ping.rb

@@ -34,7 +34,7 @@ module Katello
       def status
         {
           version: Katello::VERSION,
-          timeUTC: Time.now.getutc
+          timeUTC: Time.now.getutc,
         }
       end
 
@@ -252,12 +252,11 @@ module Katello
       end
 
       def backend_status(url, backend)
-        ca_file = SETTINGS[:katello][backend][:ca_cert_file]
+        ca_file = ::Cert::Certs.backend_ca_cert_file(backend)
         request_id = ::Logging.mdc['request']
 
         options = {}
         options[:ssl_ca_file] = ca_file unless ca_file.nil?
-        options[:verify_ssl] = SETTINGS[:katello][backend][:verify_ssl] if SETTINGS[:katello][backend].key?(:verify_ssl)
         options[:headers] = { 'Correlation-ID' => request_id } if request_id
         client = RestClient::Resource.new("#{url}/status/", options)
 

data/app/models/katello/repository.rb

@@ -172,7 +172,7 @@ module Katello
     scoped_search :on => :label, :relation => :root, :complete_value => true, :only_explicit => true
     scoped_search :on => :content_label, :ext_method => :search_by_content_label, :default_operator => :like
 
-    delegate :product, :redhat?, :custom?, :to => :root
+    delegate :product, :redhat?, :custom?, :deb_using_structured_apt?, :to => :root
     delegate :yum?, :docker?, :deb?, :file?, :ostree?, :ansible_collection?, :generic?, :to => :root
     delegate :name, :label, :docker_upstream_name, :url, :download_concurrency, :to => :root
 
@@ -185,7 +185,6 @@ module Katello
              :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
              :http_proxy_policy, :http_proxy_id, :prevent_updates, :to => :root
 
-    delegate :content_id, to: :root, allow_nil: true
     delegate :repository_type, to: :root
 
     def self.exportable_types(format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE)
@@ -211,6 +210,16 @@ module Katello
       "#{path_prefix}/#{path}"
     end
 
+    def content_id
+      # Currently deb content will store a content_id on each Repository, while all other content
+      # types will store one on the RootRepository.
+      self[:content_id] || root.content_id
+    end
+
+    def content
+      Katello::Content.find_by(:cp_content_id => self.content_id, :organization_id => self.product.organization_id)
+    end
+
     def to_label
       name
     end
@@ -272,6 +281,10 @@ module Katello
       self.content_view_version.content_view
     end
 
+    def content_view_environment
+      self.content_view.content_view_environment(self.environment)
+    end
+
     # Skip setting container name if the repository is not container type or
     # if it's a library instance of a container-push repo, indicating that the container name is set by the user.
     def skip_container_name?
@@ -634,7 +647,7 @@ module Katello
       sp_history_args = {
         :smart_proxy_id => smart_proxy.id,
         :repository_id => self.id,
-        :started_at => Time.now
+        :started_at => Time.now,
       }
       sp_history = ::Katello::SmartProxySyncHistory.create sp_history_args
       sp_history.save!
@@ -667,7 +680,7 @@ module Katello
         ::Actions::Katello::Repository::Sync.name,
         ::Actions::Katello::Repository::UploadFiles.name,
         ::Actions::Katello::Repository::RemoveContent.name,
-        ::Actions::Katello::Repository::MetadataGenerate.name
+        ::Actions::Katello::Repository::MetadataGenerate.name,
       ]
       ForemanTasks::Task::DynflowTask.where(:label => blocking_task_labels)
                                      .where.not(state: 'stopped')
@@ -785,7 +798,7 @@ module Katello
         distribution_arch: self.distribution_arch,
         distribution_family: self.distribution_family,
         distribution_variant: self.distribution_variant,
-        distribution_bootable: self.distribution_bootable
+        distribution_bootable: self.distribution_bootable,
       }
     end
 
@@ -941,7 +954,7 @@ module Katello
           product: repository.product,
           lifecycle_environment: repository.environment,
           content_view: repository.content_view_version.content_view,
-          content_view_version: repository.content_view_version
+          content_view_version: repository.content_view_version,
         }
         box = Safemode::Box.new(repository, allowed_methods)
         erb = ERB.new(pattern)
@@ -1024,6 +1037,27 @@ module Katello
       content_view.repositories.include? self
     end
 
+    def deb_content_url_options
+      return '' unless version_href
+
+      components = deb_pulp_components.join(',')
+      distributions = deb_pulp_distributions.join(',')
+      "/?comp=#{components}&rel=#{distributions}"
+    end
+
+    def deb_pulp_components(version_href = self.version_href)
+      return [] if version_href.blank?
+
+      pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
+      pulp_api.list({:repository_version => version_href}).results.map { |x| x.component }.uniq
+    end
+
+    def deb_pulp_distributions(version_href = self.version_href)
+      return [] if version_href.blank?
+      pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
+      pulp_api.list({:repository_version => version_href}).results.map { |x| x.distribution }.uniq
+    end
+
     def sync_status
       return latest_dynflow_sync
     end

data/app/models/katello/rhel_lifecycle_status.rb

@@ -16,40 +16,40 @@ module Katello
       'RHEL9' => {
         'full_support' => end_of_day('2027-05-31'),
         'maintenance_support' => end_of_day('2032-05-31'),
-        'extended_support' => end_of_day('2035-05-31')
+        'extended_support' => end_of_day('2035-05-31'),
       },
       'RHEL8' => {
         'full_support' => end_of_day('2024-05-31'),
         'maintenance_support' => end_of_day('2029-05-31'),
-        'extended_support' => end_of_day('2032-05-31')
+        'extended_support' => end_of_day('2032-05-31'),
       },
       'RHEL7' => {
         'full_support' => end_of_day('2019-08-06'),
         'maintenance_support' => end_of_day('2024-06-30'),
-        'extended_support' => end_of_day('2028-06-30')
+        'extended_support' => end_of_day('2028-06-30'),
       },
       'RHEL7 (System z (Structure A))' => {
         'full_support' => end_of_day('2019-08-06'),
-        'maintenance_support' => end_of_day('2021-05-31')
+        'maintenance_support' => end_of_day('2021-05-31'),
       },
       'RHEL7 (ARM)' => {
         'full_support' => end_of_day('2019-08-06'),
-        'maintenance_support' => end_of_day('2020-11-30')
+        'maintenance_support' => end_of_day('2020-11-30'),
       },
       'RHEL7 (POWER9)' => {
         'full_support' => end_of_day('2019-08-06'),
-        'maintenance_support' => end_of_day('2021-05-31')
+        'maintenance_support' => end_of_day('2021-05-31'),
       },
       'RHEL6' => {
         'full_support' => end_of_day('2016-05-10'),
         'maintenance_support' => end_of_day('2020-11-30'),
-        'extended_support' => end_of_day('2024-06-30')
+        'extended_support' => end_of_day('2024-06-30'),
       },
       'RHEL5' => {
         'full_support' => end_of_day('2013-01-08'),
         'maintenance_support' => end_of_day('2017-03-31'),
-        'extended_support' => end_of_day('2020-11-30')
-      }
+        'extended_support' => end_of_day('2020-11-30'),
+      },
     }.freeze
 
     EOS_WARNING_THRESHOLD = 1.year
@@ -61,7 +61,7 @@ module Katello
         approaching_end_of_maintenance: APPROACHING_END_OF_MAINTENANCE,
         extended_support: EXTENDED_SUPPORT,
         approaching_end_of_support: APPROACHING_END_OF_SUPPORT,
-        support_ended: SUPPORT_ENDED
+        support_ended: SUPPORT_ENDED,
       }
 
       map.default = UNKNOWN

data/app/models/katello/root_repository.rb

@@ -23,7 +23,7 @@ module Katello
     SKIPABLE_METADATA_TYPES = [Repository::YUM_TYPE, Repository::DEB_TYPE].freeze
 
     CONTENT_ATTRIBUTE_RESTRICTIONS = {
-      :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE]
+      :download_policy => [Repository::YUM_TYPE, Repository::DEB_TYPE, Repository::DOCKER_TYPE],
     }.freeze
 
     MAX_EXPIRE_TIME = 7 * 24 * 60 * 60
@@ -67,7 +67,7 @@ module Katello
     validates_lengths_from_database :except => [:label]
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
-    validates_with Validators::KatelloUrlFormatValidator, :attributes => :url,
+    validates_with Validators::KatelloURLFormatValidator, :attributes => :url,
                    :nil_allowed => proc { |repo| repo.custom? || repo.organization.cdn_configuration.export_sync? },
                    :field_name => :url
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :name
@@ -96,15 +96,15 @@ module Katello
     validates :content_type, :inclusion => {
       :in => ->(_) { Katello::RepositoryTypeManager.enabled_repository_types.keys },
       :allow_blank => false,
-      :message => ->(_, _) { _("is not enabled. must be one of the following: %s") % Katello::RepositoryTypeManager.enabled_repository_types.keys.join(', ') }
+      :message => ->(_, _) { _("is not enabled. must be one of the following: %s") % Katello::RepositoryTypeManager.enabled_repository_types.keys.join(', ') },
     }
     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(', '),
     }, if: :yum?
     validates :http_proxy_policy, inclusion: {
       :in => HTTP_PROXY_POLICIES,
-      :message => _("must be one of the following: %s") % HTTP_PROXY_POLICIES.join(', ')
+      :message => _("must be one of the following: %s") % HTTP_PROXY_POLICIES.join(', '),
     }
 
     validates :metadata_expire,
@@ -113,7 +113,7 @@ module Katello
         less_than_or_equal_to: MAX_EXPIRE_TIME,
         greater_than: 0,
         allow_nil: true,
-        only_integer: true
+        only_integer: true,
       }
 
     validates :container_push_name_format, inclusion: { in: ['label', 'id'].freeze, allow_nil: true}
@@ -296,7 +296,7 @@ module Katello
       if self.upstream_username.blank? && self.upstream_password.blank?
         self.upstream_username = nil
         self.upstream_password = nil
-        if !self.url.blank? && self.url.start_with?('uln') && !self.content
+        if !self.url.blank? && self.url.start_with?('uln')
           errors.add(:base, N_("Upstream username and upstream password cannot be blank for ULN repositories"))
         end
         return
@@ -333,7 +333,7 @@ module Katello
       return if self.deb_releases.blank? && self.url.blank?
       if self.deb_releases.blank?
         errors.add(:base, N_("When \"Upstream URL\" is set, \"Releases/Distributions\" must also be set!"))
-      elsif self.url.blank? && !self.content
+      elsif self.url.blank?
         errors.add(:base, N_("When \"Releases/Distributions\" is set, \"Upstream URL\" must also be set!"))
       end
     end
@@ -370,10 +370,6 @@ module Katello
       "#{organization.label} #{product.label} #{label}".gsub(/\s/, "_")
     end
 
-    def content
-      Katello::Content.find_by(:cp_content_id => self.content_id, :organization_id => self.product.organization_id)
-    end
-
     def docker?
       self.content_type == Repository::DOCKER_TYPE
     end
@@ -394,6 +390,10 @@ module Katello
       self.content_type == Repository::DEB_TYPE
     end
 
+    def deb_using_structured_apt?
+      self.deb? && !self.content_id
+    end
+
     def ansible_collection?
       self.content_type == Repository::ANSIBLE_COLLECTION_TYPE
     end
@@ -420,12 +420,8 @@ module Katello
       changeable_attributes.any? { |key| previous_changes.key?(key) }
     end
 
-    def raw_content_path
-      self.content.content_url
-    end
-
     def repo_mapper
-      @repo_mapper ||= Katello::Candlepin::RepositoryMapper.new(self.product, self.content, self.substitutions)
+      @repo_mapper ||= Katello::Candlepin::RepositoryMapper.new(self.product, self.library_instance.content, self.substitutions)
     end
 
     def calculate_updated_name
@@ -436,7 +432,7 @@ module Katello
     def substitutions
       {
         :releasever => self.minor,
-        :basearch => self.arch
+        :basearch => self.arch,
       }.compact
     end
 

data/app/models/katello/task_status.rb

@@ -247,7 +247,7 @@ module Katello
       # Handle not very friendly Pulp message
       case errors
       when /^\(.*\)$/
-        if stacktrace.class == Array
+        if stacktrace.instance_of?(Array)
           stacktrace.last.split(":").first
         else
           stacktrace.split("(").first

data/app/models/katello/upstream_pool.rb

@@ -24,7 +24,7 @@ module Katello
         {
           pools: pools,
           total: total,
-          subtotal: pools.count
+          subtotal: pools.count,
         }
       end
 
@@ -59,7 +59,7 @@ module Katello
           consumed: 'consumed',
           product_name: 'productName',
           product_id: 'productId',
-          subscription_id: 'subscriptionId'
+          subscription_id: 'subscriptionId',
         }
       end
 

data/app/presenters/katello/product_content_presenter.rb

@@ -29,12 +29,12 @@ module Katello
       if overidden_value.nil?
         {
           status: enabled ? "enabled" : "disabled",
-          overridden: false
+          overridden: false,
         }
       else
         {
           status: overidden_value ? "enabled" : "disabled",
-          overridden: true
+          overridden: true,
         }
       end
     end

data/app/presenters/katello/repository_presenter.rb

@@ -14,12 +14,12 @@ module Katello
           {
             :content_view_version => {
               :id => repository.content_view_version.id,
-              :name => repository.content_view_version.name
+              :name => repository.content_view_version.name,
             },
             :environment => {
               :id => repository.environment.id,
-              :name => repository.environment.name
-            }
+              :name => repository.environment.name,
+            },
           }
         end
       end

data/app/presenters/katello/sync_status_presenter.rb

@@ -8,7 +8,7 @@ module Katello
       :never_synced => _("Never Synced"),
       :running => _("Running"),
       :canceled => _("Canceled"),
-      :paused => _("Paused")
+      :paused => _("Paused"),
     }.with_indifferent_access
 
     def initialize(repo, task)
@@ -34,7 +34,7 @@ module Katello
         :display_size => display_output,
         :size => display_output,
         :is_running => @task.pending && @task.state != 'paused',
-        :error_details => @task.errors
+        :error_details => @task.errors,
       }
     end
 
@@ -47,7 +47,7 @@ module Katello
         :product_id => repo.product.id,
         :progress => {},
         :state => format_state(OpenStruct.new(:state => state)),
-        :raw_state => state
+        :raw_state => state,
       }
     end
 

data/app/services/cert/certs.rb

@@ -9,7 +9,7 @@ module Cert
     end
 
     def self.candlepin_client_ca_cert
-      File.read(SETTINGS[:katello][:candlepin][:ca_cert_file])
+      File.read(backend_ca_cert_file(:candlepin))
     end
 
     def self.ssl_client_cert
@@ -28,10 +28,14 @@ module Cert
       Setting[:ssl_priv_key]
     end
 
+    def self.backend_ca_cert_file(backend)
+      SETTINGS.dig(:katello, backend, :ca_cert_file) || Setting[:ssl_ca_file]
+    end
+
     def self.verify_ueber_cert(organization)
       ueber_cert = OpenSSL::X509::Certificate.new(self.ueber_cert(organization)[:cert])
       cert_store = OpenSSL::X509::Store.new
-      cert_store.add_file SETTINGS[:katello][:candlepin][:ca_cert_file]
+      cert_store.add_file backend_ca_cert_file(:candlepin)
       organization.regenerate_ueber_cert unless cert_store.verify ueber_cert
     end
   end

data/app/services/katello/candlepin_event_listener.rb

@@ -40,7 +40,7 @@ module Katello
       {
         processed_count: @processed_count,
         failed_count: @failed_count,
-        running: running?
+        running: running?,
       }
     end
 

data/app/services/katello/event_monitor/poller_thread.rb

@@ -46,7 +46,7 @@ module Katello
         {
           processed_count: @processed_count,
           failed_count: @failed_count,
-          running: running?
+          running: running?,
         }
       end
 

data/app/services/katello/event_queue.rb

@@ -53,7 +53,7 @@ module Katello
     def self.push_event(event_type, id)
       attrs = {
         event_type: event_type,
-        object_id: id
+        object_id: id,
       }
 
       yield(attrs) if block_given?

data/app/services/katello/product_content_finder.rb

@@ -15,22 +15,22 @@ module Katello
 
     def product_content
       if match_environment
-        if consumable.is_a?(::Katello::ActivationKey) # TODO: remove this when AKs are refactored for multi CV
-          environment = consumable.lifecycle_environment
-          view = consumable.content_view
-          return ProductContent.none unless environment && view
-          versions = ContentViewVersion.in_environment(environment).where(:content_view_id => view).first
-        else # consumable is a SubscriptionFacet
-          versions = consumable.content_view_environments.select(:content_view_version_id).map(&:content_view_version_id)
-        end
+        versions = consumable.content_view_environments.select(:content_view_version_id).map(&:content_view_version_id)
       end
 
       considered_products = match_subscription ? consumable.products : consumable.organization.products.enabled.uniq
 
       roots = Katello::RootRepository.where(:product_id => considered_products).subscribable
-      roots = roots.in_content_view_version(versions) if versions.present?
+      roots = roots.in_content_view_version(versions).distinct if versions.present?
+      content_ids = roots.where.not(:content_id => nil).pluck(:content_id)
+      structured_apt_roots = roots.where(:content_id => nil)
+      if structured_apt_roots.any?
+        deb_repos_query = Katello::Repository.where(root: structured_apt_roots)
+        deb_repos = match_environment ? deb_repos_query.where(content_view_version: versions, environment: consumable.environment) : deb_repos_query.where(:library_instance_id => nil)
+        content_ids += deb_repos.pluck(:content_id)
+      end
 
-      consumable.organization.enabled_product_content_for(roots)
+      consumable.organization.enabled_product_content_for(content_ids)
     end
 
     def custom_content_labels

data/app/services/katello/product_content_importer.rb

@@ -152,7 +152,7 @@ module Katello
         vendor: content[:vendor],
         gpg_url: content[:gpgUrl],
         content_url: content[:contentUrl],
-        organization_id: product.organization_id
+        organization_id: product.organization_id,
       }
     end
 

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

@@ -54,7 +54,7 @@ module Katello
           proxy_url: smart_proxy.http_proxy&.url,
           proxy_username: smart_proxy.http_proxy&.username,
           proxy_password: smart_proxy.http_proxy&.password,
-          total_timeout: Setting[:sync_connect_timeout]
+          total_timeout: Setting[:sync_connect_timeout],
         }
         if acs.content_type == ::Katello::Repository::FILE_TYPE && acs.subpaths.empty? && !remote_options[:url].end_with?('/PULP_MANIFEST')
           remote_options[:url] = acs.base_url + '/PULP_MANIFEST'
@@ -73,7 +73,7 @@ module Katello
           {
             client_cert: acs.ssl_client_cert&.content,
             client_key: acs.ssl_client_key&.content,
-            ca_cert: acs.ssl_ca_cert&.content
+            ca_cert: acs.ssl_ca_cert&.content,
           }
         end
       end

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

@@ -26,7 +26,7 @@ module Katello
           namespace: unit['namespace'],
           version: unit['version'],
           name: unit['name'],
-          description: unit['description']
+          description: unit['description'],
         }
       end
 

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

@@ -23,6 +23,10 @@ module Katello
         def copy_api
           PulpDebClient::DebCopyApi.new(api_client)
         end
+
+        def content_release_components_api
+          PulpDebClient::ContentReleaseComponentsApi.new(api_client)
+        end
       end
     end
   end

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

@@ -4,6 +4,7 @@ module Katello
     class Content
       extend Katello::Abstract::Pulp::Content
       class << self
+        # rubocop:disable Metrics/ParameterLists
         def create_upload(size = 0, checksum = nil, content_type = nil, repository = nil)
           content_unit_href = nil
           content_type = ::Katello::RepositoryTypeManager.find_content_type(content_type)

data/app/services/katello/pulp3/content_view_version/export.rb

@@ -130,11 +130,7 @@ module Katello
           MetadataGenerator.new(export_service: self).generate!
         end
 
-        def self.find_generated_export_view(create_by_default: false,
-                                            destination_server:,
-                                            organization:,
-                                            name:,
-                                            generated_for:)
+        def self.find_generated_export_view(destination_server:, organization:, name:, generated_for:, create_by_default: false)
           name += "-#{destination_server}" unless destination_server.blank?
           select_method = create_by_default ? :first_or_create : :first
           ::Katello::ContentView.where(name: name,
@@ -146,9 +142,7 @@ module Katello
           is_a?(SyncableFormatExport) ? SYNCABLE : IMPORTABLE
         end
 
-        def self.find_library_export_view(create_by_default: false,
-                                          destination_server:,
-                                          organization:,
+        def self.find_library_export_view(destination_server:, organization:, create_by_default: false,
                                           format: IMPORTABLE)
           if format == IMPORTABLE
             generated_for = :library_export
@@ -165,8 +159,7 @@ module Katello
                                      generated_for: generated_for)
         end
 
-        def self.find_repository_export_view(create_by_default: false,
-                                              repository:,
+        def self.find_repository_export_view(repository:, create_by_default: false,
                                               format: IMPORTABLE)
           if format == IMPORTABLE
             generated_for = :repository_export

data/app/services/katello/pulp3/content_view_version/export_validator.rb

@@ -30,7 +30,7 @@ module Katello
                    " is required to be able to export: '%{exportable_types}'." %
                    { content_view: content_view_version.content_view.name,
                      current: content_view_version.version,
-                     exportable_types: ::Katello::Repository.exportable_types(format: format).join("', '")
+                     exportable_types: ::Katello::Repository.exportable_types(format: format).join("', '"),
                    })
           end
         end

data/app/services/katello/pulp3/content_view_version/import.rb

@@ -135,7 +135,7 @@ module Katello
               name: metadata_map.content_view.name,
               label: metadata_map.content_view.label,
               description: metadata_map.content_view.description,
-              generated_for: generated_for
+              generated_for: generated_for,
             }
           end
 
@@ -150,7 +150,7 @@ module Katello
             name: import_cv_name_from_export(name: metadata_map.content_view.name, generated_for: generated_for),
             label: import_cv_name_from_export(name: metadata_map.content_view.label, generated_for: generated_for),
             description: "Content View used for importing into library",
-            generated_for: generated_for
+            generated_for: generated_for,
           }
         end
 

data/app/services/katello/pulp3/content_view_version/import_gpg_keys.rb

@@ -22,7 +22,7 @@ module Katello
             params = {
               name: gpg.name,
               content_type: ::Katello::ContentCredential::GPG_KEY_TYPE,
-              content: gpg.content
+              content: gpg.content,
             }
 
             create_or_update_gpg!(params)

data/app/services/katello/pulp3/content_view_version/importable_products.rb

@@ -39,7 +39,7 @@ module Katello
             gpg_key_id: gpg_key_id(metadata_product),
             name: find_unique_name(metadata_product),
             label: metadata_product.label,
-            description: metadata_product.description
+            description: metadata_product.description,
           }
         end
 
@@ -56,7 +56,7 @@ module Katello
         def update_params(metadata_product)
           {
             gpg_key_id: gpg_key_id(metadata_product),
-            description: metadata_product.description
+            description: metadata_product.description,
           }
         end
 

data/app/services/katello/pulp3/content_view_version/importable_repositories.rb

@@ -46,14 +46,14 @@ module Katello
               product_content = fetch_product_content(repo.content, product)
               substitutions = {
                 basearch: repo.arch,
-                releasever: repo.minor
+                releasever: repo.minor,
               }
               creatable << {
                 product: product,
                 content: product_content,
                 substitutions: substitutions,
                 override_url: fetch_feed_url(repo),
-                override_arch: repo.arch
+                override_arch: repo.arch,
               }
             else
               creatable << { repository: product.add_repo(create_repo_params(repo, product)) }
@@ -109,7 +109,7 @@ module Katello
             :major,
             :minor,
             :download_policy,
-            :mirroring_policy
+            :mirroring_policy,
           ]
 
           params = { name: find_unique_name(metadata_repo, product) }
@@ -142,7 +142,7 @@ module Katello
             :major,
             :minor,
             :download_policy,
-            :mirroring_policy
+            :mirroring_policy,
           ]
           params = {}
           url = fetch_feed_url(metadata_repo)