katello 3.9.1 → 3.10.0.rc1

data/app/controllers/katello/application_controller.rb

@@ -3,8 +3,6 @@ require 'base64'
 
 module Katello
   class ApplicationController < ::ApplicationController
-    include ::HomeHelper
-
     layout 'katello/layouts/katello'
 
     clear_helpers

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

@@ -19,8 +19,11 @@ module Katello
         prepend Overrides
 
         def destroy
-          Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
-          process_success :success_redirect => hosts_path
+          if Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
+            process_success(:success_redirect => hosts_path)
+          else
+            process_error :redirect => :back, :error_msg => _("Failed to delete %{host}: %{errors}") % { :host => @host, :errors => @host.errors.full_messages }
+          end
         rescue StandardError => ex
           process_error(:object => @host, :error_msg => ex.message, :redirect => saved_redirect_url_or(send("#{controller_name}_url")))
         end

data/app/lib/actions/candlepin/consumer/attach_subscription.rb

@@ -2,8 +2,6 @@ module Actions
   module Candlepin
     module Consumer
       class AttachSubscription < Candlepin::Abstract
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         input_format do
           param :uuid, String
           param :pool_uuid, String

data/app/lib/actions/candlepin/consumer/remove_subscription.rb

@@ -2,8 +2,6 @@ module Actions
   module Candlepin
     module Consumer
       class RemoveSubscription < Candlepin::Abstract
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         input_format do
           param :uuid, String
           param :entitlement_id, String

data/app/lib/actions/katello/capsule_content/create_repos.rb

@@ -7,7 +7,7 @@ module Actions
           fail _("Action not allowed for the default capsule.") if capsule_content.default_capsule?
 
           repos_to_create(capsule_content, environment, content_view, repository).each do |repo|
-            create_repo_in_pulp(capsule_content, repo)
+            plan_action(Pulp::Repository::Create, repo, capsule_content.capsule)
           end
         end
 
@@ -26,30 +26,6 @@ module Actions
           repos
         end
 
-        def create_repo_in_pulp(capsule_content, repository)
-          ueber_cert = ::Cert::Certs.ueber_cert(repository.organization)
-          relative_path = repository_relative_path(repository, capsule_content)
-          checksum_type = repository.yum? ? repository.checksum_type : nil
-
-          plan_action(Pulp::Repository::Create,
-                      content_type: repository.content_type,
-                      pulp_id: repository.pulp_id,
-                      name: repository.name,
-                      feed: repository.docker? ? repository.docker_feed_url(capsule_content.capsule) : repository.full_path(nil, true),
-                      ssl_ca_cert: ::Cert::Certs.ca_cert,
-                      ssl_client_cert: ueber_cert[:cert],
-                      ssl_client_key: ueber_cert[:key],
-                      unprotected: repository.unprotected,
-                      checksum_type: checksum_type,
-                      path: relative_path,
-                      with_importer: true,
-                      docker_upstream_name: repository.docker? ? repository.container_repository_name : nil,
-                      docker_tags_whitelist: repository.docker? ? repository.docker_tags_whitelist : nil,
-                      repo_registry_id: repository.docker? ? repository.container_repository_name : nil,
-                      download_policy: repository.capsule_download_policy(capsule_content.capsule),
-                      capsule_id: capsule_content.capsule.id)
-        end
-
         def repository_relative_path(repository, capsule_content)
           if repository.is_a? ::Katello::ContentViewPuppetEnvironment
             repository.generate_puppet_path(capsule_content.capsule)

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -73,7 +73,7 @@ module Actions
                               capsule_id: capsule_content.capsule.id,
                               repo_pulp_id: repo_id)
                 end
