katello 4.8.1 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c709207089041832e6dd1b447a01d0d40dc228480d4b4e43b536c853242662
-  data.tar.gz: 94ec8c4161ff3f63d2a48d4be430b5942b7a40684c4bc39a6c734597ed9f39bf
+  metadata.gz: 50dbc6ac50280ac62f64e850e0d16444abed94953b491ac51db4530e8e377edb
+  data.tar.gz: e5d4e0fb485fcbdfd73d56c3f7e1d9952bdec57110447c683d55c2e81784a0f1
 SHA512:
-  metadata.gz: 1923b0ae05a6bb6c92b7b807793ce795e4ed90a26e598124a0441b49cb30270ec4829eb0ae0a95944de20bb4db5366b9219ac247667e194b8de88c6a7a933e82
-  data.tar.gz: 062cd9f6c371824bbe22b4b686735eba4ac0ee5ebd316fe4e06fa74b942e58da6f891ef6c3d5ed92158e9d32878bfc533574419b63836d4f4078a3b85eca54bb
+  metadata.gz: 56f172e039b743a27fddb7af888d01bfd42699da833b1afddeea3ea5d44b96abf38870d1fcc95481c538725974ccf343bfef35230a51ba916352054d9f0f8eee
+  data.tar.gz: 7ac8d7121b1d41d28417ed65904cb29444935f429c02d285766a8ada60c2f76d29f4015291045c583e4729c7ac5d9839a5d6bec50beaae06d09c7dcff2461ccc

data/app/controllers/katello/concerns/content_facet_hosts_controller_extensions.rb

@@ -6,7 +6,7 @@ module Katello
         before_action :set_up_content_view_environment, only: [:update]
 
         def set_up_content_view_environment
-          return unless params[:host] && params[:host][:content_facet_attributes]
+          return unless @host&.content_facet.present? && params[:host]&.[](:content_facet_attributes)&.present?
           cv_id = params[:host][:content_facet_attributes].delete(:content_view_id)
           env_id = params[:host][:content_facet_attributes].delete(:lifecycle_environment_id)
           Rails.logger.info "set_up_content_view_environment: cv_id=#{cv_id}, env_id=#{env_id}"

data/app/lib/actions/katello/host/update_content_view.rb

@@ -4,8 +4,10 @@ module Actions
       class UpdateContentView < Actions::EntryAction
         def plan(host, content_view_id, lifecycle_environment_id)
           if host.content_facet
-            host.content_facet.content_view = ::Katello::ContentView.find(content_view_id)
-            host.content_facet.lifecycle_environment = ::Katello::KTEnvironment.find(lifecycle_environment_id)
+            host.content_facet.assign_single_environment(
+              content_view_id: content_view_id,
+              lifecycle_environment_id: lifecycle_environment_id
+            )
             host.update_candlepin_associations
             plan_self(:hostname => host.name)
           else

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

@@ -161,7 +161,7 @@ module Katello
         returns String, desc: 'Package version'
       end
       def host_latest_applicable_rpm_version(host, package)
-        ::Katello::Rpm.latest(host.applicable_rpms.where(name: package)).first.nvra
+        ::Katello::Rpm.latest(host.applicable_rpms.where(name: package))&.first&.nvra
       end
 
       apipie :method, 'Loads Pool objects' do

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

@@ -11,10 +11,14 @@ module Katello
           super
         end
 
-        def fetch_paths(content_path)
+        def fetch_repo_set(content_path)
           url = "/katello/api/v2/repository_sets?organization_id=#{organization['id']}&search=#{CGI.escape("path = #{content_path}")}"
           response = get(url)
-          repo_set = JSON.parse(response)['results'].first
+          JSON.parse(response)['results'].first
+        end
+
+        def fetch_paths(content_path)
+          repo_set = fetch_repo_set(content_path)
 
           fail _("Upstream organization %s does not provide this content path") % @organization_label if repo_set.nil?
 
@@ -33,8 +37,8 @@ module Katello
           results = json_body['results']
 
           results.map do |repo|
-            Katello::Content.substitute_content_path(arch: repo[:arch],
-                                                     releasever: repo[:minor],
+            Katello::Content.substitute_content_path(arch: repo['arch'],
+                                                     releasever: repo['minor'],
                                                      content_path: content_path)
           end
         end

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

@@ -12,11 +12,11 @@ module Katello
         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")}"}"
+        finish_message = "Finished creating overrides in non-SCA org; #{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
+        messages[:success_message] = "Organization may now be switched 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]

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

@@ -6,7 +6,7 @@ module Katello
       include ForemanTasks::Concerns::ActionSubject
 
       module Overrides
-        def update(attrs)
+        def check_cve_attributes(attrs)
           if attrs[:content_facet_attributes]
             cv_id = attrs[:content_facet_attributes].delete(:content_view_id)
             lce_id = attrs[:content_facet_attributes].delete(:lifecycle_environment_id)
