katello 3.15.1 → 3.16.0.rc2.1

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

@@ -27,7 +27,7 @@ module Katello
           version_hrefs = api.repository_versions
           orphan_version_hrefs = api.list_all.collect do |pulp_repo|
             mirror_repo_versions = api.versions_list_for_repository(pulp_repo.pulp_href, ordering: :_created)
-            version_hrefs = mirror_repo_versions.collect { |version| version.pulp_href }
+            version_hrefs = mirror_repo_versions.select { |repo_version| repo_version.number != 0 }.collect { |version| version.pulp_href }
 
             version_hrefs - [pulp_repo.latest_version_href]
           end

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

@@ -45,9 +45,9 @@ module Katello
         tasks.flatten
       end
 
-      def pulp3_enabled_repo_types
+      def pulp3_enabled_repo_types(check_pulp2_preferred = true)
         Katello::RepositoryTypeManager.repository_types.values.select do |repository_type|
-          smart_proxy.pulp3_repository_type_support?(repository_type)
+          smart_proxy.pulp3_repository_type_support?(repository_type, check_pulp2_preferred)
         end
       end
 
@@ -56,12 +56,32 @@ module Katello
         repo_version_map = {}
         pulp3_enabled_repo_types.each do |repo_type|
           api = repo_type.pulp3_service_class.api(smart_proxy)
-          version_hrefs = api.repository_versions
+          version_hrefs = api.repository_versions.select { |repo_version| repo_version.number != 0 }.map(&:pulp_href)
           repo_version_map[api] = version_hrefs - ::Katello::Repository.where(version_href: version_hrefs).pluck(:version_href)
         end
 
         repo_version_map
       end
+
+      def delete_orphan_repositories
+        tasks = []
+        orphan_repositories.each do |api, hrefs|
+          tasks << hrefs.collect do |href|
+            api.repositories_api.delete(href)
+          end
+        end
+        tasks.flatten
+      end
+
+      def orphan_repositories
+        repo_map = {}
+        pulp3_enabled_repo_types(false).each do |repo_type|
+          api = repo_type.pulp3_service_class.api(smart_proxy)
+          repo_hrefs = api.list_all.map(&:pulp_href)
+          repo_map[api] = repo_hrefs - ::Katello::Pulp3::RepositoryReference.where(repository_href: repo_hrefs).pluck(:repository_href)
+        end
+        repo_map
+      end
     end
   end
 end

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

@@ -3,6 +3,8 @@ module Katello
     class Srpm < PulpContentUnit
       include LazyAccessor
 
+      CONTENT_TYPE = "srpm".freeze
+
       PULP_INDEXED_FIELDS = %w(pulp_href name version release arch epoch summary location_href pkgId).freeze
 
       lazy_accessor :pulp_facts, :initializer => :backend_data
@@ -15,6 +17,11 @@ module Katello
         PulpRpmClient::ContentPackagesApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_master!).api_client)
       end
 
+      def self.page_options(page_opts = {})
+        page_opts["arch"] = "src"
+        page_opts
+      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
@@ -67,7 +74,7 @@ module Katello
         custom_json['nvra'] = model.build_nvra
         custom_json['filename'] = backend_data['location_href']
         custom_json['checksum'] = backend_data['pkgId']
-        model.update_attributes!(custom_json)
+        model.update!(custom_json)
       end
     end
   end

data/app/services/katello/ui_notifications/subscriptions/expire_soon.rb

@@ -8,7 +8,7 @@ module Katello
               if (notification = notification_already_exists?(organization))
                 next unless organization.expiring_subscriptions.count.to_s ==
                   notification.message.split(' ').first
