katello 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2919242e09a707d0f3a395e9aaa41cb10a5df4230c72d9fa9c9a2ea4fec084c8
-  data.tar.gz: 4231fadf860f0c63c5ccbd98e05f96019eae6e91c3e12abf45c22c958ad27c67
+  metadata.gz: 81c709207089041832e6dd1b447a01d0d40dc228480d4b4e43b536c853242662
+  data.tar.gz: 94ec8c4161ff3f63d2a48d4be430b5942b7a40684c4bc39a6c734597ed9f39bf
 SHA512:
-  metadata.gz: 3c3c89ea507b6f247fb1b40b17e615c903e24475b63f9b19d19ebfe1c7d284629b089c87358b3f9a0e35f09b78109823509826c70e21a21dfb8de20ade93a574
-  data.tar.gz: d71b28cc37b495a5a836031b7598819070e58c881c5e77bfe292816c2639508dbf075ef5d1234f31b96480a6ea131a8fdbdec0ea4609c2fbccab1a78cc96f5cf
+  metadata.gz: 1923b0ae05a6bb6c92b7b807793ce795e4ed90a26e598124a0441b49cb30270ec4829eb0ae0a95944de20bb4db5366b9219ac247667e194b8de88c6a7a933e82
+  data.tar.gz: 062cd9f6c371824bbe22b4b686735eba4ac0ee5ebd316fe4e06fa74b942e58da6f891ef6c3d5ed92158e9d32878bfc533574419b63836d4f4078a3b85eca54bb

data/app/controllers/katello/api/v2/simple_content_access_controller.rb

@@ -26,8 +26,10 @@ module Katello
     api :PUT, "/organizations/:organization_id/simple_content_access/enable",
       N_("Enable simple content access for a manifest")
     param :organization_id, :number, :desc => N_("Organization ID"), :required => true
+    param :auto_create_overrides, :bool, :desc => N_("Automatically create disabled content overrides for custom products which do not have an attached subscription"), :required => false, :default => true
     def enable
-      task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:organization_id])
+      auto_create = params.key?(:auto_create_overrides) ? ::Foreman::Cast.to_bool(params[:auto_create_overrides]) : true
+      task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:organization_id], auto_create_overrides: auto_create)
       respond_for_async :resource => task
     end
 

data/app/lib/actions/katello/content_view/publish.rb

@@ -112,15 +112,8 @@ module Actions
           version.update_content_counts!
           # update errata applicability counts for all hosts in the CV & Library
           unless input[:skip_promotion]
-            content_view = ::Katello::ContentView.find(input[:content_view_id])
-            lifecycle_environment = ::Katello::KTEnvironment.find(input[:environment_id])
-            ::Katello::Host::ContentFacet.in_content_views_and_environments(
-              content_views: [content_view],
-              lifecycle_environments: [lifecycle_environment]
-            ).each do |facet|
-              facet.update_applicability_counts
-              facet.update_errata_status
-            end
+            environment = ::Katello::KTEnvironment.find(input[:environment_id])
+            ::Katello::ContentView.find(input[:content_view_id]).update_host_statuses(environment)
           end
 
           history = ::Katello::ContentViewHistory.find(input[:history_id])

data/app/lib/actions/katello/organization/simple_content_access/enable.rb

@@ -3,6 +3,16 @@ module Actions
     module Organization
       module SimpleContentAccess
         class Enable < Toggle
+          def plan(organization_id, auto_create_overrides: true)
+            input[:auto_create_overrides] = auto_create_overrides
+            sequence do
+              if auto_create_overrides
+                plan_action(PrepareContentOverrides, organization_id)
+              end
+              super(organization_id) # puts plan_self inside the sequence
+            end
+          end
+
           def content_access_mode_value
             SIMPLE_CONTENT_ACCESS_ENABLED_VALUE
           end

data/app/lib/actions/katello/organization/simple_content_access/prepare_content_overrides.rb