-                pulp_options = { remove_missing: repo && ["puppet", "yum"].include?(repo.content_type) }
+                pulp_options = { remove_missing: repo && ["deb", "puppet", "yum"].include?(repo.content_type) }
                 pulp_options[:force_full] = true if skip_metadata_check && repo.content_type == "yum"
                 plan_action(Pulp::Consumer::SyncCapsule,
                             capsule_id: capsule_content.capsule.id,

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

@@ -2,9 +2,7 @@ module Actions
   module Katello
     module ContentView
       class Promote < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
-        def plan(version, environments, is_force = false, description = nil, options = {})
+        def plan(version, environments, is_force = false, description = nil)
           action_subject(version.content_view)
           version.check_ready_to_promote!(environments)
 
@@ -15,8 +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,
-                          :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
+              plan_action(ContentView::PromoteToEnvironment, version, environment, description)
               plan_action(Katello::ContentViewVersion::AfterPromoteHook, :id => version.id)
             end
           end

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

@@ -3,9 +3,7 @@ module Actions
   module Katello
     module ContentView
       class PromoteToEnvironment < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
-        def plan(version, environment, description, options = {})
+        def plan(version, environment, description)
           history = ::Katello::ContentViewHistory.create!(:content_view_version => version, :user => ::User.current.login,
                                                           :environment => environment, :task => self.task,
                                                           :status => ::Katello::ContentViewHistory::IN_PROGRESS,
@@ -17,8 +15,7 @@ module Actions
             concurrence do
               version.archived_repos.non_puppet.each do |repository|
                 sequence do
-                  plan_action(Repository::CloneToEnvironment, repository, environment,
-                              :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
+                  plan_action(Repository::CloneToEnvironment, repository, environment)
                 end
               end
 

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

@@ -3,8 +3,6 @@ module Actions
   module Katello
     module ContentView
       class Publish < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         # rubocop:disable MethodLength
         def plan(content_view, description = "", options = {})
           action_subject(content_view)
@@ -45,8 +43,7 @@ module Actions
               content_view.publish_repositories do |repositories|
                 sequence do
                   clone_to_version = plan_action(Repository::CloneToVersion, repositories, version, :repos_units => options[:repos_units])
-                  plan_action(Repository::CloneToEnvironment, clone_to_version.new_repository, library,
-                              :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
+                  plan_action(Repository::CloneToEnvironment, clone_to_version.new_repository, library)
                 end
               end
 

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

@@ -9,17 +9,8 @@ module Actions
           User.as_anonymous_admin { puppet_environment.save! }
 
           action_subject(puppet_environment)
-          plan_self
-
-          puppet_path = puppet_environment.generate_puppet_path(internal_capsule)
-
           sequence do
-            plan_action(Pulp::Repository::Create,
-                        content_type: ::Katello::Repository::PUPPET_TYPE,
-                        pulp_id: puppet_environment.pulp_id,
-                        name: puppet_environment.name,
-                        with_importer: true,
-                        path: puppet_path)
+            plan_self(:content_view_puppet_environment_id => puppet_environment.id)
 
             # when creating a clone, the following actions are handled by the
             # publish/promote process
@@ -29,6 +20,11 @@ module Actions
           end
         end
 
+        def run
+          puppet_environment = ::Katello::ContentViewPuppetEnvironment.find(input[:content_view_puppet_environment_id])
+          output[:response] = ::Katello::Pulp::Repository::Puppet.new(puppet_environment.nonpersisted_repository, SmartProxy.pulp_master).create
+        end
+
         def humanized_name
           _("Create")
         end

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module ContentViewVersion
       class Export < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(content_view_version, export_to_iso, since, iso_size)
           # assemble data to feed to Pulp
           content_view = ::Katello::ContentView.find(content_view_version.content_view_id)

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

@@ -7,6 +7,7 @@ module Actions
         HUMANIZED_TYPES = {
           ::Katello::Erratum::CONTENT_TYPE => "Errata",
           ::Katello::Rpm::CONTENT_TYPE => "Packages",
+          ::Katello::Deb::CONTENT_TYPE => "Deb Packages",
           ::Katello::PuppetModule::CONTENT_TYPE => "Puppet Modules"
         }.freeze
 
@@ -67,7 +68,8 @@ module Actions
           copy_output = []
           sequence do
             new_repo = plan_action(Repository::CloneToVersion, source_repos, new_version, :incremental => true).new_repository
-            copy_output = copy_yum_content(new_repo, dep_solve, content[:package_ids], content[:errata_ids])
+            copy_output += copy_deb_content(new_repo, dep_solve, content[:deb_ids])
+            copy_output += copy_yum_content(new_repo, dep_solve, content[:package_ids], content[:errata_ids])
 
             plan_action(Katello::Repository::MetadataGenerate, new_repo)
             plan_action(Katello::Repository::IndexContent, id: new_repo.id)
@@ -118,6 +120,7 @@ module Actions
         def run
           content = { ::Katello::Erratum::CONTENT_TYPE => [],
                       ::Katello::Rpm::CONTENT_TYPE => [],
+                      ::Katello::Deb::CONTENT_TYPE => [],
                       ::Katello::PuppetModule::CONTENT_TYPE => []}
 
           input[:copy_action_outputs].each do |copy_output|
@@ -130,6 +133,8 @@ module Actions
                   content[::Katello::Erratum::CONTENT_TYPE] << unit['id']
                 when ::Katello::Rpm::CONTENT_TYPE
                   content[::Katello::Rpm::CONTENT_TYPE] << ::Katello::Util::Package.build_nvra(unit)
+                when ::Katello::Deb::CONTENT_TYPE
+                  content[::Katello::Deb::CONTENT_TYPE] << "#{unit['name']}_#{unit['version']}_#{unit['architecture']}"
                 when ::Katello::PuppetModule::CONTENT_TYPE
                   content[::Katello::PuppetModule::CONTENT_TYPE] << "#{unit['author']}-#{unit['name']}-#{unit['version']}"
                 end
@@ -210,6 +215,19 @@ module Actions
           plan_action(Katello::ContentView::Promote, new_version, environments, true)
         end
 
+        def copy_deb_content(new_repo, dep_solve, deb_ids)
+          copy_outputs = []
+          if new_repo.content_type == ::Katello::Repository::DEB_TYPE
+            unless deb_ids.blank?
+              deb_uuids = ::Katello::Deb.with_identifiers(deb_ids).pluck(:uuid)
+              copy_outputs << plan_copy(Pulp::Repository::CopyDeb, new_repo.library_instance, new_repo,
+                                        { :filters => {:association => {'unit_id' => {'$in' => deb_uuids}}}},
+                                        :recursive => true, :resolve_dependencies => dep_solve).output
+            end
+          end
+          copy_outputs
+        end
+
         def copy_yum_content(new_repo, dep_solve, package_ids, errata_ids)
           copy_outputs = []
           if new_repo.content_type == ::Katello::Repository::YUM_TYPE

data/app/lib/actions/katello/environment/publish_repositories.rb

@@ -15,7 +15,8 @@ module Actions
           concurrence do
             repositories.each do |repository|
               sequence do
-                plan_action(::Actions::Katello::Repository::Update, repository, container_repository_name: repository.container_repository_name)
+                repository.set_container_repository_name
+                plan_action(::Actions::Katello::Repository::InstanceUpdate, repository)
                 plan_action(::Actions::Katello::Repository::CapsuleSync, repository)
               end
             end

data/app/lib/actions/katello/gpg_key/update.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module GpgKey
+      class Update < Actions::EntryAction
+        def plan(gpg_key, gpg_key_params)
+          action_subject gpg_key
+          gpg_key.update_attributes!(gpg_key_params)
+          gpg_key.repositories.each do |repository|
+            if repository.content_type == ::Katello::Repository::DEB_TYPE
+              plan_action(::Actions::Katello::Repository::RefreshRepository, repository)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Host
       class AttachSubscriptions < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(host, pools_with_quantities_params)
           action_subject(host)
           sequence do

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

@@ -22,6 +22,7 @@ module Actions
                           type:          'erratum',
                           args:          errata_ids)
             end
+            plan_self(:host_id => host.id)
           end
 
           def humanized_name
@@ -39,6 +40,11 @@ module Actions
           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(", ")})
+          end
         end
       end
     end

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Host
       class GenerateApplicability < Actions::Base
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(hosts, use_queue = true)
           uuids = hosts.map { |host| host.content_facet.try(:uuid) }.compact
           unless uuids.empty?

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

@@ -30,9 +30,9 @@ module Actions
           @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).map { |org| [org.label, org] }.to_h
           @hosts = {}
 
