katello 3.17.0.rc2.2 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd31f846e3b9c24a2a5881eb6f7c0a43e5cd3f7d05272d4dae99cb04dcc579e9
-  data.tar.gz: 75d49f944d6d534c49f1e65394ddf1cfee2d3b97aab81032389e2bc815505bd6
+  metadata.gz: 45f65da0c274cbc6976755a23d58f5eb77979dceea6cdcb118c1d6445f20b8ad
+  data.tar.gz: c5c8d2e9e58744b2389f9910daadc9656040d37364edfb12f48f5f1f06bf1743
 SHA512:
-  metadata.gz: 025b2f29030816a1195035f52c39cd3557e6d54c4ccd7adac54c5dff865a856a8754956bb79622fdc8d0e3ada7ebbce8c758c8f181076b1ceb4f23ba32b1a3a6
-  data.tar.gz: 11cf4ac7f7ee8b40f8138a52bc979685a57f7fe2b522a8a52d00399635e4e9f4e8c704d617e3739985feabf78a9848c4db507f31d8309269f43ede60c5938bf3
+  metadata.gz: 5ac6853c42e650e0a410e0f60b5c5a5f58d6d046142fb846fd39a37124a1a43222d0d22377881cf111c3a7984454ddc937f0fc0eeef6b5fb08fc3ac61630b80e
+  data.tar.gz: 0c87277e1d4a316b374c2f30b86154a607e4619ee5069c1157f0fe3aa07126e6645591e7eba301eca661b230892f66c7d0bc21c3446ea4fb262b1622c8c4865e

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

@@ -99,7 +99,7 @@ module Katello
                         :template => '../../../api/v2/content_view_version_export_histories/index')
     end
 
-    api :POST, "/content_view_versions/:id/export", N_("Export a content view version"), :deprecated => true
+    api :POST, "/content_view_versions/:id/export", N_("Export a content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :destination_server, String, :desc => N_("Destination Server name, required for Pulp3")
     param :export_to_iso, :bool, :desc => N_("Export to ISO format. Relevant only for Pulp 2 repositories"), :required => false
@@ -143,6 +143,14 @@ module Katello
       respond_for_async :resource => task
     end
 
+    api :POST, "/content_view_versions/import", N_("Import a content view version")
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => true
+    param :path, String, :desc => N_("Import path"), :required => true
+    def import
+      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path])
+      respond_for_async :resource => task
+    end
+
     api :DELETE, "/content_view_versions/:id", N_("Remove content view version")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def destroy

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

@@ -1,6 +1,11 @@
 module Katello
   class Api::V2::HostTracerController < Api::V2::ApiController
-    before_action :find_host, :only => :index
+    before_action :find_host
+
+    resource_description do
+      api_version 'v2'
+      api_base_url "/api"
+    end
 
     api :GET, "/hosts/:host_id/traces", N_("List services that need restarting on the host")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
@@ -9,43 +14,18 @@ module Katello
       respond_for_index(:collection => collection)
     end
 
-    api :PUT, "/traces/resolve", N_("Resolve Traces")
+    api :PUT, "/hosts/:host_id/traces/resolve", N_("Resolve Traces")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param :trace_ids, Array, :required => true, :desc => N_("Array of Trace IDs")
     def resolve
-      traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
-
-      traces.each do |trace|
-        if trace.reboot_required?
-          trace.helper = 'reboot'
-        end
-      end
-
-      traces_by_host_id = traces.group_by(&:host_id)
-      traces_by_helper = traces.group_by(&:helper)
-
-      composers = []
-
-      if traces_by_host_id.size < traces_by_helper.size
-        traces_by_host_id.each do |host_id, trace|
-          needed_traces = trace.map(&:helper).join(',')
-          joined_helpers = { :helper => needed_traces }
-          composers << JobInvocationComposer.for_feature(:katello_service_restart, [host_id], joined_helpers)
-        end
-      else
-        traces_by_helper.each do |helper, trace|
-          helpers = { :helper => helper }
-          composers << JobInvocationComposer.for_feature(:katello_service_restart, trace.map(&:host_id), helpers)
-        end
-      end
-
-      job_invocations = []
-
-      composers.each do |composer|
-        composer.trigger
-        job_invocations << composer.job_invocation
-      end
-
-      render json: job_invocations
+      traces = @host.host_traces.resolvable.where(id: params[:trace_ids])
+      fail HttpErrors::BadRequest, _("The requested traces were not found for this host") if traces.empty?
+
+      result = Katello::HostTraceManager.resolve_traces(traces)
+
+      task = ForemanTasks::Task.find(result.first.task_id)
+
+      respond_for_async(resource: task)
     end
 
     protected

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

@@ -1,4 +1,5 @@
 module Katello
