katello 4.14.0 → 4.15.0.rc1

data/lib/katello/engine.rb

@@ -33,29 +33,29 @@ module Katello
         :consumer_cert_rpm => 'katello-ca-consumer-latest.noarch.rpm',
         :consumer_cert_sh => 'katello-rhsm-consumer',
         :event_daemon => {
-          enabled: true
+          enabled: true,
         },
         :pulp => {
           :default_login => 'admin',
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
-          :sync_KBlimit => nil
+          :sync_KBlimit => nil,
         },
         :candlepin => {
           :url => 'https://localhost:8443/candlepin',
           :oauth_key => 'katello',
           :oauth_secret => 'katello',
           :ca_cert_file => nil,
-          :bulk_load_size => 1000
+          :bulk_load_size => 1000,
         },
         :candlepin_events => {
           :broker_host => 'localhost',
           :broker_port => 61_613,
           :queue_name => 'katello.candlepin',
           :subscription_name => 'candlepin_events',
-          :client_id => 'katello_candlepin_event_monitor'
-        }
+          :client_id => 'katello_candlepin_event_monitor',
+        },
       }
 
       SETTINGS[:katello] = default_settings.deep_merge(SETTINGS[:katello] || {})
@@ -79,12 +79,14 @@ module Katello
 
     # make sure the Katello plugin is initialized before `after_initialize`
     # hook so that the resumed Dynflow tasks can rely on everything ready.
-    initializer 'katello.register_plugin', :before => :finisher_hook, :after => 'foreman_remote_execution.register_plugin' do
-      ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
-      require 'katello/plugin'
+    initializer 'katello.register_plugin', :before => :finisher_hook, :after => 'foreman_remote_execution.register_plugin' do |app|
+      app.reloader.to_prepare do
+        ::Foreman::AccessControl::Permission.prepend ::Katello::Concerns::PermissionExtensions
+        require 'katello/plugin'
 
-      # extend builtin permissions from core with new actions
-      require 'katello/permissions'
+        # extend builtin permissions from core with new actions
+        require 'katello/permissions'
+      end
     end
 
     initializer "katello.set_dynflow_middlewares", :before => :finisher_hook do |_app|
@@ -185,11 +187,11 @@ module Katello
       # We need to explicitly load this files because Foreman has
       # similar strucuture and if the Foreman files are loaded first,
       # autoloading doesn't work.
-      require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
-      require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
-      require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
-      require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
-      require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
+      # require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
+      # require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
+      # require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
+      # require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
+      # require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions

data/lib/katello/permission_creator.rb

@@ -25,26 +25,26 @@ module Katello
                            'katello/activation_keys' => [:all, :index],
                            'katello/api/v2/activation_keys' => [:index, :show, :available_host_collections, :available_releases,
                                                                 :product_content, :auto_complete_search],
-                           'katello/api/v2/repository_sets' => [:index, :auto_complete_search]
+                           'katello/api/v2/repository_sets' => [:index, :auto_complete_search],
                          },
                          :resource_type => 'Katello::ActivationKey',
                          :finder_scope => :readable
       @plugin.permission :create_activation_keys,
                          {
-                           'katello/api/v2/activation_keys' => [:create, :copy]
+                           'katello/api/v2/activation_keys' => [:create, :copy],
                          },
                          :resource_type => 'Katello::ActivationKey'
       @plugin.permission :edit_activation_keys,
                          {
                            'katello/api/v2/activation_keys' => [:update, :content_override,
                                                                 :add_subscriptions, :remove_subscriptions,
-                                                                :add_host_collections, :remove_host_collections]
+                                                                :add_host_collections, :remove_host_collections],
                          },
                          :resource_type => 'Katello::ActivationKey',
                          :finder_scope => :editable
       @plugin.permission :destroy_activation_keys,
                          {
-                           'katello/api/v2/activation_keys' => [:destroy]
+                           'katello/api/v2/activation_keys' => [:destroy],
                          },
                          :resource_type => 'Katello::ActivationKey',
                          :finder_scope => :deletable
