katello 3.18.0.rc2.1 → 4.0.0.rc2

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

@@ -4,14 +4,12 @@ module Actions
       class EnvironmentCreate < Actions::Base
         def plan(content_view_environment)
           content_view_environment.save!
-          if ::SETTINGS[:katello][:use_cp]
-            content_view = content_view_environment.content_view
-            plan_action(Candlepin::Environment::Create,
-                        organization_label: content_view.organization.label,
-                        cp_id:              content_view_environment.cp_id,
-                        name:               content_view_environment.label,
-                        description:        content_view.description)
-          end
+          content_view = content_view_environment.content_view
+          plan_action(Candlepin::Environment::Create,
+                      organization_label: content_view.organization.label,
+                      cp_id:              content_view_environment.cp_id,
+                      name:               content_view_environment.label,
+                      description:        content_view.description)
         end
 
         def humanized_name

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

@@ -71,7 +71,7 @@ module Actions
         private
 
         def sync_proxies?(environment)
-          Setting[:foreman_proxy_content_auto_sync] && ::SmartProxy.sync_needed?(environment)
+          ::SmartProxy.sync_needed?(environment)
         end
 
         def repos_to_delete(version, environment)

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

@@ -6,7 +6,7 @@ module Actions
         include ::Katello::ContentViewHelper
         attr_accessor :version
         # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
-        def plan(content_view, description = "", options = {importing: false})
+        def plan(content_view, description = "", options = {importing: false}) # rubocop:disable Metrics/PerceivedComplexity
           action_subject(content_view)
 
           content_view.check_ready_to_publish!(importing: options[:importing])
@@ -137,7 +137,7 @@ module Actions
           history.save!
           environment = ::Katello::KTEnvironment.find(input[:environment_id])
           view = ::Katello::ContentView.find(input[:content_view_id])
-          if SmartProxy.sync_needed?(environment) && Setting[:foreman_proxy_content_auto_sync] && !input[:skip_promotion]
+          if SmartProxy.sync_needed?(environment) && !input[:skip_promotion]
             ForemanTasks.async_task(ContentView::CapsuleSync,
                                     view,
                                     environment)

data/app/lib/actions/katello/content_view_version/import.rb

@@ -5,10 +5,11 @@ module Actions
         def plan(content_view, path:, metadata:)
           content_view.check_ready_to_import!
           unless SmartProxy.pulp_primary.pulp3_repository_type_support?(::Katello::Repository::YUM_TYPE)
-            fail ::Katello::HttpErrors::BadRequest, _("This API endpoint is only valid for Pulp 3 repositories.")
+            fail _("This action will become available after the Pulp 3 content migration")
           end
 
           ::Katello::Pulp3::ContentViewVersion::Import.check!(content_view: content_view, metadata: metadata, path: path)
+          ::Katello::Pulp3::ContentViewVersion::Import.reset_content_view_repositories_from_metadata!(content_view: content_view, metadata: metadata)
 
           major = metadata[:content_view_version][:major]
           minor = metadata[:content_view_version][:minor]

data/app/lib/actions/katello/content_view_version/import_library.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module ContentViewVersion
+      class ImportLibrary < Actions::EntryAction
+        def plan(organization, path:, metadata:)
+          action_subject(organization)
+          library_view = ::Katello::Pulp3::ContentViewVersion::Import.find_or_create_library_import_view(organization)
+          plan_action(::Actions::Katello::ContentViewVersion::Import, library_view, path: path, metadata: metadata)
+        end
+
+        def humanized_name
+          _("Import Default Content View")
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -19,7 +19,7 @@ module Actions
 
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
-        def plan(old_version, environments, options = {})
+        def plan(old_version, environments, options = {}) # rubocop:disable Metrics/CyclomaticComplexity
           dep_solve = options.fetch(:resolve_dependencies, true)
           description = options.fetch(:description, '')
           content = options.fetch(:content, {})
@@ -88,11 +88,15 @@ module Actions
                 end
               end
 
-              sequence do
-                new_puppet_environment = plan_action(Katello::ContentViewPuppetEnvironment::Clone, old_version,
-                                                   :new_version => new_content_view_version).new_puppet_environment
-                check_puppet_module_duplicates(content[:puppet_module_ids])
-                copy_action_outputs += copy_puppet_content(new_puppet_environment, content[:puppet_module_ids], old_version) unless content[:puppet_module_ids].blank?
+              if SmartProxy.pulp_primary.has_feature?(SmartProxy::PULP_FEATURE) && SETTINGS[:katello][:content_types][:puppet]
+                sequence do
+                  new_puppet_environment = plan_action(Katello::ContentViewPuppetEnvironment::Clone, old_version,
+                                                     :new_version => new_content_view_version).new_puppet_environment
+                  check_puppet_module_duplicates(content[:puppet_module_ids])
+                  unless content[:puppet_module_ids].blank?
+                    copy_action_outputs += copy_puppet_content(new_puppet_environment, content[:puppet_module_ids], old_version)
+                  end
+                end
               end
             end
 