+  # rubocop:disable Metrics/ClassLength
   class Api::V2::HostsBulkActionsController < Api::V2::ApiController
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::Api::V2::ContentOverridesController
@@ -6,7 +7,7 @@ module Katello
     before_action :find_host_collections, :only => [:bulk_add_host_collections, :bulk_remove_host_collections]
     before_action :find_environment, :only => [:environment_content_view]
     before_action :find_content_view, :only => [:environment_content_view]
-    before_action :find_editable_hosts, :except => [:destroy_hosts, :applicable_errata, :installable_errata]
+    before_action :find_editable_hosts, :except => [:destroy_hosts, :applicable_errata, :installable_errata, :resolve_traces]
     before_action :find_deletable_hosts, :only => [:destroy_hosts]
     before_action :find_readable_hosts, :only => [:applicable_errata, :installable_errata, :available_incremental_updates]
     before_action :find_errata, :only => [:available_incremental_updates]
@@ -236,6 +237,16 @@ module Katello
       respond_for_index(:collection => collection, :template => '../../../api/v2/host_tracer/index')
     end
 
+    api :PUT, "/hosts/bulk/resolve_traces", N_("Resolve traces for one or more hosts")
+    param_group :bulk_params
+    param :trace_ids, Array, :required => true, :desc => N_("Array of Trace IDs")
+    def resolve_traces
+      traces = Katello::HostTracer.resolvable.where(id: params[:trace_ids])
+      result = Katello::HostTraceManager.resolve_traces(traces)
+
+      render json: result
+    end
+
     api :POST, "/hosts/bulk/available_incremental_updates", N_("Given a set of hosts and errata, lists the content view versions" \
                                                                  " and environments that need updating.")
     param_group :bulk_params

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

@@ -3,8 +3,14 @@ module Katello
     module OrganizationsControllerExtensions
       extend ActiveSupport::Concern
       include ForemanTasks::Triggers
+      include Foreman::Controller::Flash
 
       module Overrides
+        def edit
+          @can_toggle_sca = Katello::UpstreamConnectionChecker.new(@taxonomy).can_connect?
+          super
+        end
+
         def destroy
           if @taxonomy.is_a?(Organization)
             begin
@@ -42,6 +48,23 @@ module Katello
         end
       end
 
+      def update
+        super # we run super first here so that flash messages won't be in a confusing order
+        return if params[:simple_content_access].nil?
+        sca_param = ::Foreman::Cast.to_bool(params[:simple_content_access])
+        if sca_param && !@taxonomy.simple_content_access?
+          # user has requested SCA enable
+          task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:id])
+          info "Enabling Simple Content Access for organization #{@taxonomy.name}.",
+            link: { text: "View progress on the Tasks page", href: "/foreman_tasks/tasks/#{task&.id}" }
+        elsif !sca_param && @taxonomy.simple_content_access?
+          # user has requested SCA disable
+          task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Disable, params[:id])
+          info "Disabling Simple Content Access for organization #{@taxonomy.name}.",
+            link: { text: "View progress on the Tasks page", href: "/foreman_tasks/tasks/#{task&.id}" }
+        end
+      end
+
       included do
         prepend Overrides
       end

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

@@ -2,7 +2,7 @@ module Actions
   module Katello
     module ContentView
       class Promote < Actions::EntryAction
-        def plan(version, environments, is_force = false, description = nil)
+        def plan(version, environments, is_force = false, description = nil, incremental_update = false)
           action_subject(version.content_view)
           version.check_ready_to_promote!(environments)
 
@@ -13,7 +13,7 @@ module Actions
           environments.each do |environment|
             sequence do
               plan_action(Katello::ContentViewVersion::BeforePromoteHook, :id => version.id)
-              plan_action(ContentView::PromoteToEnvironment, version, environment, description)
+              plan_action(ContentView::PromoteToEnvironment, version, environment, description, incremental_update)
               plan_action(Katello::ContentViewVersion::AfterPromoteHook, :id => version.id)
             end
           end

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

@@ -3,7 +3,7 @@ module Actions
   module Katello
     module ContentView
       class PromoteToEnvironment < Actions::EntryAction
-        def plan(version, environment, description)
+        def plan(version, environment, description, incremental_update = false)
           history = ::Katello::ContentViewHistory.create!(:content_view_version => version, :user => ::User.current.login,
                                                           :environment => environment, :task => self.task,
                                                           :status => ::Katello::ContentViewHistory::IN_PROGRESS,
@@ -29,8 +29,13 @@ module Actions
             plan_action(Candlepin::Environment::SetContent, version.content_view, environment, version.content_view.content_view_environment(environment))
             plan_action(Katello::Foreman::ContentUpdate, environment, version.content_view)
             plan_action(ContentView::ErrataMail, version.content_view, environment)
+
+            if incremental_update && sync_proxies?(environment)
+              plan_action(ContentView::CapsuleSync, version.content_view, environment)
+            end
+
             plan_self(history_id: history.id, environment_id: environment.id, user_id: ::User.current.id,
-                      environment_name: environment.name, content_view_id: version.content_view.id)
+                      environment_name: environment.name, content_view_id: version.content_view.id, incremental_update: incremental_update)
           end
         end
 