@@ -0,0 +1,36 @@
+module Actions
+  module Katello
+    module Organization
+      module SimpleContentAccess
+        class PrepareContentOverrides < Actions::Base
+          def plan(organization_id)
+            Rails.logger.info "PrepareContentOverrides plan: #{organization_id.inspect}"
+            organization = ::Organization.find(organization_id.to_i)
+            org_name = organization.name
+
+            plan_self(organization_id: organization_id, organization_name: org_name)
+          end
+
+          def run
+            organization = ::Organization.find(input[:organization_id].to_i)
+            migrator = ::Katello::Util::ContentOverridesMigrator.new(organization: organization)
+
+            output[:migrator_result] = migrator.execute_non_sca_overrides!
+          end
+
+          def rescue_strategy
+            Dynflow::Action::Rescue::Skip
+          end
+
+          def humanized_name
+            N_("Prepare content overrides for Simple Content Access")
+          end
+
+          def humanized_input
+            _("for organization %s") % input[:organization_name]
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/organization/simple_content_access/toggle.rb

@@ -12,9 +12,15 @@ module Actions
           attr_reader :organization
 
           def plan(organization_id)
-            @organization = ::Organization.find(organization_id)
+            organization = ::Organization.find(organization_id.to_i)
+            input[:organization_name] = organization.name
+            input[:organization_label] = organization.label
             action_subject organization
-            ::Katello::Resources::Candlepin::Owner.update(@organization.label, contentAccessMode: content_access_mode_value)
+            plan_self(organization_id: organization_id)
+          end
+
+          def run
+            ::Katello::Resources::Candlepin::Owner.update(input[:organization_label], contentAccessMode: content_access_mode_value)
           end
 
           def failure_notification(plan)
@@ -30,6 +36,10 @@ module Actions
             )
           end
 
+          def humanized_input
+            _("for organization %s") % input[:organization_name]
+          end
+
           private
 
           def consumer

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

@@ -0,0 +1,98 @@
+module Katello
+  module Util
+    class ContentOverridesMigrator # used in Actions::Katello::Organization::SimpleContentAccess::PrepareContentOverrides
+      include ActionView::Helpers::TextHelper
+
+      def initialize(organization:)
+        @organization = organization
+      end
+
+      def execute_non_sca_overrides!
+        host_errors = create_disabled_overrides_for_non_sca_org_hosts(organization: @organization)
+        ak_errors = create_disabled_overrides_for_non_sca_org_activation_keys(organization: @organization)
+
+        total_errors = host_errors + ak_errors
+        finish_message = "Finished creating overrides in non-SCA orgs; #{total_errors == 0 ? "no errors" : "#{pluralize(total_errors, "error")}"}"
+        messages = { result: finish_message, errors: total_errors }
+        messages[:host_errors] = "Hosts - #{pluralize(host_errors, "error")} creating disabled overrides for unsubscribed content; see log messages above" if host_errors > 0
+        messages[:ak_errors] = "Activation keys - #{pluralize(ak_errors, "error")} creating disabled overrides for unsubscribed content; see log messages above" if ak_errors > 0
+        messages[:success_message] = "You may now switch all organizations to Simple Content Access mode without any change in access to content." if total_errors == 0
+        Rails.logger.info finish_message
+        Rails.logger.info messages[:host_errors] if messages[:host_errors]
+        Rails.logger.info messages[:ak_errors] if messages[:ak_errors]
+        Rails.logger.info messages[:success_message] if messages[:success_message]
+        messages
+      end
+
+      def create_disabled_overrides_for_non_sca(consumable:)
+        content_finder = ::Katello::ProductContentFinder.new(
+                match_subscription: false,
+                match_environment: false,
+                consumable: consumable
+              )
+        subscribed_content_finder = ::Katello::ProductContentFinder.new(
+          match_subscription: true,
+          match_environment: false,
+          consumable: consumable
+        )
+        candlepin_resource = consumable.is_a?(::Katello::Host::SubscriptionFacet) ? ::Katello::Resources::Candlepin::Consumer : ::Katello::Resources::Candlepin::ActivationKey
+        consumable_id = consumable.is_a?(::Katello::Host::SubscriptionFacet) ? consumable.uuid : consumable.cp_id
+        repos_with_existing_overrides = candlepin_resource.content_overrides(consumable_id).map do |override|
+          override[:contentLabel]
+        end
+        unsubscribed_content = content_finder.custom_content_labels - subscribed_content_finder.custom_content_labels - repos_with_existing_overrides
+        new_overrides = unsubscribed_content.map do |repo_label|
+          ::Katello::ContentOverride.new(
+            repo_label,
+            { name: "enabled", value: "0" } # Override to disabled
+          )
+        end
+        return if new_overrides.blank?
+        if consumable.is_a? ::Katello::Host::SubscriptionFacet
+          ::Katello::Resources::Candlepin::Consumer.update_content_overrides(
+            consumable.uuid,
+            new_overrides.map(&:to_entitlement_hash)
+          )
+        else
+          ::Katello::Resources::Candlepin::ActivationKey.update_content_overrides(
+            consumable.cp_id,
+            new_overrides.map(&:to_entitlement_hash)
+          )
+        end
+      end
+
+      def create_disabled_overrides_for_non_sca_org_hosts(organization:)
+        errors = 0
+        fail _("Organization must be specified") if organization.blank?
+        return 0 if organization.simple_content_access? # subscription attachment is meaningless with SCA
+        Rails.logger.info("Hosts - Creating disabled overrides for unsubscribed content in organization #{organization.name}")
+        # only registered hosts with content!
+        hosts_to_update = organization.hosts.joins(:subscription_facet).where.not("#{Katello::Host::SubscriptionFacet.table_name}.host_id" => nil)
+        hosts_to_update.each do |host|
+          create_disabled_overrides_for_non_sca(consumable: host.subscription_facet)
+        rescue => e
+          errors += 1
+          Rails.logger.error("Failed to update host #{host.name}: #{e.message}")
+          Rails.logger.debug e.backtrace.join("\n")
+        end
+        errors
+      end
+
+      def create_disabled_overrides_for_non_sca_org_activation_keys(organization:)
+        errors = 0
+        fail _("Organization must be specified") if organization.blank?
+        return 0 if organization.simple_content_access? # subscription attachment is meaningless with SCA
+        Rails.logger.info("Activation keys - Creating disabled overrides for unsubscribed content in organization #{organization.name}")
+        aks_to_update = organization.activation_keys
+        aks_to_update.each do |ak|
+          create_disabled_overrides_for_non_sca(consumable: ak)
+        rescue => e
+          errors += 1
+          Rails.logger.error("Failed to update activation key #{ak.name}: #{e.message}")
+          Rails.logger.debug e.backtrace.join("\n")
+        end
+        errors
+      end
+    end
+  end
+end