@@ -201,7 +205,7 @@ module Actions
           end
         end
 
-        def run
+        def run # rubocop:disable Metrics/CyclomaticComplexity
           content = { ::Katello::Erratum::CONTENT_TYPE => [],
                       ::Katello::Rpm::CONTENT_TYPE => [],
                       ::Katello::ModuleStream::CONTENT_TYPE => [],
@@ -352,20 +356,36 @@ module Actions
         end
 
         def copy_yum_content(new_repo, dep_solve, package_ids, errata_ids)
+          return [] unless new_repo.content_type == ::Katello::Repository::YUM_TYPE
+
           copy_outputs = []
-          if new_repo.content_type == ::Katello::Repository::YUM_TYPE
-            unless errata_ids.blank?
+
+          unless errata_ids.blank?
+            content_present_in_this_repo = new_repo
+                                            .library_instance
+                                            .errata
+                                            .with_identifiers(errata_ids)
+                                            .exists?
+            if content_present_in_this_repo
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
                                           ::Katello::Erratum.with_identifiers(errata_ids),
                                           incremental_update: dep_solve).output
             end
+          end
 
-            unless package_ids.blank?
+          unless package_ids.blank?
+            content_present_in_this_repo = new_repo
+                                            .library_instance
+                                            .rpms
+                                            .with_identifiers(package_ids)
+                                            .exists?
+            if content_present_in_this_repo
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
                                           ::Katello::Rpm.with_identifiers(package_ids),
                                           incremental_update: dep_solve).output
             end
           end
+
           copy_outputs
         end
 

data/app/lib/actions/katello/host/erratum/applicable_errata_install.rb

@@ -15,7 +15,7 @@ module Actions
             if applicable_errata.empty?
               plan_self(:hostname => host.name, :skip => true)
             else
-              plan_action(Actions::Katello::Host::Erratum::Install, host, applicable_errata.pluck(:errata_id))
+              plan_action(Actions::Katello::Host::Erratum::Install, host, content: applicable_errata.pluck(:errata_id))
               plan_self(:hostname => host.name, :skip => false)
             end
           end

data/app/lib/actions/katello/host/erratum/install.rb

@@ -2,27 +2,13 @@ module Actions
   module Katello
     module Host
       module Erratum
-        class Install < Actions::EntryAction
-          include Helpers::Presenter
-
-          def plan(host, errata_ids)
-            Type! host, ::Host::Managed
+        class Install < Actions::Katello::AgentAction
+          def self.agent_message
+            :install_errata
+          end
 
-            action_subject(host, :hostname => host.name, :errata => errata_ids)
-            if Setting['erratum_install_batch_size'] && Setting['erratum_install_batch_size'] > 0
-              errata_ids.each_slice(Setting['erratum_install_batch_size']) do |errata_ids_batch|
-                plan_action(Pulp::Consumer::ContentInstall,
-                            consumer_uuid: host.content_facet.uuid,
-                            type:          'erratum',
-                            args:          errata_ids_batch)
-              end
-            else
-              plan_action(Pulp::Consumer::ContentInstall,
-                          consumer_uuid: host.content_facet.uuid,
-                          type:          'erratum',
-                          args:          errata_ids)
-            end
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_install
           end
 
           def humanized_name
@@ -34,20 +20,16 @@ module Actions
           end
 
           def humanized_input
-            [input[:errata].join(", ")] + super
+            [input[:content].join(", ")] + super
           end
 
           def resource_locks
             :link
           end
 
-          def presenter
-            Helpers::Presenter::Delegated.new(self, planned_actions(Pulp::Consumer::ContentInstall))
-          end
-
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Installation of errata requested: %{errata}") % {errata: input[:errata].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Installation of errata requested: %{errata}") % {errata: input[:content].join(", ")}).truncate(255))
           end
         end
       end

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

@@ -54,10 +54,10 @@ module Actions
 
         # Loads all resources needed for refreshing subscription facet
         def load_resources
-          @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).map { |org| [org.label, org] }.to_h
+          @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).index_by { |org| org.label }
 
           candlepin_data = ::Katello::Resources::Candlepin::Consumer.get_all_with_facts(hypervisors_field(:uuid))
-          @candlepin_attributes = candlepin_data.map { |consumer| [consumer[:uuid], consumer] }.to_h
+          @candlepin_attributes = candlepin_data.index_by { |consumer| consumer[:uuid] }
 
           @hosts = {}
           @hosts.merge!(load_hosts_by_uuid)
@@ -70,7 +70,7 @@ module Actions
           hosts_by_uuid.each do |host|
             validate_host_organization(host, host.organization.try(:id))
           end