@@ -55,7 +60,7 @@ module Actions
           history.save!
           environment = ::Katello::KTEnvironment.find(input[:environment_id])
 
-          if ::SmartProxy.sync_needed?(environment) && Setting[:foreman_proxy_content_auto_sync]
+          if !input[:incremental_update] && sync_proxies?(environment)
             ForemanTasks.async_task(ContentView::CapsuleSync,
                                     ::Katello::ContentView.find(input[:content_view_id]),
                                     environment)
@@ -65,6 +70,10 @@ module Actions
 
         private
 
+        def sync_proxies?(environment)
+          Setting[:foreman_proxy_content_auto_sync] && ::SmartProxy.sync_needed?(environment)
+        end
+
         def repos_to_delete(version, environment)
           archived_library_instance_ids = version.archived_repos.collect { |archived| archived.library_instance_id }
           version.content_view.repos(environment).find_all do |repo|

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

@@ -8,7 +8,9 @@ module Actions
         # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
         def plan(content_view, description = "", options = {})
           action_subject(content_view)
-          content_view.check_ready_to_publish!
+          import_only = options.fetch(:import_only, false)
+          path = options[:path]
+          content_view.check_ready_to_publish! unless import_only
 
           if options[:repos_units].present?
             valid_labels_from_cv = content_view.repositories.map(&:label)
@@ -51,7 +53,11 @@ module Actions
 
             if separated_repo_map[:pulp3_yum].keys.flatten.present? &&
                 SmartProxy.pulp_primary.pulp3_support?(separated_repo_map[:pulp3_yum].keys.flatten.first)
-              plan_action(Repository::MultiCloneToVersion, separated_repo_map[:pulp3_yum], version)
+              if import_only
+                handle_import(version, path)
+              else
+                plan_action(Repository::MultiCloneToVersion, separated_repo_map[:pulp3_yum], version)
+              end
             end
 
             concurrence do
@@ -181,6 +187,16 @@ module Actions
             content_view.create_new_version
           end
         end
+
+        def handle_import(version, path)
+          plan_action(::Actions::Pulp3::Orchestration::ContentViewVersion::Import, version, path: path)
+          plan_action(::Actions::Pulp3::Orchestration::ContentViewVersion::CopyVersionUnitsToLibrary, version)
+          concurrence do
+            version.importable_repositories.pluck(:id).each do |id|
+              plan_action(Katello::Repository::IndexContent, id: id)
+            end
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,36 @@
+module Actions
+  module Katello
+    module ContentViewVersion
+      class Import < Actions::EntryAction
+        PULP_USER = 'pulp'.freeze
+
+        def plan(content_view, path:)
+          content_view.check_ready_to_import!
+          unless SmartProxy.pulp_primary.pulp3_repository_type_support?(::Katello::Repository::YUM_TYPE)
+            fail HttpErrors::BadRequest, _("This API endpoint is only valid for Pulp 3 repositories.")
+          end
+          ::Katello::Pulp3::ContentViewVersion::Import.check_permissions!(path)
+          metadata = ::Katello::Pulp3::ContentViewVersion::Import.metadata(path)
+          major = metadata[:content_view_version][:major]
+          minor = metadata[:content_view_version][:minor]
+
+          if ::Katello::ContentViewVersion.where(major: major, minor: minor, content_view: content_view).exists?
+            cvv_name = "#{content_view.name} #{major}.#{minor}"
+            fail _("Content View Version specified in the metadata - '%{name}' already exists. "\
+                    "If you wish to replace the existing version, delete %{name} and try again. " % { name: cvv_name })
+          end
+
+          plan_action(::Actions::Katello::ContentView::Publish, content_view, '',
+                        path: path,
+                        import_only: true,
+                        major: major,
+                        minor: minor)
+        end
+
+        def humanized_name
+          _("Import Content View Version")
+        end
+      end
+    end
+  end
+end

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

@@ -335,7 +335,7 @@ module Actions
         end
 
         def promote(new_version, environments)
-          plan_action(Katello::ContentView::Promote, new_version, environments, true)
+          plan_action(Katello::ContentView::Promote, new_version, environments, true, nil, true)
         end
 
         def copy_deb_content(new_repo, dep_solve, deb_ids)

data/app/lib/actions/katello/organization/create.rb

@@ -17,7 +17,7 @@ module Actions
                                       label:  organization.label,
                                       name: organization.name)
             end
