katello 4.14.0 → 4.15.0.rc1

data/app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb

@@ -9,7 +9,7 @@ module Actions
               chunk_size: nil,
               from_history: nil,
               fail_on_missing_content: false,
-              format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
+              format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE,
             }.merge(opts)
             action_subject(organization)
             validate_repositories_immediate!(organization) if options[:fail_on_missing_content]

data/app/lib/actions/pulp3/orchestration/repository/create.rb

@@ -6,7 +6,12 @@ module Actions
           def plan(repository, smart_proxy, force = false)
             sequence do
               create_action = plan_action(Actions::Pulp3::Repository::Create, repository, smart_proxy, force)
-              plan_action(Actions::Pulp3::Repository::SaveVersion, repository, repository_details: create_action.output[:response])
+              if repository.deb? && repository.library_instance?
+                response = plan_action(Pulp3::Repository::Initialize, repository, smart_proxy)
+                plan_action(Actions::Pulp3::Repository::SaveVersion, repository, tasks: response.output[:pulp_tasks])
+              else
+                plan_action(Actions::Pulp3::Repository::SaveVersion, repository, repository_details: create_action.output[:response])
+              end
 
               if repository.content_view.default? || !smart_proxy.pulp_primary?
                 plan_action(Actions::Pulp3::Repository::CreateRemote, repository, smart_proxy)

data/app/lib/actions/pulp3/orchestration/repository/trigger_update_repo_cert_guard.rb

@@ -9,7 +9,7 @@ module Actions
 
           def run
             repository = ::Katello::Repository.find(input[:repository_id])
-            ForemanTasks.async_task(::Actions::Pulp3::Repository::UpdateCVRepositoryCertGuard, repository, smart_proxy)
+            ForemanTasks.async_task(::Actions::Pulp3::Repository::UpdateCvRepositoryCertGuard, repository, smart_proxy)
           end
 
           def humanized_name

data/app/lib/actions/pulp3/repository/initialize.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Pulp3
+    module Repository
+      class Initialize < Pulp3::AbstractAsyncTask
+        def plan(repository, smart_proxy)
+          plan_self(repository_id: repository.id,
+                    smart_proxy_id: smart_proxy.id)
+        end
+
+        def invoke_external_task
+          repository = ::Katello::Repository.find(input[:repository_id])
+          output[:pulp_tasks] = repository.backend_service(smart_proxy).initialize_empty
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/pulp3/repository/refresh_distribution.rb

@@ -13,7 +13,7 @@ module Actions
 
             refresh_options = {
               :repository_id => repository.id,
-              :smart_proxy_id => smart_proxy.id
+              :smart_proxy_id => smart_proxy.id,
             }
             action = plan_self(refresh_options)
 

data/app/lib/katello/api/constraints/register_with_activation_key_constraint.rb

@@ -0,0 +1,11 @@
+module Katello
+  module Api
+    module Constraints
+      class RegisterWithActivationKeyConstraint
+        def matches?(request)
+          request.params[:activation_keys]
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -308,7 +308,7 @@ module Katello
                 :erratum_id => erratum_id,
                 :erratum_type => current_erratum_errata_type,
                 :issued => current_erratum_issued,
-                :status => task.result
+                :status => task.result,
               }
 
               if include_last_reboot == 'yes'

data/app/lib/katello/http_resource.rb

@@ -18,8 +18,8 @@ module Katello
 
     include Katello::Concerns::FilterSensitiveData
 
-    class_attribute :consumer_secret, :consumer_key, :ca_cert_file, :prefix, :site, :default_headers,
-                    :ssl_client_cert, :ssl_client_key
+    class_attribute :consumer_secret, :consumer_key, :prefix, :site, :default_headers,
+                    :ssl_client_cert, :ssl_client_key, :ssl_ca_file
 
     attr_reader :json
 
@@ -40,7 +40,7 @@ module Katello
       post: Net::HTTP::Post,
       put: Net::HTTP::Put,
       patch: Net::HTTP::Patch,
