katello 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3942a71eb36eb3e5c9e6adcf139e30a2443a038eea11c417e55c6b590580465f
-  data.tar.gz: f59fa795ac9c2298450020e4c8f90409691374acc1f09e1c49a88e661d06cdd6
+  metadata.gz: 336a4ba95971459cc367612026947e16d536f4002aa4edbbf1ef2f5c75fc8d79
+  data.tar.gz: bf25590898a3e0485037acb025c7d654c3a98dce1dfb2830f85db8923eb78bdd
 SHA512:
-  metadata.gz: ff801d6c4540553020d70162d030def3a7782771f58fe8e85a81def49dd1abdb4abeab3b039ce56a2741636e745bba0887e0713ae534809e952ab0fc0482ba23
-  data.tar.gz: 4920f4ab7232331cc2d79a56f05625811a71f334e8909bab61a7d74cbbb8fbf345a9394a888bf44ca94dac9ae17dd4f53a069f6a7fd822926377dd8b9dc1c6ed
+  metadata.gz: 19244df2d07a33451ae52bf787b7cd5d173db7647a90b88535077e27266a14814315d7b31f124c66cad14a41eb27bdbb8e78a2fe06b900b3f931f833b89b89c6
+  data.tar.gz: 753d1c2598e96cdf3ce57c79abe0f997733ea296c29f5ccedafd0502530046a727be430ae87b3d4b3030415f66c9d7801f8222dca6e388c576ca6ad46766cd9b

data/app/assets/stylesheets/katello/katello.scss

@@ -163,78 +163,6 @@ input:focus {
   @extend .status_exclamation_icon;
 }
 