@@ -53,22 +53,22 @@ module Katello
     def capsule_content_permissions
       @plugin.permission :view_smart_proxies,
                          {
-                           'katello/api/v2/capsules' => [:index, :show]
+                           'katello/api/v2/capsules' => [:index, :show],
                          },
                          :resource_type => "SmartProxy"
       @plugin.permission :manage_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:add_lifecycle_environment, :remove_lifecycle_environment,
                                                                 :update_counts, :sync, :reclaim_space, :verify_checksum, :cancel_sync],
-                           'katello/api/v2/capsules' => [:index, :show]
+                           'katello/api/v2/capsules' => [:index, :show],
                          },
                          :resource_type => 'SmartProxy'
 
       @plugin.permission :view_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:counts, :lifecycle_environments, :available_lifecycle_environments, :sync_status],
-                           'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content, :index],
-                           'katello/api/v2/capsules' => [:index, :show]
+                           'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content],
+                           'katello/api/v2/capsules' => [:index, :show],
                          },
                          :resource_type => "SmartProxy"
     end
@@ -83,6 +83,7 @@ module Katello
                    'katello/api/v2/content_view_repositories' => [:show_all],
                    'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_components' => [:index, :show, :show_all],
+                   'katello/api/v2/content_view_environments' => [:index],
                    'katello/api/v2/debs' => [:index],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
@@ -111,13 +112,13 @@ module Katello
                                                 :repo_compare_packages,
                                                 :view_compare_errata,
                                                 :view_compare_packages,
-                                                :views]
+                                                :views],
                  },
                  :resource_type => 'Katello::ContentView',
                  :finder_scope => :readable
       @plugin.permission :create_content_views,
                          {
-                           'katello/api/v2/content_views' => [:create, :copy]
+                           'katello/api/v2/content_views' => [:create, :copy],
                          },
                          :resource_type => 'Katello::ContentView'
       @plugin.permission :edit_content_views,
@@ -126,14 +127,14 @@ module Katello
                            'katello/api/v2/content_view_versions' => [:update],
                            'katello/api/v2/content_view_filters' => [:create, :update, :destroy, :remove_filter_rules, :add_filter_rules],
                            'katello/api/v2/content_view_filter_rules' => [:create, :update, :destroy],
-                           'katello/api/v2/content_view_components' => [:add_components, :remove_components, :update]
+                           'katello/api/v2/content_view_components' => [:add_components, :remove_components, :update],
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :editable
       @plugin.permission :destroy_content_views,
                          {
                            'katello/api/v2/content_views' => [:destroy, :remove, :bulk_delete_versions],
-                           'katello/api/v2/content_view_versions' => [:destroy]
+                           'katello/api/v2/content_view_versions' => [:destroy],
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :deletable
@@ -141,14 +142,14 @@ module Katello
                          {
                            'katello/api/v2/content_views' => [:publish],
                            'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories, :verify_checksum],
-                           'katello/api/v2/content_imports' => [:version, :index]
+                           'katello/api/v2/content_imports' => [:version, :index],
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :publishable
       @plugin.permission :promote_or_remove_content_views,
                          {
                            'katello/api/v2/content_view_versions' => [:promote],
-                           'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories, :verify_checksum]
+                           'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories, :verify_checksum],
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :promotable_or_removable
@@ -158,27 +159,27 @@ module Katello
       @plugin.permission :view_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:index, :show, :content, :auto_complete_search],
-                           'katello/api/v2/gpg_keys' => [:index, :show, :content, :auto_complete_search]
+                           'katello/api/v2/gpg_keys' => [:index, :show, :content, :auto_complete_search],
                          },
                          :resource_type => 'Katello::ContentCredential',
                          :finder_scope => :readable
       @plugin.permission :create_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:create],
-                           'katello/api/v2/gpg_keys' => [:create]
+                           'katello/api/v2/gpg_keys' => [:create],
                          },
                          :resource_type => 'Katello::ContentCredential'
       @plugin.permission :edit_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:update, :set_content],
-                           'katello/api/v2/gpg_keys' => [:update, :set_content]
+                           'katello/api/v2/gpg_keys' => [:update, :set_content],
                          },
                          :resource_type => 'Katello::ContentCredential',
                          :finder_scope => :editable
       @plugin.permission :destroy_content_credentials,
                          {
                            'katello/api/v2/content_credentials' => [:destroy],
-                           'katello/api/v2/gpg_keys' => [:destroy]
+                           'katello/api/v2/gpg_keys' => [:destroy],
                          },
                          :resource_type => 'Katello::ContentCredential',
                          :finder_scope => :deletable