-      delete: Net::HTTP::Delete
+      delete: Net::HTTP::Delete,
     }.freeze
 
     class << self
@@ -128,7 +128,7 @@ module Katello
                    :authorize_path => "",
                    :access_token_path => ""}
 
-        params[:ca_file] = self.ca_cert_file unless self.ca_cert_file.nil?
+        params[:ca_file] = self.ssl_ca_file unless self.ssl_ca_file.nil?
         # New OAuth consumer to setup signing the request
         consumer = OAuth::Consumer.new(self.consumer_key,
                             self.consumer_secret,
@@ -145,9 +145,9 @@ module Katello
         options = {
           :headers => added_header,
           :open_timeout => SETTINGS[:katello][:rest_client_timeout],
-          :timeout => SETTINGS[:katello][:rest_client_timeout]
+          :timeout => SETTINGS[:katello][:rest_client_timeout],
         }
-        options[:ssl_ca_file] = self.ca_cert_file unless self.ca_cert_file.nil?
+        options[:ssl_ca_file] = self.ssl_ca_file unless self.ssl_ca_file.nil?
         options[:ssl_client_cert] = self.ssl_client_cert unless self.ssl_client_cert.nil?
         options[:ssl_client_key] = self.ssl_client_key unless self.ssl_client_key.nil?
 

data/app/lib/katello/messaging/stomp_connection.rb

@@ -16,8 +16,8 @@ module Katello
             {
               host: settings[:broker_host],
               port: settings[:broker_port],
-              ssl: ssl_params
-            }
+              ssl: ssl_params,
+            },
           ],
           logger: Rails.logger,
           max_reconnect_attempts: 2,
@@ -27,8 +27,8 @@ module Katello
             'accept-version': '1.2',
             'host': settings[:broker_host],
             'heart-beat': '30000,30000',
-            'client-id': settings[:client_id]
-          }
+            'client-id': settings[:client_id],
+          },
         }
 
         @queue_name = settings[:queue_name]

data/app/lib/katello/resources/candlepin/activation_key.rb

@@ -20,7 +20,7 @@ module Katello
               releaseVer: release_version,
               role: purpose_role,
               usage: purpose_usage,
-              addOns: purpose_addons
+              addOns: purpose_addons,
             }
             response = self.post(url, params.to_json, self.default_headers)
             JSON.parse(response.body).with_indifferent_access

data/app/lib/katello/resources/candlepin/owner.rb

@@ -18,7 +18,7 @@ module Katello
               :displayName => description,
               :contentPrefix => "/#{key}/$env",
               :contentAccessMode => content_access_mode,
-              :contentAccessModeList => 'org_environment'
+              :contentAccessModeList => 'org_environment',
             }
             owner_json = self.post(path, attrs.to_json, self.default_headers).body
             JSON.parse(owner_json).with_indifferent_access

data/app/lib/katello/resources/candlepin/product.rb

@@ -86,7 +86,7 @@ module Katello
               'accountNumber' => '',
               'productId' => product_id,
               'providedProducts' => [],
-              'contractNumber' => ''
+              'contractNumber' => '',
             }
             JSON.parse(Candlepin::Pool.create(owner_key, pool))
           end

data/app/lib/katello/resources/candlepin.rb

@@ -11,7 +11,7 @@ module Katello
         self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
         self.consumer_secret = cfg[:oauth_secret]
         self.consumer_key = cfg[:oauth_key]
-        self.ca_cert_file = cfg[:ca_cert_file]
+        self.ssl_ca_file = ::Cert::Certs.backend_ca_cert_file(:candlepin)
 
         class << self
           def process_response(response)

data/app/lib/katello/resources/cdn/katello_cdn.rb

@@ -27,7 +27,7 @@ module Katello
             organization_id: organization['id'],
             content_view_id: content_view_id,
             environment_id: lifecycle_environment_id,