-                notification.update_attributes(
+                notification.update(
                   :message => message(organization),
                   :actions => actions
                 )

data/app/services/katello/ui_notifications/subscriptions/manifest_expired_warning.rb

@@ -0,0 +1,63 @@
+module Katello
+  module UINotifications
+    module Subscriptions
+      class ManifestExpiredWarning < ::UINotifications::Base
+        CONTENT_LABEL = 'rhel-7-server-rpms'.freeze
+        CDN_HOSTNAME = 'cdn.redhat.com'.freeze
+        CDN_PATH = '/content/dist/rhel/server/7/listing'.freeze
+
+        def self.deliver!(orgs = ::Organization.all)
+          orgs.each do |org|
+            next unless redhat_connected?(org)
+            content = org.contents.find_by(:label => CONTENT_LABEL)
+            product = content&.products&.find { |p| p.key }
+            if content && product && product.pools.any?
+              if got_403? { product.cdn_resource.get(CDN_PATH) }
+                new(org).deliver!
+              end
+            end
+          end
+        rescue StandardError => e
+          # Do not break actions using notifications even if there is a failure.
+          logger.warn("Failed to handle notifications - this is most likely a bug: #{e}")
+          logger.debug(e.backtrace.join("\n"))
+          false
+        end
+
+        def create
+          add_notification if update_notifications.zero?
+        end
+
+        def update_notifications
+          blueprint.notifications.
+              where(subject: subject).
+              update_all(expired_at: blueprint.expired_at)
+        end
+
+        def add_notification
+          Notification.create!(
+              initiator:  User.anonymous_admin,
+              audience: ::Notification::AUDIENCE_ADMIN,
+              subject: subject,
+              notification_blueprint: blueprint
+          )
+        end
+
+        def blueprint
+          @blueprint ||= NotificationBlueprint.find_by(name: 'manifest_expired_warning')
+        end
+
+        def self.got_403?
+          yield
+          false
+        rescue Katello::Errors::SecurityViolation
+          true
+        end
+
+        def self.redhat_connected?(org)
+          org.redhat_provider.repository_url.include?(CDN_HOSTNAME) && !Setting[:content_disconnected]
+        end
+      end
+    end
+  end
+end

data/app/views/katello/api/v2/activation_keys/product_content.json.rabl

@@ -23,7 +23,7 @@ child @collection[:results] => :results do
 
   node :enabled_content_override do |pc|
     override = pc.enabled_content_override
-    override.computed_value if override
+    override&.computed_value
   end
 
   attributes :enabled

data/app/views/katello/api/v2/content_facet/erratum.json.rabl

@@ -1,5 +1,5 @@
 extends("katello/api/v2/errata/show")
 
 node :installable do |e|
-  @installable_errata_ids.include?(e.id) if @installable_errata_ids
+  @installable_errata_ids&.include?(e.id)
 end

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

@@ -20,6 +20,10 @@ child :content_facet => :content_facet_attributes do
   node :katello_agent_installed do |content_facet|
     content_facet.katello_agent_installed?
   end
+
+  node :katello_tracer_installed do |content_facet|
+    content_facet.tracer_installed?
+  end
 end
 
 attributes :description, :facts

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

@@ -19,15 +19,11 @@ node :version_id do |h|
 end
 
 node :triggered_by do |h|
-  if h.triggered_by
-    h.triggered_by.name
-  end
+  h.triggered_by&.name
 end
 
 node :triggered_by_id do |h|
-  if h.triggered_by
-    h.triggered_by.id
-  end
+  h.triggered_by&.id
 end
 
 child :task => :task do

data/app/views/katello/api/v2/host_subscriptions/product_content.json.rabl

@@ -18,7 +18,8 @@ child @collection[:results] => :results do
 
   node :enabled_content_override do |pc|
     override = pc.enabled_content_override
-    override.computed_value if override
+
+    override&.computed_value
   end
 
   attributes :override, :enabled

data/app/views/katello/api/v2/host_tracer/base.json.rabl

@@ -1,6 +1,8 @@
 object @resource ||= @object
 
-attributes :id, :id
-attributes :application, :application
-attributes :helper, :helper
-attributes :app_type, :app_type
+attributes :id
+attributes :application
+attributes :helper
+attributes :app_type
+attributes :host_id, :host
+attributes :reboot_required? => :reboot_required

data/app/views/katello/api/v2/organizations/owner_details.rabl

@@ -0,0 +1,5 @@
+attributes :id, :key, :created, :updated, :lastRefreshed, :virt_who
+
+node :upstreamConsumer do |owner|
+  partial('katello/api/v2/organizations/upstream_consumer', object: OpenStruct.new(owner.upstreamConsumer)) if owner.upstreamConsumer
+end

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

@@ -2,14 +2,19 @@ object @organization
 
 extends "api/v2/taxonomies/show"
 
-attributes :task_id, :label, :owner_details, :redhat_repository_url
+attributes :task_id, :label, :redhat_repository_url
 
 if ::SETTINGS[:katello][:use_cp]
   attributes :system_purposes, :system_purposes
   attributes :service_levels, :service_level
+
   node :simple_content_access do |org|
     org.simple_content_access?
   end
+
+  node :owner_details do |org|
+    partial('katello/api/v2/organizations/owner_details', object: OpenStruct.new(org.owner_details))
+  end
 end
 
 node :default_content_view_id do |org|

data/app/views/katello/api/v2/organizations/upstream_consumer.rabl

@@ -0,0 +1 @@
+attributes :name, :uuid, :webUrl

data/app/views/katello/subscription_mailer/subscription_expiry.html.erb

@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #3f3f3f; background-color: #f1f1f1;">
+<body>
+<style type="text/css">
+  a, a:visited {
+    color: #6bb5df !important;
+  }
+
+  a:hover {
+    color: #CCCCCC !important;
+  }
+</style>
+<div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #3f3f3f; background-color: #f1f1f1;">
+  <h2 style="font-weight: normal;"><%= _("SUBSCRIPTIONS EXPIRING SOON").html_safe %></h2>
+    <table border="0" width="100%" id="emailBody" style="background-color: #fff; margin-top: 10px; padding: 0px 0px 15px;" bgcolor="#fff">
+      <tr>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Subscription Name") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Account Number") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Organization") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Type") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Quantity") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("SKU") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Contract") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Start Date") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("End Date") %></th>
+        <th style="text-align: center; border-collapse: collapse; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Days Remaining") %></th>
+      </tr>
+      <% @pools.each do |pool| %>
+        <tr>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.subscription.name %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.account_number %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.organization.name %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.pool_type %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.quantity %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.subscription.cp_id  %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.contract_number %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.start_date %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.end_date %></td>
+          <td align="left" valign="top" style="padding: 0px 20px 5px;"><%= pool.days_until_expiration %></td>
+        </tr>
+      <% end %>
+    </table>
+</div>
+<br/>
+  <%= @report_link %>
+</body>
+</html>

