katello 3.9.1 → 3.10.0.rc1

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

@@ -11,6 +11,7 @@ module Actions
                         consumer_uuid: host.content_facet.uuid,
                         type:          'package_group',
                         args:          groups)
+            plan_self(:host_id => host.id)
           end
 
           def humanized_name
@@ -29,6 +30,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 group(s) requested: %{groups}") % {groups: input[:groups].join(", ")})
+          end
         end
       end
     end

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Host
       class RecalculateErrataStatus < Actions::Base
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def run
           ::Host.unscoped.find_each do |host|
             begin

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Host
       class RemoveSubscriptions < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(host, pools_with_quantities_params)
           action_subject(host)
           pool_ids = []

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

@@ -5,6 +5,7 @@ module Actions
         middleware.use ::Actions::Middleware::RemoteAction
 
         def plan(host, consumer_params = nil)
+          input[:hostname] = host.name
           action_subject host
           sequence do
             host.content_facet.save! if host.content_facet

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Host
       class UpdateContentOverrides < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(host, content_override_params, prune_invalid_content_overrides = true)
           action_subject(host)
           fail _("This Host is not currently registered with subscription-manager.") unless host.subscription_facet

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Host
       class UploadPackageProfile < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(host, profile_string)
           action_subject host
 
@@ -29,28 +27,31 @@ module Actions
           Dynflow::Action::Rescue::Skip
         end
 
-        def run
-          profile = JSON.parse(input[:profile_string])
-          #free the huge string from the memory
-          input[:profile_string] = 'TRIMMED'.freeze
-
-          host = ::Host.find_by(:id => input[:host_id])
+        def self.upload(host_id, profile)
+          host = ::Host.find_by(:id => host_id)
           if host.nil?
-            Rails.logger.warn("Host with ID %s not found, continuing" % input[:host_id])
+            Rails.logger.warn("Host with ID %s not found, continuing" % host_id)
           elsif host.content_facet.nil? || host.content_facet.uuid.nil?
-            Rails.logger.warn("Host with ID %s has no content facet, continuing" % input[:host_id])
+            Rails.logger.warn("Host with ID %s has no content facet, continuing" % host_id)
           else
             begin
               ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_package_profile(profile)
               simple_packages = profile.map { |item| ::Katello::Pulp::SimplePackage.new(item) }
               host.import_package_profile(simple_packages)
             rescue RestClient::ResourceNotFound
-              Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % input[:host_id])
+              Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host_id)
             rescue ActiveRecord::InvalidForeignKey # this happens if the host gets deleted in between the "find_by" and "import_package_profile"
-              Rails.logger.warn("Host installed package list with ID %s was not able to be written to the DB (host likely is deleted), continuing" % input[:host_id])
+              Rails.logger.warn("Host installed package list with ID %s was not able to be written to the DB (host likely is deleted), continuing" % host_id)
             end
           end
         end
+
+        def run
+          profile = JSON.parse(input[:profile_string])
+          #free the huge string from the memory
+          input[:profile_string] = 'TRIMMED'.freeze
+          UploadPackageProfile.upload(input[:host_id], profile)
+        end
       end
     end
   end

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