-            search: CGI.escape("content_label = #{repo_set['label']}")
+            search: CGI.escape("content_label = #{repo_set['label']}"),
           }
           query_params = params.map { |key, value| "#{key}=#{value}" }
 
@@ -78,7 +78,7 @@ module Katello
 
         def repository_url(content_label:, arch:, major:, minor:)
           params = {
-            search: CGI.escape("content_label = #{content_label}")
+            search: CGI.escape("content_label = #{content_label}"),
           }
 
           params[:content_view_id] = content_view_id if @content_view_label
@@ -95,7 +95,7 @@ module Katello
                            minor: minor,
                            org_label: @organization_label,
                            cv_label: @content_view_label || Katello::OrganizationCreator::DEFAULT_CONTENT_VIEW_LABEL,
-                           env_label: @lifecycle_environment_label || Katello::OrganizationCreator::DEFAULT_LIFECYCLE_ENV_LABEL
+                           env_label: @lifecycle_environment_label || Katello::OrganizationCreator::DEFAULT_LIFECYCLE_ENV_LABEL,
             }
 
             fail _("Repository with content label: '%{content_label}'#{arch ? ', arch: \'%{arch}\'' : ''}#{minor ? ', version: \'%{minor}\'' : ''} was not found in upstream organization '%{org_label}',"\

data/app/lib/katello/resources/cdn.rb

@@ -51,7 +51,7 @@ module Katello
           @options = options
         end
 
-        def self.create(product: nil, cdn_configuration:)
+        def self.create(cdn_configuration:, product: nil)
           options = {}
           if cdn_configuration.redhat_cdn?
             options[:ssl_client_cert] = OpenSSL::X509::Certificate.new(product.certificate)

data/app/lib/katello/resources/discovery/container.rb

@@ -3,11 +3,13 @@ module Katello
     module Discovery
       class Container < RepoDiscovery
         attr_reader :found, :crawled, :to_follow
+
+        # rubocop:disable Metrics/ParameterLists
         def initialize(url, crawled = [], found = [], to_follow = [],
                        upstream_credentials_and_search = {
                          upstream_username: nil,
                          upstream_password: nil,
-                         search: '*'
+                         search: '*',
                        })
           @uri = uri(url)
           @upstream_username = upstream_credentials_and_search[:upstream_username].presence
@@ -94,7 +96,7 @@ module Katello
           request_params = {
             method: :get,
             headers: { accept: :json },
-            url: "#{@uri}v1/search?q=#{@search}"
+            url: "#{@uri}v1/search?q=#{@search}",
           }
 
           request_params[:user] = @upstream_username if @upstream_username
@@ -107,7 +109,7 @@ module Katello
               @found << result['name']
             end
           rescue
-            # Note: v2 endpoint does not support search
+            # NOTE: v2 endpoint does not support search
             request_params[:url] = "#{@uri}v2/_catalog"
             loop do
               results = RestClient::Request.execute(request_params)

data/app/lib/katello/resources/discovery/yum.rb

@@ -5,10 +5,12 @@ module Katello
     module Discovery
       class Yum < RepoDiscovery
         attr_reader :found, :crawled, :to_follow
+
+        # rubocop:disable Metrics/ParameterLists
         def initialize(url, crawled = [], found = [], to_follow = [],
                        upstream_credentials_and_search = {
                          upstream_username: nil,
-                         upstream_password: nil
+                         upstream_password: nil,
                        })
           @uri = uri(url)
           @upstream_username = upstream_credentials_and_search[:upstream_username].presence

data/app/lib/katello/resources/registry.rb

@@ -1,5 +1,3 @@
-require 'katello/util/data'
-
 module Katello
   module Resources
     require 'rest_client'
@@ -56,7 +54,6 @@ module Katello
             uri = URI.parse(content_app_url)
             self.prefix = "/pulpcore_registry/"
             self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
-            self.ca_cert_file = Setting[:ssl_ca_file]
             pulp_primary.pulp3_ssl_configuration(self, :net_http)
 
             self

data/app/lib/katello/util/candlepin_repository_checker.rb

@@ -33,9 +33,9 @@ module Katello
       end
 
       def self.repository_exist_in_backend?(repository)
-        return false if repository.root.content_id.blank?
+        return false if repository.content_id.blank?
 
-        ::Katello::Resources::Candlepin::Content.get(repository.organization.label, repository.root.content_id)
+        ::Katello::Resources::Candlepin::Content.get(repository.organization.label, repository.content_id)
         true
       rescue RestClient::NotFound
         false

data/app/lib/katello/util/cveak_migrator.rb

@@ -0,0 +1,38 @@
+module Katello
+  module Util
+    class FakeActivationKey < ApplicationRecord
+      self.table_name = 'katello_activation_keys'
+    end
+
+    class CVEAKMigrator # used in db/migrate/20240730163043_add_content_view_environment_activation_key.rb
+      def execute!
+        aks_with_no_cve = []
+        aks_with_missing_cve = []
+
+        FakeActivationKey.all.each do |ak|
+          next if ak.content_view_id.blank? && ak.environment_id.blank?
+          if ::Katello::ContentView.exists?(id: ak.content_view_id) && ::Katello::KTEnvironment.exists?(ak.environment_id)
+            cve = ::Katello::ContentViewEnvironment.find_by(content_view_id: ak.content_view_id, environment_id: ak.environment_id)
+            if cve.blank?
+              aks_with_no_cve << ak
+            end
+          else
+            aks_with_missing_cve << ak
+          end
+        end
+
+        if aks_with_missing_cve.present? || aks_with_no_cve.present?
+          Rails.logger.warn "Found #{aks_with_no_cve.count} activation keys whose combination of content view and lifecycle environment does not have a corresponding ContentViewEnvironment"
+          Rails.logger.warn "Found #{aks_with_missing_cve.count} activation keys which are missing either content_view_id or lifecycle_environment_id"
+          Rails.logger.info "You may want to change the content view / lifecycle environment for these activation keys manually."
+        end
+        (aks_with_no_cve + aks_with_missing_cve).each do |ak|
+          default_content_view = ak.organization.default_content_view
+          library = ak.organization.library
+          Rails.logger.info "Updating activation key #{ak.name} with default content_view_id and lifecycle_environment_id"
+          ak&.update_columns(content_view_id: default_content_view&.id, environment_id: library&.id)
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/util/deb.rb

@@ -0,0 +1,9 @@
+module Katello
+  module Util
+    module Deb
+      def self.parse_dependencies(deps)
+        deps&.split(',')&.collect { |d| d.strip }
+      end
+    end
+  end
+end

data/app/lib/katello/util/deduplication_migrator.rb

@@ -7,25 +7,25 @@ module Katello
         [
           {
             :model => ::Katello::CapsuleLifecycleEnvironment,
-            :fields => [:lifecycle_environment_id, :capsule_id]
+            :fields => [:lifecycle_environment_id, :capsule_id],
           },
           {
             :model => ::Katello::ContentViewErratumFilterRule,
-            :fields => [:errata_id, :content_view_filter_id]
+            :fields => [:errata_id, :content_view_filter_id],
           },
           {
             :model => ::Katello::ContentViewModuleStreamFilterRule,
-            :fields => [:module_stream_id, :content_view_filter_id]
+            :fields => [:module_stream_id, :content_view_filter_id],
           },
           {
             :model => ::Katello::ContentViewPackageGroupFilterRule,
-            :fields => [:uuid, :content_view_filter_id]
+            :fields => [:uuid, :content_view_filter_id],
           },
           {
             :model =>
             ::Katello::ContentViewRepository,
-            :fields => [:content_view_id, :repository_id]
-          }
+            :fields => [:content_view_id, :repository_id],
+          },
         ]
       end
 