@@ -187,25 +188,25 @@ module Katello
     def host_collections_permissions
       @plugin.permission :view_host_collections,
                          {
-                           'katello/api/v2/host_collections' => [:index, :show, :auto_complete_search]
+                           'katello/api/v2/host_collections' => [:index, :show, :auto_complete_search],
                          },
                          :resource_type => 'Katello::HostCollection',
                          :finder_scope => :readable
       @plugin.permission :create_host_collections,
                          {
-                           'katello/api/v2/host_collections' => [:create, :copy]
+                           'katello/api/v2/host_collections' => [:create, :copy],
                          },
                          :resource_type => 'Katello::HostCollection',
                          :finder_scope => :creatable
       @plugin.permission :edit_host_collections,
                          {
-                           'katello/api/v2/host_collections' => [:update, :add_hosts, :remove_hosts]
+                           'katello/api/v2/host_collections' => [:update, :add_hosts, :remove_hosts],
                          },
                          :resource_type => 'Katello::HostCollection',
                          :finder_scope => :editable
       @plugin.permission :destroy_host_collections,
                          {
-                           'katello/api/v2/host_collections' => [:destroy]
+                           'katello/api/v2/host_collections' => [:destroy],
                          },
                          :resource_type => 'Katello::HostCollection',
                          :finder_scope => :deletable
@@ -215,25 +216,26 @@ module Katello
       @plugin.permission :view_lifecycle_environments,
                          {
                            'katello/api/v2/environments' => [:index, :show, :paths, :repositories, :auto_complete_search],
-                           'katello/api/rhsm/candlepin_proxies' => [:rhsm_index]
+                           'katello/api/rhsm/candlepin_proxies' => [:rhsm_index],
+                           'katello/api/v2/content_view_environments' => [:index],
                          },
                          :resource_type => 'Katello::KTEnvironment',
                          :finder_scope => :readable
       @plugin.permission :create_lifecycle_environments,
                          {
-                           'katello/api/v2/environments' => [:create]
+                           'katello/api/v2/environments' => [:create],
                          },
                          :resource_type => 'Katello::KTEnvironment',
                          :finder_scope => :creatable
       @plugin.permission :edit_lifecycle_environments,
                          {
-                           'katello/api/v2/environments' => [:update]
+                           'katello/api/v2/environments' => [:update],
                          },
                          :resource_type => 'Katello::KTEnvironment',
                          :finder_scope => :editable
       @plugin.permission :destroy_lifecycle_environments,
                          {
-                           'katello/api/v2/environments' => [:destroy]
+                           'katello/api/v2/environments' => [:destroy],
                          },
                          :resource_type => 'Katello::KTEnvironment',
                          :finder_scope => :deletable
@@ -285,13 +287,13 @@ module Katello
                                                         :repo_compare_errata,
                                                         :repo_compare_packages],
                            'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search],