@@ -0,0 +1,70 @@
+module Actions
+  module Katello
+    module Host
+      class UploadProfiles < Actions::EntryAction
+        middleware.use Actions::Middleware::KeepCurrentUser
+
+        def plan(host, profile_string)
+          action_subject host
+
+          sequence do
+            plan_self(:host_id => host.id, :hostname => host.name, :profile_string => profile_string)
+            plan_action(GenerateApplicability, [host])
+          end
+        end
+
+        def humanized_name
+          if input.try(:[], :hostname)
+            _("Combined Profile Update for %s") % input[:hostname]
+          else
+            _('Combined Profile Update')
+          end
+        end
+
+        def resource_locks
+          :link
+        end
+
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
+
+        def import_module_streams(payload, host)
+          enabled_payload = payload.map do |profile|
+            profile.slice("name", "stream", "version", "context", "arch") if profile["status"] == "enabled"
+          end
+          enabled_payload.compact!
+
+          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_module_stream_profile(enabled_payload)
+          host.import_module_streams(payload)
+        rescue RestClient::ResourceNotFound
+          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % input[:host_id])
+        end
+
+        def run
+          profiles = JSON.parse(input[:profile_string])
+          #free the huge string from the memory
+          input[:profile_string] = 'TRIMMED'.freeze
+          host = ::Host.find_by(:id => input[:host_id])
+          if host.nil?
+            Rails.logger.warn("Host with ID %s not found, continuing" % input[:host_id])
+          elsif host.content_facet.nil? || host.content_facet.uuid.nil?
+            Rails.logger.warn("Host with ID %s has no content facet, continuing" % input[:host_id])
+          else
+            profiles.each do |profile|
+              payload = profile["profile"]
+              case profile["content_type"]
+              when "rpm"
+                UploadPackageProfile.upload(input[:host_id], payload)
+              when "enabled_repos"
+                host.import_enabled_repositories(payload)
+              else
+                import_module_streams(payload, host)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/product/reindex_subscriptions.rb

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Product
       class ReindexSubscriptions < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         input_format do
           param :id
         end

data/app/lib/actions/katello/product/repositories_certs_reset.rb

@@ -8,11 +8,11 @@ module Actions
           ssl_client_key_id = product.ssl_client_key_id
           # Plan Repository::Update only for repositories which have different certs key
           product.repositories.each do |repo|
-            if (repo.ssl_ca_cert_id != ssl_ca_cert_id ||
-                repo.ssl_client_cert_id != ssl_client_cert_id ||
-                repo.ssl_client_key_id != ssl_client_key_id)
+            if (repo.root.ssl_ca_cert_id != ssl_ca_cert_id ||
+                repo.root.ssl_client_cert_id != ssl_client_cert_id ||
+                repo.root.ssl_client_key_id != ssl_client_key_id)
               plan_action(::Actions::Katello::Repository::Update,
-                          repo,
+                          repo.root,
                           :ssl_ca_cert_id => ssl_ca_cert_id,
                           :ssl_client_cert_id => ssl_client_cert_id,
                           :ssl_client_key_id => ssl_client_key_id)

data/app/lib/actions/katello/product/repositories_gpg_reset.rb

@@ -6,9 +6,9 @@ module Actions
           key_id = product.gpg_key_id
           # Plan Repository::Update only for repositories which have different gpg key
           product.repositories.each do |repo|
-            if repo.gpg_key_id != key_id
+            if repo.root.gpg_key_id != key_id
               plan_action(::Actions::Katello::Repository::Update,
-                          repo,
+                          repo.root,
                           :gpg_key_id => key_id)
             end
           end

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

@@ -14,13 +14,25 @@ module Actions
           source_repo = ::Katello::Repository.find(input[:source_repo_id])
           target_repo = ::Katello::Repository.find(input[:target_repo_id])
 
-          srpms_match = srpms_match?(source_repo, target_repo)
-          rpms = rpms_match?(source_repo, target_repo)
-          errata = errata_match?(source_repo, target_repo)
-          package_groups = package_groups_match?(source_repo, target_repo)
-          distributions = distributions_match?(source_repo, target_repo)
+          if source_repo.content_type == ::Katello::Repository::YUM_TYPE
+            srpms_match = srpms_match?(source_repo, target_repo)
+            rpms = rpms_match?(source_repo, target_repo)
+            errata = errata_match?(source_repo, target_repo)
+            package_groups = package_groups_match?(source_repo, target_repo)
+            distributions = distributions_match?(source_repo, target_repo)
 