@@ -33,8 +33,8 @@ module Katello
         [
           {
             :model => ::Katello::ContentView,
-            :fields => [:name, :organization_id]
-          }
+            :fields => [:name, :organization_id],
+          },
         ]
       end
 

data/app/lib/katello/util/model.rb

@@ -4,7 +4,7 @@ module Katello
       # hardcoded model names (uses kp_ prefix)
       def self.table_to_model_hash
         {
-          "kt_environment" => "KTEnvironment"
+          "kt_environment" => "KTEnvironment",
         }
       end
 
@@ -29,7 +29,7 @@ module Katello
 
       def self.controller_path_to_model_hash
         {
-          "katello/environments" => "Katello::KTEnvironment"
+          "katello/environments" => "Katello::KTEnvironment",
         }
       end
 

data/app/lib/katello/util/search.rb

@@ -7,13 +7,13 @@ module Katello
         {
           "kt_name_analyzer" => {
             "type" => "custom",
-            "tokenizer" => "keyword"
+            "tokenizer" => "keyword",
           },
           "autcomplete_name_analyzer" => {
             "type" => "custom",
             "tokenizer" => "keyword",
-            "filter" => %w(standard lowercase ngram_filter)
-          }
+            "filter" => %w(standard lowercase ngram_filter),
+          },
         }
       end
 