data/app/models/katello/content_view.rb

@@ -652,12 +652,16 @@ module Katello
     end
 
     def check_orphaned_content_facets!(environments: [])
-      ::Katello::Host::ContentFacet.in_content_views_and_environments(
-        content_views: [self],
-        lifecycle_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!")
+      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|
+            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
+          end
         end
       end
     end

data/app/models/katello/host/content_facet.rb

@@ -298,19 +298,26 @@ module Katello
       end
 
       def katello_agent_installed?
-        self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-agent').any?
+        self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-agent').any? ||
+          self.host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => 'katello-agent').any?
       end
 
       def tracer_installed?
         self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => [ "python-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
                                                                                                "python3-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
-                                                                                               HOST_TOOLS_TRACER_PACKAGE_NAME ]).any?
+                                                                                               HOST_TOOLS_TRACER_PACKAGE_NAME ]).any? ||
+          self.host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => [ "python-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
+                                                                                         "python3-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
+                                                                                         HOST_TOOLS_TRACER_PACKAGE_NAME ]).any?
       end
 
       def host_tools_installed?
         host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => [ "python-#{HOST_TOOLS_PACKAGE_NAME}",
                                                                                           "python3-#{HOST_TOOLS_PACKAGE_NAME}",
-                                                                                          HOST_TOOLS_PACKAGE_NAME ]).any?
+                                                                                          HOST_TOOLS_PACKAGE_NAME ]).any? ||
+          host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => [ "python-#{HOST_TOOLS_PACKAGE_NAME}",
+                                                                                    "python3-#{HOST_TOOLS_PACKAGE_NAME}",
+                                                                                    HOST_TOOLS_PACKAGE_NAME ]).any?
       end
 
       def update_errata_status

