Skip to content

Commit

Permalink
Fixes #38142 - Add MultiCV methods to jail for hosts and activation k…
Browse files Browse the repository at this point in the history
…eys reporting (#11279)
jeremylenz authored Jan 23, 2025
1 parent 5f06aa5 commit 614ec0b
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/models/katello/activation_key.rb
Original file line number Diff line number Diff line change
@@ -290,7 +290,7 @@ def check_cves
property :name, String, desc: 'Returns the name of the Activation Key.'
end
class Jail < ::Safemode::Jail
allow :name
allow :name, :content_view_environment_labels, :multi_content_view_environment?
end
end
end
6 changes: 3 additions & 3 deletions app/models/katello/concerns/host_managed_extensions.rb
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ def remote_execution_proxies(provider, *_rest)
prepend Overrides

delegate :content_source_id, :single_content_view, :single_lifecycle_environment, :default_environment?, :single_content_view_environment?, :multi_content_view_environment?, :kickstart_repository_id, :bound_repositories,
:installable_errata, :installable_rpms, :image_mode_host?, to: :content_facet, allow_nil: true
:content_view_environment_labels, :installable_errata, :installable_rpms, :image_mode_host?, to: :content_facet, allow_nil: true

delegate :release_version, :purpose_role, :purpose_usage, to: :subscription_facet, allow_nil: true

@@ -623,8 +623,8 @@ class ::Host::Managed::Jail < Safemode::Jail
:host_collections, :pools, :hypervisor_host, :installed_debs,
:installed_packages, :traces_helpers, :advisory_ids, :package_names_for_job_template,
:filtered_entitlement_quantity_consumed, :bound_repositories,
:single_content_view, :single_lifecycle_environment, :release_version,
:purpose_role, :purpose_usage
:single_content_view, :single_lifecycle_environment, :content_view_environment_labels, :multi_content_view_environment?,
:release_version, :purpose_role, :purpose_usage
end

class ActiveRecord::Associations::CollectionProxy::Jail < Safemode::Jail
2 changes: 1 addition & 1 deletion app/models/katello/host/content_facet.rb
Original file line number Diff line number Diff line change
@@ -453,7 +453,7 @@ class Jail < ::Safemode::Jail
:errata_counts, :id, :kickstart_repository, :kickstart_repository_id, :kickstart_repository_name,
:upgradable_deb_count, :upgradable_module_stream_count, :upgradable_rpm_count, :uuid,
:installable_security_errata_count, :installable_bugfix_errata_count, :installable_enhancement_errata_count,
:single_content_view, :single_lifecycle_environment
:single_content_view, :single_lifecycle_environment, :content_view_environment_labels
end
end
end

0 comments on commit 614ec0b

Please sign in to comment.