-          hosts_by_uuid.map { |host| [host.subscription_facet.uuid, host] }.to_h
+          hosts_by_uuid.index_by { |host| host.subscription_facet.uuid }
         end
 
         def load_hosts_by_duplicate_name
@@ -82,7 +82,7 @@ module Actions
             validate_host_organization(host, duplicate_name_orgs[host.name].try(:id))
           end
 
-          hosts_by_dup_name.map { |host| [duplicate_names[host.name], host] }.to_h
+          hosts_by_dup_name.index_by { |host| duplicate_names[host.name] }
         end
 
         def create_missing_hosts

data/app/lib/actions/katello/host/package/install.rb

@@ -2,18 +2,13 @@ module Actions
   module Katello
     module Host
       module Package
-        class Install < Actions::EntryAction
-          include Helpers::Presenter
-
-          def plan(host, packages)
-            Type! host, ::Host::Managed
+        class Install < Actions::Katello::AgentAction
+          def self.agent_message
+            :install_package
+          end
 
-            action_subject(host, :hostname => host.name, :packages => packages)
-            plan_action(Pulp::Consumer::ContentInstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'rpm',
-                        args:          packages)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_install
           end
 
           def humanized_name
@@ -25,20 +20,12 @@ module Actions
           end
 
           def humanized_input
-            [input[:packages].join(", ")] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(self, planned_actions(Pulp::Consumer::ContentInstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [input[:content].join(", ")] + super
           end
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Installation of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Installation of package(s) requested: %{packages}") % {packages: input[:content].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package/remove.rb

@@ -2,16 +2,13 @@ module Actions
   module Katello
     module Host
       module Package
-        class Remove < Actions::EntryAction
-          include Helpers::Presenter
+        class Remove < Actions::Katello::AgentAction
+          def self.agent_message
+            :remove_package
+          end
 
-          def plan(host, packages)
-            action_subject(host, :hostname => host.name, :packages => packages)
-            plan_action(Pulp::Consumer::ContentUninstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'rpm',
-                        args:          packages)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_uninstall
           end
 
           def humanized_name
@@ -27,7 +24,7 @@ module Actions
           end
 
           def humanized_package_names
-            input[:packages].inject([]) do |result, package|
+            input[:content].inject([]) do |result, package|
               if package.is_a?(Hash)
                 new_name = package.include?(:name) ? package[:name] : ""
                 new_name += '-' + package[:version] if package.include?(:version)
@@ -40,18 +37,9 @@ module Actions
             end
           end
 
-          def presenter
-            Helpers::Presenter::Delegated.new(
-                self, planned_actions(Pulp::Consumer::ContentUninstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
-          end
-
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Removal of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Removal of package(s) requested: %{packages}") % {packages: input[:content].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package/update.rb

@@ -2,18 +2,13 @@ module Actions
   module Katello
     module Host
       module Package
-        class Update < Actions::EntryAction
-          include Helpers::Presenter
-
-          def plan(host, packages)
-            Type! host, ::Host::Managed
+        class Update < Actions::Katello::AgentAction
+          def self.agent_message
+            :update_package
+          end
 
-            action_subject(host, :hostname => host.name, :packages => packages)
-            plan_action(Pulp::Consumer::ContentUpdate,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'rpm',
-                        args:          packages)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_install
           end
 
           def humanized_name
@@ -25,15 +20,7 @@ module Actions
           end
 
           def humanized_input
-            [(input[:packages].present? && input[:packages].join(", ") || "all packages")] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(self, planned_actions(Pulp::Consumer::ContentUpdate))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [(input[:content].present? && input[:content].join(", ") || "all packages")] + super
           end
 
           def finalize
@@ -42,8 +29,8 @@ module Actions
           end
 
           def audit_comment
-            if input[:packages].present?
-              (_("Update of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255)
+            if input[:content].present?
+              (_("Update of package(s) requested: %{packages}") % {packages: input[:content].join(", ")}).truncate(255)
             else
               _("Update of all packages requested")
             end

data/app/lib/actions/katello/host/package_group/install.rb

@@ -2,18 +2,13 @@ module Actions
   module Katello
     module Host
       module PackageGroup
-        class Install < Actions::EntryAction
-          include Helpers::Presenter
-
-          def plan(host, groups)
-            Type! host, ::Host::Managed
+        class Install < Actions::Katello::AgentAction
+          def self.agent_message
+            :install_package_group
+          end
 
-            action_subject(host, :groups => groups)
-            plan_action(Pulp::Consumer::ContentInstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'package_group',
-                        args:          groups)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_install
           end
 
           def humanized_name
@@ -21,20 +16,12 @@ module Actions
           end
 
           def humanized_input
-            [input[:groups].join(", ")] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(self, planned_actions(Pulp::Consumer::ContentInstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [input[:content].join(", ")] + super
           end
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Installation of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Installation of package group(s) requested: %{groups}") % {groups: input[:content].join(", ")}).truncate(255))
           end
         end
       end