data/db/migrate/20220110223754_update_disconnected_settings.rb

@@ -1,19 +1,23 @@
 class UpdateDisconnectedSettings < ActiveRecord::Migration[6.0]
+  class FakeSetting < Katello::Model
+    self.table_name = 'settings'
+  end
+
   def up
-    setting_disconnected = Setting.find_by(name: 'content_disconnected')
+    setting_disconnected = FakeSetting.find_by(name: 'content_disconnected')
     setting = Setting.find_by(name: 'subscription_connection_enabled')
 
     setting&.update!(
       value: !setting_disconnected&.value
     )
-    Setting.where(:name => 'content_disconnected').delete_all
+    FakeSetting.where(:name => 'content_disconnected').delete_all
   end
 
   def down
     remove_column :katello_cdn_configurations, :airgapped
     setting_disconnected = Setting.find_by(name: 'subscription_connection_enabled')
-    Setting.set('content_disconnected', N_("A server operating in disconnected mode does not communicate with the Red Hat CDN."),
-               !setting_disconnected.value, N_('Disconnected mode'))
+    FakeSetting.set('content_disconnected', N_("A server operating in disconnected mode does not communicate with the Red Hat CDN."),
+                    !setting_disconnected.value, N_('Disconnected mode'))
 
     Setting.where(:name => 'subscription_connection_enabled').delete_all
   end

data/db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb

@@ -2,7 +2,7 @@ class EnsureRepoUsernamePasswordNilNotBlank < ActiveRecord::Migration[6.1]
   def change
     ::Katello::Repository.library.each do |repo|
       if repo.upstream_username == '' && repo.upstream_password == ''
-        repo.update(upstream_username: nil, upstream_password: nil)
+        repo.root.update(upstream_username: nil, upstream_password: nil)
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.8.0".freeze
+  VERSION = "4.8.1".freeze
 end

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js

@@ -49,8 +49,8 @@ import {
 const moduleStreamSupported = ({ os, version }) =>
   os.match(/RedHat|RHEL|CentOS|Rocky|AlmaLinux|OracleLinux/i) && Number(version) > 7;
 export const hideModuleStreamsTab = ({ hostDetails }) => {
-  const osMatch = hostDetails?.operatingsystem_name?.match(/(\w+) (\d+)/);
-  if (!osMatch) return true;
+  const osMatch = hostDetails?.operatingsystem_name?.match(/(\D+) (\d+)/);
+  if (!osMatch) return false;
   const [, os, version] = osMatch;
   return !(osMatch && moduleStreamSupported({ os, version }));
 };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -923,6 +929,7 @@ files:
 - app/lib/actions/katello/organization/manifest_refresh.rb
 - app/lib/actions/katello/organization/simple_content_access/disable.rb
 - app/lib/actions/katello/organization/simple_content_access/enable.rb
+- app/lib/actions/katello/organization/simple_content_access/prepare_content_overrides.rb
 - app/lib/actions/katello/organization/simple_content_access/toggle.rb
 - app/lib/actions/katello/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/katello/product/content_create.rb
@@ -1141,6 +1148,7 @@ files:
 - app/lib/katello/resources/registry.rb
 - app/lib/katello/util/candlepin_repository_checker.rb
 - app/lib/katello/util/cdn_var_substitutor.rb
+- app/lib/katello/util/content_overrides_migrator.rb
 - app/lib/katello/util/data.rb
 - app/lib/katello/util/deduplication_migrator.rb
 - app/lib/katello/util/docker_manifest_clause_generator.rb
@@ -4426,30 +4434,53 @@ files:
 - locale/Makefile
 - locale/README
 - locale/action_names.rb
+- locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
+- locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
+- locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
+- locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
+- locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
+- locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
+- locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
+- locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
+- locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
+- locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
+- locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
 - locale/katello.pot
+- locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
+- locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
+- locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
+- locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
+- locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
+- locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
+- locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
+- locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
+- locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
+- locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
 - locale/update-i18n
+- locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
+- locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
 - package.json
 - vendor/assets/images/katello/add2.png