@@ -23,8 +23,8 @@ module Katello
             "type" => "edgeNGram",
             "side" => "front",
             "min_gram" => 1,
-            "max_gram" => 30
-          }
+            "max_gram" => 30,
+          },
         }
       end
 

data/app/lib/katello/util/task_status.rb

@@ -17,9 +17,9 @@ module Katello
             :finished => [N_('Package Install Complete'), N_('Package installation: "%{package}" '), N_('%{package} (%{total} other packages) installed')],
             :error => [N_('Package Install Failed'), N_('Package install failed: "%{package}"'), N_('%{package} (%{total} other packages) install failed')],
             :cancelled => [N_('Package Install Canceled'), N_('%{package} package install canceled'), N_('%{package} (%{total} other packages) install canceled')],
-            :timed_out => [N_('Package Install Timed Out'), N_('%{package} package install timed out'), N_('%{package} (%{total} other packages) install timed out')]
+            :timed_out => [N_('Package Install Timed Out'), N_('%{package} package install timed out'), N_('%{package} (%{total} other packages) install timed out')],
           },
-          :user_message => _('Package Install scheduled by %s')
+          :user_message => _('Package Install scheduled by %s'),
 
         },
         :package_update => {
@@ -31,9 +31,9 @@ module Katello
             :finished => [N_('Package Update Complete'), N_('%{package} package updated'), N_('%{package} (%{total} other packages) updated')],
             :error => [N_('Package Update Failed'), N_('%{package} package update failed'), N_('%{package} (%{total} other packages) update failed')],
             :cancelled => [N_('Package Update Canceled'), N_('%{package} package update canceled'), N_('%{package} (%{total} other packages) update canceled')],
-            :timed_out => [N_('Package Update Timed Out'), N_('%{package} package update timed out'), N_('%{package} (%{total} other packages) update timed out')]
+            :timed_out => [N_('Package Update Timed Out'), N_('%{package} package update timed out'), N_('%{package} (%{total} other packages) update timed out')],
           },
-          :user_message => _('Package Update scheduled by %s')
+          :user_message => _('Package Update scheduled by %s'),
         },
         :package_remove => {
           :english_name => N_("Package Remove"),
@@ -44,9 +44,9 @@ module Katello
             :finished => [N_('Package Remove Complete'), N_('%{package} package removed'), N_('%{package} (%{total} other packages) removed')],
             :error => [N_('Package Remove Failed'), N_('%{package} package remove failed'), N_('%{package} (%{total} other packages) remove failed')],
             :cancelled => [N_('Package Remove Canceled'), N_('%{package} package remove canceled'), N_('%{package} (%{total} other packages) remove canceled')],
-            :timed_out => [N_('Package Remove Timed Out'), N_('%{package} package remove timed out'), N_('%{package} (%{total} other packages) remove timed out')]
+            :timed_out => [N_('Package Remove Timed Out'), N_('%{package} package remove timed out'), N_('%{package} (%{total} other packages) remove timed out')],
           },