-                           'katello/api/v2/host_packages' => [:installed_packages]
+                           'katello/api/v2/host_packages' => [:installed_packages],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :readable
       @plugin.permission :create_products,
                          {
-                           'katello/api/v2/products' => [:create]
+                           'katello/api/v2/products' => [:create],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -302,7 +304,7 @@ module Katello
                            'katello/api/v2/products_bulk_actions' => [:update_sync_plans, :update_http_proxy, :verify_checksum_products],
                            'katello/api/v2/content_uploads' => [:create, :update, :destroy],
                            'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover],
-                           'katello/api/v2/repository_sets' => [:enable, :disable]
+                           'katello/api/v2/repository_sets' => [:enable, :disable],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -311,7 +313,7 @@ module Katello
                            'katello/api/v2/products' => [:destroy],
                            'katello/api/v2/repositories' => [:destroy],
                            'katello/api/v2/products_bulk_actions' => [:destroy_products],
-                           'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories]
+                           'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :deletable
@@ -322,7 +324,7 @@ module Katello
                            'katello/api/v2/products_bulk_actions' => [:sync_products],
                            'katello/api/v2/repositories_bulk_actions' => [:sync_repositories, :reclaim_space_from_repositories],
                            'katello/api/v2/sync' => [:index],
-                           'katello/sync_management' => [:index, :sync_status, :product_status, :sync, :destroy]
+                           'katello/sync_management' => [:index, :sync_status, :product_status, :sync, :destroy],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :syncable
@@ -331,33 +333,33 @@ module Katello
     def subscription_permissions
       @plugin.permission :view_subscriptions,
                          {
-                           'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search]
+                           'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search],
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :attach_subscriptions,
                          {
-                           'katello/api/v2/subscriptions' => [:create]
+                           'katello/api/v2/subscriptions' => [:create],
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :unattach_subscriptions,
                          {
-                           'katello/api/v2/subscriptions' => [:destroy]
+                           'katello/api/v2/subscriptions' => [:destroy],
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :import_manifest,
                          {
-                           'katello/api/v2/subscriptions' => [:upload, :refresh_manifest]
+                           'katello/api/v2/subscriptions' => [:upload, :refresh_manifest],
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :delete_manifest,
                          {
-                           'katello/api/v2/subscriptions' => [:delete_manifest]
+                           'katello/api/v2/subscriptions' => [:delete_manifest],
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
                            'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible, :simple_content_access_status],
-                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible, :status]
+                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible, :status],
                          },
                          :resource_type => 'Katello::Subscription'
     end
@@ -365,31 +367,31 @@ module Katello
     def sync_plan_permissions
       @plugin.permission :view_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:index, :show, :add_products, :remove_products, :available_products, :auto_complete_search]
+                           'katello/api/v2/sync_plans' => [:index, :show, :add_products, :remove_products, :available_products, :auto_complete_search],
                          },
                          :resource_type => 'Katello::SyncPlan',
                          :finder_scope => :readable
       @plugin.permission :create_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:create]
+                           'katello/api/v2/sync_plans' => [:create],
                          },
                          :resource_type => 'Katello::SyncPlan',
                          :finder_scope => :editable
       @plugin.permission :edit_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:update]
+                           'katello/api/v2/sync_plans' => [:update],
                          },
                          :resource_type => 'Katello::SyncPlan',
                          :finder_scope => :editable
       @plugin.permission :destroy_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:destroy]
+                           'katello/api/v2/sync_plans' => [:destroy],
                          },
                          :resource_type => 'Katello::SyncPlan',
                          :finder_scope => :deletable
       @plugin.permission :sync_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:sync]
+                           'katello/api/v2/sync_plans' => [:sync],
                          },
                          :resource_type => 'Katello::SyncPlan',
                          :finder_scope => :syncable
@@ -398,27 +400,27 @@ module Katello
     def alternate_content_source_permissions
       @plugin.permission :view_alternate_content_sources,
                          {
-                           'katello/api/v2/alternate_content_sources' => [:index, :show, :auto_complete_search]
+                           'katello/api/v2/alternate_content_sources' => [:index, :show, :auto_complete_search],
                          },
                          :resource_type => 'Katello::AlternateContentSource',
                          :finder_scope => :readable
       @plugin.permission :create_alternate_content_sources,
                          {
-                           'katello/api/v2/alternate_content_sources' => [:create]
+                           'katello/api/v2/alternate_content_sources' => [:create],
                          },
                          :resource_type => 'Katello::AlternateContentSource',
                          :finder_scope => :editable
       @plugin.permission :edit_alternate_content_sources,
                          {
                            'katello/api/v2/alternate_content_sources' => [:update, :refresh],
-                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:refresh_alternate_content_sources, :refresh_all_alternate_content_sources]
+                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:refresh_alternate_content_sources, :refresh_all_alternate_content_sources],
                          },
                          :resource_type => 'Katello::AlternateContentSource',
                          :finder_scope => :editable
       @plugin.permission :destroy_alternate_content_sources,
                          {
                            'katello/api/v2/alternate_content_sources' => [:destroy],
-                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:destroy_alternate_content_sources]
+                           'katello/api/v2/alternate_content_sources_bulk_actions' => [:destroy_alternate_content_sources],
                          },
                          :resource_type => 'Katello::AlternateContentSource',
                          :finder_scope => :deletable
@@ -427,7 +429,7 @@ module Katello
     def user_permissions
       @plugin.permission :my_organizations,
                          {
-                           'katello/api/rhsm/candlepin_proxies' => [:list_owners]
+                           'katello/api/rhsm/candlepin_proxies' => [:list_owners],
                          },
                          :public => true
     end