-          output[:matching_content] = srpms_match && rpms && errata && package_groups && distributions && target_repo.published?
+            output[:matching_content] = srpms_match && rpms && errata && package_groups && distributions && target_repo.published?
+          end
+
+          if source_repo.content_type == ::Katello::Repository::DEB_TYPE
+            debs = debs_match?(source_repo, target_repo)
+
+            output[:matching_content] = debs && target_repo.published?
+          end
+        end
+
+        def debs_match?(source_repo, target_repo)
+          source_repo.deb_ids.sort == target_repo.deb_ids.sort
         end
 
         def srpms_match?(source_repo, target_repo)

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

@@ -33,7 +33,7 @@ module Actions
             # Check for matching content before indexing happens, the content in pulp is
             # actually updated, but it is not reflected in the database yet.
             output = {}
-            if target_repo.environment && !options[:force_yum_metadata_regeneration]
+            if target_repo.environment
               output = plan_action(Katello::Repository::CheckMatchingContent,
                                    :source_repo_id => source_repo.id,
                                    :target_repo_id => target_repo.id).output

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

@@ -4,7 +4,7 @@ module Actions
       # Clones the contnet of the repository into the environment
       # effectively promotion the repository to the environment
       class CloneToEnvironment < Actions::Base
-        def plan(repository, environment, options = {})
+        def plan(repository, environment)
           clone = find_or_build_environment_clone(repository, environment)
 
           sequence do
@@ -20,11 +20,9 @@ module Actions
             end
 
             if repository.yum?