-          load_hosts_by_uuid
-          load_hosts_by_duplicate_name
-          create_missing_hosts
+          @hosts.merge!(load_hosts_by_uuid)
+          @hosts.merge!(load_hosts_by_duplicate_name)
+          @hosts.merge!(create_missing_hosts)
 
           candlepin_data = ::Katello::Resources::Candlepin::Consumer.get_all(@hosts.keys)
           @candlepin_attributes = candlepin_data.map { |consumer| [consumer[:uuid], consumer] }.to_h
@@ -40,7 +40,10 @@ module Actions
 
         def load_hosts_by_uuid
           hosts_by_uuid = ::Host.eager_load(:subscription_facet).where(katello_subscription_facets: { uuid: hypervisors_field(:uuid) })
-          @hosts.merge(hosts_by_uuid.map { |host| [host.subscription_facet.uuid, host] }.to_h)
+          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
         end
 
         def load_hosts_by_duplicate_name
@@ -52,16 +55,18 @@ module Actions
             validate_host_organization(host, duplicate_name_orgs[host.name].try(:id))
           end
 
-          @hosts.merge!(hosts_by_dup_name.map { |host| [duplicate_names[host.name], host] }.to_h)
+          hosts_by_dup_name.map { |host| [duplicate_names[host.name], host] }.to_h
         end
 
         def create_missing_hosts
           # remaining hypervisors