-            plan_action(Environment::LibraryCreate, organization.library)
+            plan_action(Katello::Environment::LibraryCreate, organization.library)
           end
           if cp_create
             action_subject organization, label: cp_create.output[:response][:key]

data/app/lib/actions/katello/organization/simple_content_access/disable.rb

@@ -10,6 +10,14 @@ module Actions
           def humanized_name
             N_("Disable Simple Content Access")
           end
+
+          def task_success_notification
+            ::Katello::UINotifications::Subscriptions::SCADisableSuccess
+          end
+
+          def task_error_notification
+            ::Katello::UINotifications::Subscriptions::SCADisableError
+          end
         end
       end
     end

data/app/lib/actions/katello/organization/simple_content_access/enable.rb

@@ -10,6 +10,14 @@ module Actions
           def humanized_name
             N_("Enable Simple Content Access")
           end
+
+          def task_success_notification
+            ::Katello::UINotifications::Subscriptions::SCAEnableSuccess
+          end
+
+          def task_error_notification
+            ::Katello::UINotifications::Subscriptions::SCAEnableError
+          end
         end
       end
     end

data/app/lib/actions/katello/organization/simple_content_access/toggle.rb

@@ -4,6 +4,7 @@ module Actions
       module SimpleContentAccess
         class Toggle < Actions::AbstractAsyncTask
           middleware.use Actions::Middleware::PropagateCandlepinErrors
+          include Helpers::Notifications
 
           SIMPLE_CONTENT_ACCESS_DISABLED_VALUE = "entitlement".freeze
           SIMPLE_CONTENT_ACCESS_ENABLED_VALUE = "org_environment".freeze
@@ -12,7 +13,7 @@ module Actions
 
           def plan(organization_id)
             @organization = ::Organization.find(organization_id)
-
+            action_subject organization
             ::Katello::Resources::Candlepin::UpstreamConsumer.update(
               "#{consumer['apiUrl']}#{consumer['uuid']}",
               consumer['idCert']['cert'],
@@ -24,10 +25,23 @@ module Actions
             plan_action(::Actions::Katello::Organization::ManifestRefresh, organization)
           end
 
+          def failure_notification(plan)
+            task_error_notification.deliver!(
+              :subject => subject_organization,
+              :task => get_foreman_task(plan)
+            )
+          end
+
+          def success_notification(_plan)
+            task_success_notification.deliver!(
+              subject_organization
+            )
+          end
+
           private
 
           def consumer
-            @consumer ||= ::Katello::Resources::Candlepin::UpstreamCandlepinResource.upstream_consumer
+            @consumer ||= @organization.owner_details['upstreamConsumer']
           end
         end
       end

data/app/lib/actions/katello/repository/multi_clone_contents.rb

@@ -16,14 +16,16 @@ module Actions
                           solve_dependencies: solve_dependencies)
             end
 
-            extended_repo_mapping.each do |source_repos, dest_repo_map|
-              if generate_metadata
-                metadata_generate(source_repos, dest_repo_map[:dest_repo], dest_repo_map[:filters])
+            concurrence do
+              extended_repo_mapping.each do |source_repos, dest_repo_map|
+                if generate_metadata
+                  metadata_generate(source_repos, dest_repo_map[:dest_repo], dest_repo_map[:filters])
+                end
               end
-            end
 
-            extended_repo_mapping.values.each do |dest_repo_map|
-              plan_action(Katello::Repository::IndexContent, id: dest_repo_map[:dest_repo].id)
+              extended_repo_mapping.values.each do |dest_repo_map|
+                plan_action(Katello::Repository::IndexContent, id: dest_repo_map[:dest_repo].id)
+              end
             end
           end
         end

data/app/lib/actions/pulp3/abstract_async_task.rb

@@ -74,6 +74,7 @@ module Actions
 
       def cancel
         pulp_tasks.each { |task| task.cancel }
+        task_groups.each { |task_group| task_group.cancel }
       end
 
       def rescue_external_task(error)

data/app/lib/actions/pulp3/content_view_version/create_importer.rb

@@ -0,0 +1,20 @@
+module Actions
+  module Pulp3
+    module ContentViewVersion
+      class CreateImporter < Pulp3::Abstract
+        input_format do
+          param :smart_proxy_id, Integer
+          param :content_view_version_id, Integer
+          param :path, String
+        end
+
+        def run
+          cvv = ::Katello::ContentViewVersion.find(input[:content_view_version_id])
+          output[:importer_data] = ::Katello::Pulp3::ContentViewVersion::Import.new(smart_proxy: smart_proxy,
+                                                                            content_view_version: cvv,
+                                                                            path: input[:path]).create_importer
+        end
+      end
+    end
+  end
+end