-          :user_message => _('Package Remove scheduled by %s')
+          :user_message => _('Package Remove scheduled by %s'),
         },
         #package group tasks
         :package_group_install => {
@@ -58,9 +58,9 @@ module Katello
             :finished => [N_('Package Group Install Complete'), N_('%{group} package group installed'), N_('%{group} (%{total} other package groups) installed')],
             :error => [N_('Package Group Install Failed'), N_('%{group} package group install failed'), N_('%{group} (%{total} other package groups) install failed')],
             :cancelled => [N_('Package Group Install Canceled'), N_('%{group} package group install canceled'), N_('%{group} (%{total} other package groups) install canceled')],
-            :timed_out => [N_('Package Group Install Timed Out'), N_('%{group} package group install timed out'), N_('%{group} (%{total} other package groups) install timed out')]
+            :timed_out => [N_('Package Group Install Timed Out'), N_('%{group} package group install timed out'), N_('%{group} (%{total} other package groups) install timed out')],
           },
-          :user_message => _('Package Group Install scheduled by %s')
+          :user_message => _('Package Group Install scheduled by %s'),
         },
         :package_group_update => {
           :english_name => N_("Package Group Update"),
@@ -71,10 +71,10 @@ module Katello
             :finished => [N_('Package group update complete'), N_('%{group} package group updated'), N_('%{group} (%{total} other package groups) updated')],
             :error => [N_('Package group update failed'), N_('%{group} package group update failed'), N_('%{group} (%{total} other package groups) update failed')],
             :cancelled => [N_('Package group update canceled'), N_('%{group} package group update canceled'), N_('%{group} (%{total} other package groups) update canceled')],
-            :timed_out => [N_('Package group update timed out'), N_('%{group} package group update timed out'), N_('%{group} (%{total} other package groups) update timed out')]
+            :timed_out => [N_('Package group update timed out'), N_('%{group} package group update timed out'), N_('%{group} (%{total} other package groups) update timed out')],
 
           },
-          :user_message => _('Package Group Update scheduled by %s')
+          :user_message => _('Package Group Update scheduled by %s'),
         },
         :package_group_remove => {
           :english_name => N_("Package Group Remove"),
@@ -85,10 +85,10 @@ module Katello
             :finished => [N_('Package Group Remove Complete'), N_('%{group} package group removed'), N_('%{group} (%{total} other package groups) removed')],
             :error => [N_('Package Group Remove Failed'), N_('%{group} package group remove failed'), N_('%{group} (%{total} other package groups) remove failed')],
             :cancelled => [N_('Package Group Remove Canceled'), N_('%{group} package group remove canceled'), N_('%{group} (%{total} other package groups) remove canceled')],
-            :timed_out => [N_('Package Group Remove Timed Out'), N_('%{group} package group remove timed out'), N_('%{group} (%{total} other package groups) remove timed out')]
+            :timed_out => [N_('Package Group Remove Timed Out'), N_('%{group} package group remove timed out'), N_('%{group} (%{total} other package groups) remove timed out')],
 
           },
-          :user_message => _('Package Group Remove scheduled by %s')
+          :user_message => _('Package Group Remove scheduled by %s'),
         },
         :errata_install => {
           :english_name => N_("Errata Install"),
@@ -99,29 +99,29 @@ module Katello
             :finished => [N_('Erratum Install Complete'), N_('%{errata} erratum installed'), N_('%{errata} (%{total} other errata) installed')],
             :error => [N_('Erratum Install Failed'), N_('%{errata} erratum install failed'), N_('%{errata} (%{total} other errata) install failed')],
             :cancelled => [N_('Erratum Install Canceled'), N_('%{errata} erratum install canceled'), N_('%{errata} (%{total} other errata) install canceled')],
-            :timed_out => [N_('Erratum Install Timed Out'), N_('%{errata} erratum install timed out'), N_('%{errata} (%{total} other errata) install timed out')]
+            :timed_out => [N_('Erratum Install Timed Out'), N_('%{errata} erratum install timed out'), N_('%{errata} (%{total} other errata) install timed out')],
           },