+          new_hypervisors = {}
           @hypervisors.each do |hypervisor|
             next if @hosts.key?(hypervisor[:uuid])
             duplicate_name, org = duplicate_name(hypervisor)
-            @hosts[hypervisor[:uuid]] = create_host_for_hypervisor(duplicate_name, org)
+            new_hypervisors[hypervisor[:uuid]] = create_host_for_hypervisor(duplicate_name, org)
           end
+          new_hypervisors
         end
 
         def generate_duplicates_list

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

@@ -13,6 +13,7 @@ module Actions
                         consumer_uuid: host.content_facet.uuid,
                         type:          'rpm',
                         args:          packages)
+            plan_self(:host_id => host.id)
           end
 
           def humanized_name
@@ -30,6 +31,11 @@ module Actions
           def rescue_strategy
             Dynflow::Action::Rescue::Skip
           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(", ")})
+          end
         end
       end
     end

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

@@ -11,6 +11,7 @@ module Actions
                         consumer_uuid: host.content_facet.uuid,
                         type:          'rpm',
                         args:          packages)
+            plan_self(:host_id => host.id)
           end
 
           def humanized_name
@@ -43,6 +44,11 @@ module Actions
           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(", ")})
+          end
         end
       end
     end

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

@@ -13,6 +13,7 @@ module Actions
                         consumer_uuid: host.content_facet.uuid,
                         type:          'rpm',
                         args:          packages)
+            plan_self(:host_id => host.id)
           end
 
           def humanized_name
@@ -20,7 +21,7 @@ module Actions
           end
 
           def humanized_input
-            [input[:packages].join(", ")] + super
+            [(input[:packages] && input[:packages].join(", ") || "all packages")] + super
           end
 
           def presenter
@@ -30,6 +31,11 @@ module Actions
           def rescue_strategy
             Dynflow::Action::Rescue::Skip
           end
+
+          def finalize
+            host = ::Host.find_by(:id => input[:host_id])
+            host.update(audit_comment: _("Update of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")})
+          end
         end
       end
     end

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

@@ -13,6 +13,7 @@ module Actions
                         consumer_uuid: host.content_facet.uuid,
                         type:          'package_group',
                         args:          groups)
+            plan_self(:host_id => host.id)
           end
 
           def humanized_name
@@ -30,6 +31,11 @@ module Actions
           def rescue_strategy
             Dynflow::Action::Rescue::Skip
           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(", ")})
+          end
         end
       end
     end