data/app/views/katello/subscription_mailer/subscription_expiry.text.erb

@@ -0,0 +1,19 @@
+<%= _("Subscriptions expiring soon") %>
+
+<% @pools.each do |pool| %>
+  <%= _("Subscription Name") %>:    <%= pool.subscription.name %>
+  <%= _("Account Number") %>:       <%= pool.account_number %>
+  <%= _("Organization") %>:         <%= pool.organization.name %>
+  <%= _("Type") %>:                 <%= pool.pool_type %>
+  <%= _("Quantity") %>:             <%= pool.quantity %>
+  <%= _("SKU") %>:                  <%= pool.subscription.cp_id %>
+  <%= _("Contract") %>:             <%= pool.contract_number %>
+  <%= _("Start Date") %>:           <%= pool.start_date %>
+  <%= _("End Date") %>:             <%= pool.end_date %>
+  <%= _("Days Remaining") %>:       <%= pool.days_until_expiration %>
+
+<% end %>
+
+<%if @report_url %>
+  <%= _("View a report of the affected hosts") %>:               <%= @report_url %>
+<% end %>

data/app/views/users/_subscriptions_expiring_soon_query_builder.html.erb

@@ -0,0 +1,16 @@
+<span style="padding: 7px;
+border: 1px solid #ccc;
+border-width: 0 0 1px 1px;
+border-radius: 0 0 0 10px;
+position: relative;
+left: 18%;
+top: -12px;">   </span>
+<div id="subscription_expiry_query_builder" class="input-group" style="
+  display: block;
+  top: -22px;
+  left: calc(20% + 16px);
+  width: 56%;
+">
+  <%= select_f(f, :mail_query, %W[#{Setting[:expire_soon_days]}\ -\ System\ default 7 30 60 90 120 180], :to_i, :to_translation, { :include_blank => false }, {:label => _('Days from Now'),
+             :label_help => _('The email notification will include subscriptions expiring in this number of days or fewer.')}) %>
+</div>