@@ -435,7 +437,7 @@ module Katello
     def organization_permissions
       @plugin.permission :import_content,
                          {
-                           'katello/api/v2/content_imports' => [:library, :version, :index, :repository]
+                           'katello/api/v2/content_imports' => [:library, :version, :index, :repository],
                          },
                          :resource_type => 'Organization'
 
@@ -443,7 +445,7 @@ module Katello
                          {
                            'katello/api/v2/content_view_versions' => [:export, :repository],
                            'katello/api/v2/content_exports' => [:library, :version, :index, :repository],
-                           'katello/api/v2/content_export_incrementals' => [:library, :version, :repository]
+                           'katello/api/v2/content_export_incrementals' => [:library, :version, :repository],
                          },
                          :resource_type => 'Organization'
     end

data/lib/katello/permissions/host_permissions.rb

@@ -38,7 +38,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/hypervisors_heartbeat',
   'katello/api/rhsm/candlepin_proxies/upload_tracer_profile',
-  'hosts/change_content_source_data'
+  'hosts/change_content_source_data',
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
@@ -65,12 +65,12 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/remote_execution/new',
   'katello/remote_execution/create',
   'katello/api/v2/repository_sets/index',
-  'katello/api/v2/repository_sets/auto_complete_search'
+  'katello/api/v2/repository_sets/auto_complete_search',
 ]
 
 Foreman::AccessControl.permission(:destroy_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/destroy',
-  'katello/api/v2/hosts_bulk_actions/destroy_hosts'
+  'katello/api/v2/hosts_bulk_actions/destroy_hosts',
 ]
 
 Foreman::AccessControl.permission(:create_hosts).actions.concat [
@@ -78,5 +78,5 @@ Foreman::AccessControl.permission(:create_hosts).actions.concat [
   'katello/api/rhsm/candlepin_proxies/consumer_create',
   'katello/api/rhsm/candlepin_proxies/consumer_show',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
-  'katello/api/rhsm/candlepin_proxies/async_hypervisors_update'
+  'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
 ]

data/lib/katello/permissions/organization_permissions.rb

@@ -6,18 +6,18 @@ Foreman::AccessControl.permission(:view_organizations).actions.concat [
   'katello/api/v2/organizations/redhat_provider',
   'katello/api/v2/organizations/download_debug_certificate',
   'katello/api/v2/organizations/releases',
-  'katello/api/v2/tasks/index'
+  'katello/api/v2/tasks/index',
 ]
 
 Foreman::AccessControl.permission(:create_organizations).actions.concat [
-  'katello/api/v2/organizations/create'
+  'katello/api/v2/organizations/create',
 ]
 
 Foreman::AccessControl.permission(:edit_organizations).actions.concat [
   'katello/api/v2/organizations/update',
-  'katello/api/v2/organizations/cdn_configuration'
+  'katello/api/v2/organizations/cdn_configuration',
 ]
 
 Foreman::AccessControl.permission(:destroy_organizations).actions.concat [
-  'katello/api/v2/organizations/destroy'
+  'katello/api/v2/organizations/destroy',
 ]

data/lib/katello/permissions/registry_permissions.rb

@@ -13,5 +13,5 @@ Foreman::AccessControl.permission(:create_personal_access_tokens).actions.concat
   'katello/api/registry/registry_proxies/check_blob',
   'katello/api/registry/registry_proxies/start_upload_blob',
   'katello/api/registry/registry_proxies/upload_blob',
-  'katello/api/registry/registry_proxies/finish_upload_blob'
+  'katello/api/registry/registry_proxies/finish_upload_blob',
 ]

data/lib/katello/permissions/roles_permissions.rb

@@ -1,5 +1,5 @@
 require 'katello/plugin.rb'
 
 Foreman::AccessControl.permission(:edit_roles).actions.concat [
-  'katello/auto_complete_search/auto_complete_search'
+  'katello/auto_complete_search/auto_complete_search',
 ]

data/lib/katello/permissions/user_permissions.rb

@@ -1,5 +1,5 @@
 require 'katello/plugin.rb'
 
 Foreman::AccessControl.permission(:my_account).actions << [
-  'katello/api/v2/tasks/show'
+  'katello/api/v2/tasks/show',
 ]