@@ -17,6 +17,16 @@ module Katello
               fail "content_view_id and lifecycle_environment_id must be provided together"
             end
           end
+        end
+
+        def attributes=(attrs)
+          check_cve_attributes(attrs)
+          super
+        end
+
+        def update(attrs)
+          return super if self.content_facet.blank?
+          check_cve_attributes(attrs)
           super
         end
 
@@ -30,6 +40,28 @@ module Katello
           inherited_attrs
         end
 
+        def apply_inherited_attributes(attributes, initialized = true)
+          attributes = super(attributes, initialized)
+          facet_attrs = attributes['content_facet_attributes']
+          return attributes if facet_attrs.blank?
+          cv_id = facet_attrs['content_view_id']
+          lce_id = facet_attrs['lifecycle_environment_id']
+          if initialized && (cv_id.blank? || lce_id.blank?)
+            if cv_id.blank?
+              Rails.logger.info "Hostgroup has no content view assigned; using host's existing content view"
+              facet_attrs['content_view_id'] = content_facet&.single_content_view&.id
+            end
+            if lce_id.blank?
+              Rails.logger.info "Hostgroup has no lifecycle environment assigned; using host's existing lifecycle environment"
+              facet_attrs['lifecycle_environment_id'] = content_facet&.single_lifecycle_environment&.id
+            end
+            attributes['content_facet_attributes'] = facet_attrs
+          else
+            Rails.logger.info "Hostgroup has content view and lifecycle environment assigned; using those"
+          end
+          attributes
+        end
+
         def smart_proxy_ids
           ids = super
           ids << content_source_id

data/app/models/katello/product_content.rb

@@ -15,6 +15,10 @@ module Katello
       where(:product_id => Product.redhat.select(:id))
     }
 
+    scope :custom, -> {
+      where.not(:product_id => Product.redhat.select(:id))
+    }
+
     scoped_search :on => :name, :relation => :content
     scoped_search :relation => :product, :on => :name, :rename => :product
     scoped_search :on => :content_type, :relation => :content, :complete_value => true
@@ -37,9 +41,39 @@ module Katello
       where(:product_id => Katello::PoolProduct.where(:pool_id => organization.pools).select(:product_id))
     end
 
-    # used by Katello::Api::V2::RepositorySetsController#index
+    # following 4 methods used by Katello::Api::V2::RepositorySetsController#index
     def repositories
       Katello::Repository.in_default_view.where(:root_id => product.root_repositories.has_url.where(:content_id => content.cp_content_id))
     end
+
+    def unfiltered_repositories
+      # don't filter by url, as we want to show all repos in the product
+      Katello::Repository.in_default_view.where(:root_id => product.root_repositories.where(:content_id => content.cp_content_id))
+    end
+
+    def arch
+      unfiltered_repositories.first&.arch
+    end
+
+    def os_versions
+      unfiltered_repositories.first&.os_versions || []
+    end
+
+    def enabled_value_from_candlepin
+      cp_product = ::Katello::Resources::Candlepin::Product.get(product.organization.label, product.cp_id).first
+      cp_content = cp_product['productContent'].find { |pc| pc['content']['id'] == content.cp_content_id }
+      cp_content['enabled']
+    end
+
+    def set_enabled_from_candlepin!
+      new_value = enabled_value_from_candlepin
+      if self.enabled != new_value
+        Rails.logger.info "Setting enabled to #{new_value} for Candlepin content #{content.cp_content_id}, ProductContent #{self.id}"
+        self.update!(:enabled => new_value)
+      else
+        Rails.logger.info "No change in enabled value for Candlepin content #{content.cp_content_id}, ProductContent #{self.id}"
+        false
+      end
+    end
   end
 end

data/app/services/katello/product_content_finder.rb

@@ -33,6 +33,10 @@ module Katello
       consumable.organization.enabled_product_content_for(roots)
     end
 
+    def custom_content_labels
+      product_content.custom.map { |pc| pc.product.root_repositories.map(&:custom_content_label) }.flatten.uniq
+    end
+
     def self.wrap_with_overrides(product_contents:, overrides:, status: nil)
       pc_with_overrides = product_contents.map { |pc| ProductContentPresenter.new(pc, overrides) }
       if status

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

@@ -38,11 +38,11 @@ child @resource.repositories => :repositories do
 end
 
 node :archRestricted do |pc|
-  pc.repositories&.first&.arch
+  pc.arch
 end
 
 node :osRestricted do |pc|
-  pc.repositories&.first&.os_versions&.first
+  pc.os_versions&.first
 end
 
 node :override do |pc|

data/lib/katello/version.rb

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

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareConfig.js

@@ -137,7 +137,7 @@ export default ({
         selectRPMPackagesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectRPMPackagesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: 'katello/api/v2/packages',
+      autocompleteEndpoint: '/katello/api/v2/packages',
       bookmarkController: 'katello_content_view_components',
       fetchItems: params => getRPMPackagesComparison(
         versionOneId,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.8.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4434,53 +4434,30 @@ 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