data/config/initializers/monkeys.rb

@@ -1,5 +1,5 @@
 #place where monkey patches are required
-require 'monkeys/multi_json_empty_fix'
-require 'monkeys/json_munging_patch'
 require 'monkeys/passenger_tee_input'
 require 'monkeys/anemone'
+require 'monkeys/ar_postgres_evr_t'
+require 'monkeys/fx_sqlite_skip'

data/config/katello.yaml.example

@@ -79,6 +79,10 @@
 #    :file:                     <true/false>
 #    :yum:                      <true/false>
 
+# Applicability can be calculated by Katello or Pulp 2.
+# Default is Pulp 2 (false).
+#  :katello_applicability: <true/false>
+
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes.rb

@@ -27,7 +27,7 @@ Katello::Engine.routes.draw do
   match '/ansible_collections' => 'react#index', :via => [:get]
   match '/ansible_collections/*page' => 'react#index', :via => [:get]
 
-  match '/xui' => 'react#index', :via => [:get]
-  match '/xui/*page' => 'react#index', :via => [:get]
+  match '/labs' => 'react#index', :via => [:get]
+  match '/labs/*page' => 'react#index', :via => [:get]
   match '/organization_select' => 'react#index', :via => [:get]
 end

data/config/routes/api/rhsm.rb

@@ -17,6 +17,7 @@ Katello::Engine.routes.draw do
       match '/consumers' => 'candlepin_proxies#consumer_create', :via => :post
       match '/hypervisors' => 'candlepin_proxies#hypervisors_update', :via => :post
       match '/hypervisors/:owner/' => 'candlepin_proxies#async_hypervisors_update', :via => :post
+      match '/hypervisors/:owner/heartbeat' => 'candlepin_proxies#hypervisors_heartbeat', :via => :put
       match '/owners/:organization_id/environments' => 'candlepin_proxies#rhsm_index', :via => :get
       match '/owners/:organization_id/pools' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_pools_path
       match '/owners/:organization_id/servicelevels' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_servicelevels_path

data/config/routes/api/v2.rb

@@ -219,7 +219,6 @@ Katello::Engine.routes.draw do
           member do
             post :repo_discover
             post :cancel_repo_discover
-            post :autoattach_subscriptions
             get :download_debug_certificate
             get :redhat_provider
             get :releases
@@ -305,6 +304,12 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :traces, :only => [], :controller => 'host_tracer' do
+          collection do
+            put :resolve
+          end
+        end
+
         api_resources :srpms, :only => [:index, :show], :controller => 'srpms' do
           collection do
             get :auto_complete_search

data/config/routes/overrides.rb

@@ -76,6 +76,7 @@ Foreman::Application.routes.draw do
             match '/bulk/destroy' => 'hosts_bulk_actions#destroy_hosts', :via => :put
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
+            match '/bulk/traces' => 'hosts_bulk_actions#traces', :via => :post
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
@@ -104,7 +105,6 @@ Foreman::Application.routes.draw do
             collection do
               put :auto_attach
               get :product_content
-              get :events
               get :available_release_versions
               put :content_override
               put :remove_subscriptions

data/db/functions/empty_v01.sql

@@ -0,0 +1,7 @@
+create or replace FUNCTION empty(t TEXT)
+	RETURNS BOOLEAN as $$
+	BEGIN
+		return t ~ '^[[:space:]]*$';
+	END;
+$$ language 'plpgsql';
+

data/db/functions/evr_trigger_v01.sql

@@ -0,0 +1,9 @@
+CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+  BEGIN
+    NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+                          rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+                          rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+    RETURN NEW;
+  END;
+$$ language 'plpgsql';
+