data/lib/katello/plugin.rb

@@ -1,10 +1,9 @@
 require 'katello/permission_creator'
 require 'katello/repository_types'
-require 'katello/host_status_manager'
 # rubocop:disable Metrics/BlockLength
 
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 3.11'
+  requires_foreman '>= 3.13'
   register_gettext
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
@@ -220,7 +219,7 @@ Foreman::Plugin.register :katello do
   apipie_ignored_controllers %w(::Api::V2::OrganizationsController)
   ApipieDSL.configuration.dsl_classes_matchers.concat [
     "#{Katello::Engine.root}/app/models/katello/**/*.rb",
-    "#{Katello::Engine.root}/app/lib/actions/**/*.rb"
+    "#{Katello::Engine.root}/app/lib/actions/**/*.rb",
   ]
 
   parameter_filter ::Host::Managed, :host_collection_ids => [],
@@ -344,7 +343,7 @@ Foreman::Plugin.register :katello do
         class: 'HttpProxy',
         scope: 'all',
         value_method: 'name',
-        text_method: 'name_and_url'
+        text_method: 'name_and_url',
       }]
       download_policies = proc { hashify_parameters(::Katello::RootRepository::DOWNLOAD_POLICIES) }
       proxy_download_policies = proc { hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES) }
@@ -363,7 +362,7 @@ Foreman::Plugin.register :katello do
         type: :boolean,
         default: false,
         full_name: N_('Allow multiple content views'),
-        description: N_("Allow a host to be assigned to multiple content view environments with 'subscription-manager register --environments' or 'subscription-manager environments --set'.") # TODO: update this description when AKs support this setting as well
+        description: N_("Allow hosts or activation keys to be associated with multiple content view environments")
 
       setting 'content_default_http_proxy',
         type: :string,
@@ -654,7 +653,7 @@ Foreman::Plugin.register :katello do
 
       setting 'distribute_archived_cvv',
         type: :boolean,
-        default: true,
+        default: false,
         full_name: N_('Distribute archived content view versions'),
         description: N_("If this is enabled, repositories of content view versions without environments (\"archived\") will be distributed at '/pulp/content/<organization>/content_views/<content view>/X.Y/...'.")
 
@@ -669,6 +668,13 @@ Foreman::Plugin.register :katello do
         default: false,
         full_name: N_('Hide Reclaim Space Warning'),
         description: N_('If this is enabled, the Smart Proxy page will suppress the warning message about reclaiming space.')
+
+      setting 'deb_enable_structured_apt',
+        type: :boolean,
+        default: false,
+        full_name: N_('Enable structured APT for deb content'),
+        description: N_("If set, newly created APT repos in Katello will use the same repo structure as the remote repos they are synchronized from. " \
+                        "You may migrate existing APT repos to match the setting, by running 'foreman-rake katello:migrate_structure_content_for_deb'.")
     end
   end
 
@@ -697,7 +703,7 @@ Foreman::Plugin.register :katello do
   tests_to_skip("AccessPermissionsTest" => [
                   'foreman_tasks/api/tasks/callback should have a permission that grants access',
                   'bastion/bastion/index should have a permission that grants access',
-                  'bastion/bastion/index_ie should have a permission that grants access'
+                  'bastion/bastion/index_ie should have a permission that grants access',
                 ])
 
   add_controller_action_scope('HostsController', :index) do |base_scope|
@@ -773,7 +779,7 @@ Foreman::Plugin.register :katello do
     'bastion_katello/bastion_katello.css',
     'bastion_katello/bastion_katello.js',
     'katello/sync_management',
-    'katello/common'
+    'katello/common',
   ]
 
   precompile.concat(javascripts)

data/lib/katello/repository_types/docker.rb

@@ -27,10 +27,12 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
                :priority => 1,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
                :removable => true,
-               :uploadable => true
+               :uploadable => true,
+               :primary_content => true
   content_type Katello::DockerManifestList,
                :priority => 2,
-               :pulp3_service_class => ::Katello::Pulp3::DockerManifestList
+               :pulp3_service_class => ::Katello::Pulp3::DockerManifestList,
+               :primary_content => true
   content_type Katello::DockerTag,
                :priority => 3,
                :pulp3_service_class => ::Katello::Pulp3::DockerTag,