-          :user_message => _('Errata Install scheduled by %s')
+          :user_message => _('Errata Install scheduled by %s'),
         },
         :candlepin_event => {
           :english_name => N_("Candlepin Event"),
           :type => :candlepin_event,
           :event_messages => {
           },
-          :user_message => nil
+          :user_message => nil,
         },
         :content_view_publish => {
           :english_name => N_("content view publish"),
-          :type => :content_view_publish
+          :type => :content_view_publish,
         },
         :content_view_node_publish => {
           :english_name => N_("content view node publish"),
-          :type => :content_view_node_publish
+          :type => :content_view_node_publish,
         },
         :content_view_refresh => {
           :english_name => N_("content view refresh"),
-          :type => :content_view_refresh
-        }
+          :type => :content_view_refresh,
+        },
       }.with_indifferent_access
 
       TYPES.each_pair do |_name, value|

data/app/lib/katello/util/url_matcher.rb

@@ -13,15 +13,15 @@
 #
 # ===== Examples
 #
-#   UrlMatcher.match('/foo', ['/', '/foo', '/bar/baz'])   #=> ['/foo']
-#   UrlMatcher.match('/80/07/01', ['/:year/:month/:day']) #=> ['/80/07/01', '80', '07', '01']
+#   URLMatcher.match('/foo', ['/', '/foo', '/bar/baz'])   #=> ['/foo']
+#   URLMatcher.match('/80/07/01', ['/:year/:month/:day']) #=> ['/80/07/01', '80', '07', '01']
 #
 
 require 'pathname'
 
 module Katello
   module Util
-    module UrlMatcher
+    module URLMatcher
       def self.match(path, routes)
         path     = Path.new(path)
         patterns = routes.map { |route| Pattern.new(Array(route).first) }

data/app/lib/katello/validators/content_view_environment_org_validator.rb

@@ -5,9 +5,10 @@ module Katello
         environment_id = record.respond_to?(:lifecycle_environment_id) ? record.lifecycle_environment_id : record.environment_id
         view = ContentView.where(:id => record.content_view_id).first
         environment = KTEnvironment.where(:id => environment_id).first
-        unless view && environment
+        if view.blank? || environment.blank?
           record.errors[:base] << _("Content view environments must have both a content view and an environment")
         end
+
         unless view&.organization == environment&.organization
           record.errors[:base] << _("%{view_label} could not be promoted to %{environment_label} because the content view and the environment are not in the same organization!") % {:view_label => view&.label, :environment_label => environment&.label}
         end

data/app/lib/katello/validators/katello_url_format_validator.rb

@@ -1,7 +1,7 @@
 module Katello
   module Validators
-    class KatelloUrlFormatValidator < ActiveModel::EachValidator
-      include KatelloUrlHelper
+    class KatelloURLFormatValidator < ActiveModel::EachValidator
+      include KatelloURLHelper
 
       def validate_each(record, attribute, value)
         if options[:nil_allowed]

data/app/mailers/katello/errata_mailer.rb

@@ -33,10 +33,7 @@ module Katello
       ::User.as(user.login) do
         @content_view = options[:content_view]
         @environment = options[:environment]
-        @content_facets = Katello::Host::ContentFacet.in_content_views_and_environments(
-          :lifecycle_environments => [@environment],
-          :content_views => [@content_view]
-        )
+        @content_facets = Katello::Host::ContentFacet.with_content_views(@content_view).with_environments(@environment)
         @hosts = ::Host::Managed.authorized("view_hosts").where(:id => @content_facets.pluck(:host_id))
         @errata = @content_facets.map(&:installable_errata).flatten.uniq