-              plan_action(Repository::CloneYumMetadata, repository, clone,
-                          :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
+              plan_action(Repository::CloneYumMetadata, repository, clone)
             elsif repository.deb?
-              plan_action(Repository::CloneDebContent, repository, clone, [], false,
-                          :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
+              plan_action(Repository::CloneDebContent, repository, clone, [], false)
             elsif repository.docker?
               plan_action(Repository::CloneDockerContent, repository, clone, [])
             elsif repository.ostree?

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

@@ -2,7 +2,7 @@ module Actions
   module Katello
     module Repository
       class CloneToVersion < Actions::Base
-        # allows accessing the build object from the superior action
+        # allows accessing the built object from the superior action
         attr_accessor :new_repository
 
         def plan(repositories, content_view_version, options = {})
@@ -20,8 +20,7 @@ module Actions
 
             if new_repository.link?
               fail "Cannot clone metadata if more than one repository" if repositories.count > 1
-              plan_action(Repository::CloneYumMetadata, repositories[0], new_repository,
-                                                            :force_yum_metadata_regeneration => true)
+              plan_action(Repository::CloneYumMetadata, repositories[0], new_repository)
             else
               clone_repository_content(repositories, new_repository, filters, incremental, rpm_filenames)
             end

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

@@ -4,7 +4,6 @@ module Actions
       class CloneYumContent < Actions::Base
         # rubocop:disable MethodLength
         # rubocop:disable Metrics/CyclomaticComplexity TODO: refactor to push everything into options hash
-        # rubocop:disable Metrics/PerceivedComplexity
         def plan(source_repo, target_repo, filters, options = {})
           generate_metadata = options.fetch(:generate_metadata, true)
           index_content = options.fetch(:index_content, true)
@@ -62,7 +61,7 @@ module Actions
             # Check for matching content before indexing happens, the content in pulp is
             # actually updated, but it is not reflected in the database yet.
             output = {}
-            if target_repo.environment && !options[:force_yum_metadata_regeneration]
+            if target_repo.environment
               output = plan_action(Katello::Repository::CheckMatchingContent,
                                    :source_repo_id => source_repo.id,
                                    :target_repo_id => target_repo.id).output

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

@@ -2,13 +2,13 @@ module Actions
   module Katello
     module Repository
       class CloneYumMetadata < Actions::Base
-        def plan(source_repo, target_repo, options = {})
+        def plan(source_repo, target_repo)
           sequence do
             # Check for matching content before indexing happens, the content in pulp is
             # actually updated, but it is not reflected in the database yet.
             output = {}
             if !target_repo.root.previous_changes.include?(:unprotected) &&
-                target_repo.environment && !options[:force_yum_metadata_regeneration]
+                target_repo.environment
               output = plan_action(Katello::Repository::CheckMatchingContent,
                                    :source_repo_id => source_repo.id,
                                    :target_repo_id => target_repo.id).output

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

@@ -2,7 +2,6 @@ module Actions
   module Katello
     module Repository
       class Create < Actions::EntryAction
-        # rubocop:disable MethodLength
         def plan(repository, clone = false, plan_create = false)
           repository.save!
           root = repository.root
@@ -10,38 +9,9 @@ module Actions
           action_subject(repository)
 
           org = repository.organization
-          path = repository.relative_path unless repository.puppet?
-
           create_action = plan_create ? Actions::Pulp::Repository::CreateInPlan : Actions::Pulp::Repository::Create
           sequence do
-            certs = repository.importer_connection_options
-            create_action = plan_action(create_action,
-                                        content_type: repository.content_type,
-                                        pulp_id: repository.pulp_id,
-                                        name: repository.name,
-                                        docker_upstream_name: repository.docker_upstream_name,
-                                        docker_tags_whitelist: root.docker_tags_whitelist,
-                                        feed: repository.url,
-                                        ssl_ca_cert: certs[:ssl_ca_cert],
-                                        ssl_client_cert: certs[:ssl_client_cert],
-                                        ssl_client_key: certs[:ssl_client_key],
-                                        unprotected: repository.unprotected,
-                                        checksum_type: repository.saved_checksum_type || repository.checksum_type,
-                                        path: path,
-                                        download_policy: repository.download_policy,
-                                        ostree_upstream_sync_depth: root.compute_ostree_upstream_sync_depth,
-                                        ostree_publish_depth: root.compute_ostree_upstream_sync_depth,
-                                        deb_releases: repository.deb_releases,
-                                        deb_components: repository.deb_components,
-                                        deb_architectures: repository.deb_architectures,
-                                        with_importer: true,
-                                        mirror_on_sync: repository.mirror_on_sync?,
-                                        ssl_validation: certs[:ssl_validation],
-                                        upstream_username: repository.upstream_username,
-                                        upstream_password: repository.upstream_password,
-                                        repo_registry_id: repository.container_repository_name,
-                                        proxy_host: repository.proxy_host_value,
-                                        ignorable_content: repository.ignorable_content)
+            create_action = plan_action(create_action, repository)
 
             return if create_action.error
 

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

@@ -3,7 +3,6 @@ module Actions
     module Repository
       class Destroy < Actions::EntryAction
         middleware.use ::Actions::Middleware::RemoteAction
-        middleware.use ::Actions::Middleware::KeepCurrentUser
 
         # options:
         #   skip_environment_update - defaults to false. skips updating the CP environment
@@ -26,7 +25,7 @@ module Actions
           sequence do
             delete_record(repository) if planned_destroy
             if repository.redhat?
-              handle_redhat_content(repository)
+              handle_redhat_content(repository) unless skip_environment_update
             else
               handle_custom_content(repository) unless skip_environment_update
             end

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Repository
       class Export < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         input_format do
           param :id, Integer
           param :export_result, Hash

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Repository
       class FetchPxeFiles < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         input_format do
           param :id, Integer
           param :capsule_id, Integer

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Repository
       class FilteredIndexContent < Actions::EntryAction
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         input_format do
           param :id, Integer
           param :filter

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

@@ -2,8 +2,6 @@ module Actions
   module Katello
     module Repository
       class FinishUpload < Actions::Base
-        middleware.use Actions::Middleware::KeepCurrentUser
-
         def plan(repository, options = {})
           dependency = options.fetch(:dependency, nil)
           generate_metadata = options.fetch(:generate_metadata, true)