-/* BUTTONS */
-input[type='submit'], button, .button {
-  font-size: 10px;
-  display: inline-block;
-  vertical-align: bottom;
-  background: -moz-linear-gradient(top, #f9f9f9, #f0f0f0, #e5e5e5, #e9e9e9);
-  background: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), color-stop(0.9, #e5e5e5), to(#e9e9e9));
-  box-shadow: none;
-  border: 1px solid darken($stroke_color, 20%);
-  color: #221e1f;
-  cursor: pointer;
-  padding: 4px 8px;
-  border-radius: 5px;
-  text-shadow: 0 1px 0 rgba($white_color, 1);
-  min-height: 14px;
-  .nomargin {
-    margin: 0;
-  }
-  &:hover {
-    background: -moz-linear-gradient(top, $white_color, $white_color, #cfcfcf);
-    background: -webkit-gradient(linear, left top, left bottom, from($white_color), color-stop(0.6, $white_color), to(#cfcfcf));
-    box-shadow: 0 1px 2px rgba(0,0,0,0.5);
-    text-decoration: none;
-    color: black;
-  }
-  &:active {
-    background: -moz-linear-gradient(top, #c2c3c0, #e4e5e4);
-    background: -webkit-gradient(linear, left top, left bottom, from(#c2c3c0), to(#e4e5e4));
-    box-shadow: none;
-    text-decoration: none;
-  }
-  &:focus {
-    text-decoration: none;
-    color: #000;
-    border-width: 2px;
-  }
-  &.dialogbutton {
-    float: right;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.formbutton {
-    display: inline-block;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.actionlink {
-    margin: 40px 0 0;
-  }
-  &.disabled, &[disabled] {
-    cursor: default;
-    background: transparent;
-    opacity: 0.4;
-
-    &:hover {
-      background: transparent;
-      box-shadow: none;
-    }
-  }
-  &.iconbutton {
-    display: inline-block;
-  }
-  &.tiny {
-    padding: 4px;
-    margin: 0;
-    &:active, &:focus {
-      margin: 0;
-      padding: 3px;
-    }
-  }
-}
-
 table {
   border-collapse: collapse;
   border: 1px solid $stroke_color;

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

@@ -55,7 +55,7 @@ module Katello
 
     param_group :bulk_errata_ids
     def apply
-      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, @errata_ids)
+      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, content: @errata_ids)
       respond_for_async :resource => task
     end
 

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

@@ -33,14 +33,14 @@ module Katello
     def install
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Install, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Install, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, content: groups)
         respond_for_async :resource => task
       end
     end
@@ -51,7 +51,7 @@ module Katello
     def upgrade
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Update, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Update, @host, content: packages)
         respond_for_async :resource => task
       end
     end
@@ -59,7 +59,7 @@ module Katello
     api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def upgrade_all
-      task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
+      task = async_task(::Actions::Katello::Host::Package::Update, @host, content: [])
       respond_for_async :resource => task
     end
 
@@ -69,14 +69,14 @@ module Katello
     def remove
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, content: groups)
         respond_for_async :resource => task
       end
     end

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

@@ -365,7 +365,7 @@ module Katello
         if params[:action] == :update_content && params[:update_all]
           content = []
         end
-        task = async_task(::Actions::BulkAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content)
+        task = async_task(Actions::Katello::BulkAgentAction, PARAM_ACTIONS[params[:action]][params[:content_type]], @hosts, content: content)
         respond_for_async :resource => task
       end
     end

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

@@ -126,7 +126,7 @@ module Katello
     end
 
     def deprecated
-      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0, Please see /api/v2/simple_content_access")
+      ::Foreman::Deprecation.api_deprecation_warning("This will be removed in Katello 4.2, Please see /api/v2/simple_content_access")
     end
   end
 end

data/app/lib/actions/katello/agent/dispatch_history_presenter.rb

@@ -0,0 +1,64 @@
+module Actions
+  module Katello
+    module Agent
+      class DispatchHistoryPresenter
+        def initialize(dispatch_history, action_type)
+          @result = dispatch_history&.result&.with_indifferent_access
+          @action_type = action_type
+        end
+
+        def humanized_output
+          return if @result.empty?
+
+          result = package_result
+
+          if result[:message]
+            result[:message]
+          elsif result[:packages].any?
+            packages = result[:packages].map { |package| package[:qname] }
+            packages.sort.join("\n")
+          else
+            humanized_no_package
+          end
+        end
+
+        def error_messages
+          messages = []
+          @result.each_value do |result|
+            if !result[:succeeded] && result.dig(:details, :message)
+              messages << result[:details][:message]
+            end
+          end
+          messages
+        end
+
+        private
+
+        def package_result
+          result = { packages: [] }
+
+          @result.each_value do |v|
+            if v[:succeeded]
+              result[:packages].concat(v[:details][:resolved] + v[:details][:deps])
+              break
+            else
+              result[:message] = v[:details][:message]
+              break
+            end
+          end
+
+          result
+        end
+
+        def humanized_no_package
+          case @action_type
+          when :content_install
+            _("No new packages installed")
+          when :content_uninstall
+            _("No packages removed")
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/agent_action.rb

@@ -0,0 +1,107 @@
+module Actions
+  module Katello
+    class AgentAction < Actions::EntryAction
+      include Dynflow::Action::Timeouts
+      include Helpers::Presenter
+
+      def self.agent_message
+        fail NotImplementedError
+      end
+
+      def agent_action_type
+        nil
+      end
+
+      def plan(host, options)
+        action_subject(host, :hostname => host.name, :content => options[:content])
+
+        # if already dispatched by bulk action use the provided history ID
+        dispatch_history_id = options.dig(:dispatch_histories, host.id.to_s)
+
+        unless dispatch_history_id
+          histories = ::Katello::Agent::Dispatcher.dispatch(
+            self.class.agent_message,
+            [host.id],
+            content: options[:content]
+          )
+
+          dispatch_history_id = histories.first.id
+        end
+
+        plan_self(
+          host_id: host.id,
+          dispatch_history_id: dispatch_history_id
+        )
+      end
+
+      def run(event = nil)
+        case event
+        when nil
+          history = dispatch_history
+
+          if history.finished?
+            fail_on_errors
+            return
+          elsif history.accepted?
+            schedule_timeout(finish_timeout)
+          else
+            schedule_timeout(accept_timeout)
+          end
+
+          suspend do |suspended_action|
+            history.dynflow_execution_plan_id = suspended_action.execution_plan_id
+            history.dynflow_step_id = suspended_action.step_id
+            history.save!
+          end
+        when Dynflow::Action::Timeouts::Timeout
+          process_timeout
+        when 'accepted'
+          schedule_timeout(finish_timeout)
+          suspend
+        else
+          fail_on_errors
+        end
+      end
+
+      def accept_timeout
+        Setting['content_action_accept_timeout']
+      end
+
+      def finish_timeout
+        Setting['content_action_finish_timeout']
+      end
+
+      def process_timeout
+        history = dispatch_history
+
+        unless history.accepted?
+          fail _("Host did not respond within %s seconds. The task has been cancelled. Is katello-agent installed and goferd running on the Host?") % accept_timeout
+        end
+
+        unless history.finished?
+          fail _("Host did not finish content action in %s seconds.  The task has been cancelled.") % finish_timeout
+        end
+      end
+
+      def fail_on_errors
+        errors = presenter.error_messages
+
+        if errors.any?
+          fail errors.join("\n")
+        end
+      end
+
+      def presenter
+        Actions::Katello::Agent::DispatchHistoryPresenter.new(dispatch_history, agent_action_type)
+      end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Skip
+      end
+
+      def dispatch_history
+        ::Katello::Agent::DispatchHistory.find_by_id(input[:dispatch_history_id])
+      end
+    end
+  end
+end

data/app/lib/actions/katello/bulk_agent_action.rb

@@ -0,0 +1,21 @@
+module Actions
+  module Katello
+    class BulkAgentAction < Actions::BulkAction
+      def plan(agent_action, hosts, args)
+        host_ids = hosts.map(&:id)
+        dispatch_args = {
+          content: args[:content]
+        }
+        histories = ::Katello::Agent::Dispatcher.dispatch(agent_action.agent_message, host_ids, dispatch_args)
+
+        grouped_histories = {}
+        histories.each { |h| grouped_histories[h.host_id] = h.id }
+        options = {
+          dispatch_histories: grouped_histories,
+          content: args[:content]
+        }
+        super(agent_action, hosts, options)
+      end
+    end
+  end
+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/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