katello 3.3.2 → 3.4.0.rc1

data/app/lib/actions/candlepin/product/content_update.rb

@@ -9,11 +9,13 @@ module Actions
           param :label
           param :content_url
           param :gpg_key_url
+          param :owner
         end
 
         def run
           output[:response] = ::Katello::Resources::Candlepin::Content.
-              update(id: input[:content_id],
+              update(input[:owner],
+                     id: input[:content_id],
                      name: input[:name],
                      contentUrl: input[:content_url],
                      gpgUrl: input[:gpg_key_url],

data/app/lib/actions/candlepin/product/create.rb

@@ -6,13 +6,24 @@ module Actions
           param :name, String
           param :multiplier
           param :attributes
+          param :owner
         end
 
         def run
-          output[:response] = ::Katello::Resources::Candlepin::Product.create(:name => input[:name],
+          output[:response] = ::Katello::Resources::Candlepin::Product.create(input[:owner], :name => input[:name],
+                                                                              :id => unused_product_id,
                                                                               :multiplier => input[:multiplier],
                                                                               :attributes => input[:attributes])
         end
+
+        def unused_product_id
+          id = SecureRandom.random_number(999_999_999_999)
+          if ::Katello::Product.find_by(:cp_id => id)
+            unused_product_id
+          else
+            id
+          end
+        end
       end
     end
   end

data/app/lib/actions/candlepin/product/destroy.rb

@@ -4,10 +4,11 @@ module Actions
       class Destroy < Candlepin::Abstract
         input_format do
           param :cp_id
+          param :owner
         end
 
         def run
-          output[:response] = ::Katello::Resources::Candlepin::Product.destroy(input[:cp_id])
+          output[:response] = ::Katello::Resources::Candlepin::Product.destroy(input[:owner], input[:cp_id])
         end
       end
     end

data/app/lib/actions/candlepin/product/update.rb

@@ -5,19 +5,23 @@ module Actions
         def plan(product)
           product.deleted_content.each do |product_content|
             plan_action(::Actions::Candlepin::Product::ContentRemove,
+                        :owner => product.organization.label,
                         :product_id => product.cp_id,
                         :content_id => product_content.content.id)
             plan_action(::Actions::Candlepin::Product::ContentDestroy,
+                        :owner => product.organization.label,
                         :content_id => product_content.content.id)
           end
 
           product.added_content.each do |pc|
             content_create = plan_action(::Actions::Candlepin::Product::ContentCreate,
+                                         :owner => product.organization.label,
                                          :name => pc.content.name,
                                          :type => pc.content.type,
                                          :label => pc.content.label,
                                          :content_url => pc.content.contentUrl)
             plan_action(::Actions::Candlepin::Product::ContentAdd,
+                        :owner => product.organization.label,
                         :product_id => product.cp_id,
                         :content_id => content_create.output[:response][:id])
           end

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

@@ -43,7 +43,7 @@ module Actions
                       checksum_type: checksum_type,
                       path: relative_path,
                       with_importer: true,
-                      docker_upstream_name: repository.pulp_id,
+                      docker_upstream_name: repository.docker? ? repository.container_repository_name : nil,
                       download_policy: repository.capsule_download_policy(capsule_content.capsule),
                       capsule_id: capsule_content.capsule.id)
         end

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

@@ -4,14 +4,15 @@ module Actions
       class Promote < Actions::EntryAction
         middleware.use Actions::Middleware::KeepCurrentUser
 
-        def plan(version, environments, is_force = false, description = nil)
+        def plan(version, environments, is_force = false, description = nil, options = {})
           action_subject(version.content_view)
           version.check_ready_to_promote!(environments)
 
           fail ::Katello::HttpErrors::BadRequest, _("Cannot promote environment out of sequence. Use force to bypass restriction.") if !is_force && !version.promotable?(environments)
 
           environments.each do |environment|
-            plan_action(ContentView::PromoteToEnvironment, version, environment, description)
+            plan_action(ContentView::PromoteToEnvironment, version, environment, description,
+                        :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
           end
         end
       end

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

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

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

@@ -6,7 +6,7 @@ module Actions
         middleware.use Actions::Middleware::KeepCurrentUser
 
         # rubocop:disable MethodLength
-        def plan(content_view, description = "")
+        def plan(content_view, description = "", options = {})
           action_subject(content_view)
           content_view.check_ready_to_publish!
           version = content_view.create_new_version
@@ -26,7 +26,8 @@ module Actions
               content_view.publish_repositories do |repositories|
                 sequence do
                   clone_to_version = plan_action(Repository::CloneToVersion, repositories, version)
-                  plan_action(Repository::CloneToEnvironment, clone_to_version.new_repository, library)
+                  plan_action(Repository::CloneToEnvironment, clone_to_version.new_repository, library,
+                              :force_yum_metadata_regeneration => options[:force_yum_metadata_regeneration])
                 end
               end
 

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

@@ -7,7 +7,13 @@ module Actions
 
           destroy_env_content = !options.fetch(:skip_destroy_env_content, false)
           repos = destroy_env_content ? version.repositories : version.archived_repos
-          puppet_envs = destroy_env_content ? version.content_view_puppet_environments : [version.archive_puppet_environment]
+
+          puppet_envs = []
+          if destroy_env_content
+            puppet_envs = version.content_view_puppet_environments
+          elsif version.archive_puppet_environment
+            puppet_envs = [version.archive_puppet_environment]
+          end
 
           sequence do
             concurrence do

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

@@ -69,7 +69,7 @@ module Actions
             new_repo = plan_action(Repository::CloneToVersion, source_repos, new_version, true).new_repository
             copy_output = copy_yum_content(new_repo, dep_solve, content[:package_ids], content[:errata_ids])
 
-            plan_action(Katello::Repository::MetadataGenerate, new_repo, nil)
+            plan_action(Katello::Repository::MetadataGenerate, new_repo)
             plan_action(Katello::Repository::IndexContent, id: new_repo.id)
           end
           copy_output

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

@@ -0,0 +1,40 @@
+module Actions
+  module Katello
+    module ContentViewVersion
+      class RepublishRepositories < Actions::EntryAction
+        def plan(content_view_version)
+          action_subject(content_view_version.content_view)
+          plan_self(:version_id => content_view_version.id)
+
+          content_view_version.repositories.each do |repo|
+            plan_action(::Actions::Katello::Repository::MetadataGenerate, repo, :force => true)
+          end
+
+          content_view_version.content_view_puppet_environments.each do |repo|
+            plan_action(::Actions::Katello::Repository::MetadataGenerate, repo, :force => true)
+          end
+        end
+
+        def run
+          #dummy run phase to save input
+        end
+
+        def resource_locks
+          :link
+        end
+
+        def humanized_name
+          if input[:version_id]
+            version = ::Katello::ContentViewVersion.find_by(:id => input[:version_id])
+          end
+
+          if version
+            _("Republish Repositories of %{name} %{version}") % {:name => version.content_view.name, :version => version.version}
+          else
+            _("Republish Version Repositories")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -43,6 +43,7 @@ module Actions
         def destroy_host_artifacts(host)
           host.get_status(::Katello::ErrataStatus).destroy
           host.get_status(::Katello::SubscriptionStatus).destroy
+          host.get_status(::Katello::TraceStatus).destroy
           host.installed_packages.destroy_all
         end
 

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

@@ -9,10 +9,19 @@ module Actions
             Type! host, ::Host::Managed
 
             action_subject(host, :errata => errata_ids)
-            plan_action(Pulp::Consumer::ContentInstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'erratum',
-                        args:          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
           end
 
           def humanized_name

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

@@ -37,14 +37,15 @@ module Actions
           host ||= create_host_for_hypervisor(duplicate_name, organization)
           host.subscription_facet ||= ::Katello::Host::SubscriptionFacet.new
           host.subscription_facet.host_id = host.id
-          host.subscription_facet.update_from_consumer_attributes(hypervisor_json)
           host.subscription_facet.uuid = hypervisor_json[:uuid]
+          host.subscription_facet.import_database_attributes(host.subscription_facet.candlepin_consumer.consumer_attributes)
           host.subscription_facet.save!
           host.save!
         end
 
         def create_host_for_hypervisor(name, organization, location = nil)
-          location ||= Location.default_location
+          location ||= Location.unscoped.find_by_title(
+            Setting[:default_location_subscribed_hosts])
           host = ::Host::Managed.new(:name => name, :organization => organization,
                                      :location => location, :managed => false)
           host.save!

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

@@ -45,10 +45,12 @@ module Actions
         end
 
         def run
-          host = ::Host.find(input[:host_id])
-          unless input[:facts].blank?
-            ::Katello::Host::SubscriptionFacet.update_facts(host, input[:facts])
-            input[:facts] = 'TRIMMED'
+          User.as_anonymous_admin do
+            host = ::Host.find(input[:host_id])
+            unless input[:facts].blank?
+              ::Katello::Host::SubscriptionFacet.update_facts(host, input[:facts])
+              input[:facts] = 'TRIMMED'
+            end
           end
         end
 
@@ -69,6 +71,10 @@ module Actions
           host.refresh_global_status!
         end
 
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
+
         private
 
         def set_host_collections(host, activation_keys)

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

@@ -6,19 +6,21 @@ module Actions
 
         def plan(host, pools_with_quantities_params)
           action_subject(host)
-          pools_with_quantities = pools_with_quantities_params.map do |pool_with_quantity|
-            ::Katello::PoolWithQuantities.fetch(pool_with_quantity)
-          end
-          cp_consumer = host.subscription_facet.candlepin_consumer
-          entitlements = pools_with_quantities.map do |pool_with_quantities|
-            cp_consumer.filter_entitlements(pool_with_quantities.pool.cp_id, pool_with_quantities.quantities)
-          end
-
           pool_ids = []
-          entitlements.flatten.each do |entitlement|
-            pool_ids << entitlement['pool']['id']
-            plan_action(::Actions::Candlepin::Consumer::RemoveSubscription, :uuid => host.subscription_facet.uuid,
-                        :entitlement_id => entitlement['id'], :pool_id => entitlement['pool']['id'])
+          sequence do
+            pools_with_quantities = pools_with_quantities_params.map do |pool_with_quantity|
+              ::Katello::PoolWithQuantities.fetch(pool_with_quantity)
+            end
+            cp_consumer = host.subscription_facet.candlepin_consumer
+            entitlements = pools_with_quantities.map do |pool_with_quantities|
+              cp_consumer.filter_entitlements(pool_with_quantities.pool.cp_id, pool_with_quantities.quantities)
+            end
+
+            entitlements.flatten.each do |entitlement|
+              pool_ids << entitlement['pool']['id']
+              plan_action(::Actions::Candlepin::Consumer::RemoveSubscription, :uuid => host.subscription_facet.uuid,
+                          :entitlement_id => entitlement['id'], :pool_id => entitlement['pool']['id'])
+            end
           end
           plan_self(:host_id => host.id, :host_name => host.name, :pool_ids => pool_ids)
         end

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

@@ -12,11 +12,11 @@ module Actions
             host.content_facet.save! if host.content_facet
 
             if host.subscription_facet
-              if consumer_params
-                host.subscription_facet.update_from_consumer_attributes(consumer_params)
-              else
+              unless consumer_params
                 consumer_params = host.subscription_facet.consumer_attributes
               end
+
+              host.subscription_facet.update_from_consumer_attributes(consumer_params)
               host.subscription_facet.save!
               plan_action(::Actions::Candlepin::Consumer::Update, host.subscription_facet.uuid, consumer_params)
             end
@@ -28,10 +28,12 @@ module Actions
         end
 
         def run
-          host = ::Host.find(input[:host_id])
-          unless input[:facts].blank?
-            ::Katello::Host::SubscriptionFacet.update_facts(host, input[:facts])
-            input[:facts] = 'TRIMMED'
+          User.as_anonymous_admin do
+            host = ::Host.find(input[:host_id])
+            unless input[:facts].blank?
+              ::Katello::Host::SubscriptionFacet.update_facts(host, input[:facts])
+              input[:facts] = 'TRIMMED'
+            end
           end
         end
 

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

@@ -0,0 +1,43 @@
+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)
+          plan_self(:host_id => host.id, :host_name => host.name, :content_overrides => content_override_params,
+                    :prune_invalid_content_overrides => prune_invalid_content_overrides)
+        end
+
+        def run
+          content_overrides = input[:content_overrides].map do |override|
+            ::Katello::ContentOverride.fetch(override)
+          end
+          prune_invalid_content_overrides = input[:prune_invalid_content_overrides]
+          host = ::Host.find(input[:host_id])
+          if prune_invalid_content_overrides
+            content_overrides = content_overrides.select do |override|
+              host.valid_content_override_label?(override.content_label)
+            end
+          end
+
+          ::Katello::Resources::Candlepin::Consumer.update_content_overrides(host.subscription_facet.uuid,
+                                                                            content_overrides.map(&:to_entitlement_hash))
+        end
+
+        def humanized_name
+          if input.try(:[], :host_name)
+            _('Update Content Overrides to %s') % (input[:host_name] || _('Unknown'))
+          else
+            _('Update Content Overrides')
+          end
+        end
+
+        def resource_locks
+          :link
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,6 @@ module Actions
             destroy_contents(organization)
             plan_self
             plan_action(Candlepin::Owner::Destroy, label: organization.label) if ::SETTINGS[:katello][:use_cp]
-            plan_action(Candlepin::Product::DeleteUnused, organization)
           end
         end
 
@@ -98,6 +97,7 @@ module Actions
           content_ids = repositories.map(&:content_id).uniq
           content_ids.each do |content_id|
             plan_action(Candlepin::Product::ContentDestroy,
+                        owner: organization.label,
                         content_id: content_id)
           end
         end

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

@@ -12,6 +12,9 @@ module Actions
           upstream = details['upstreamConsumer'].blank? ? {} : details['upstreamConsumer']
 
           sequence do
+            plan_action(Candlepin::Owner::UpstreamRegenerateCertificates,
+                        :organization_id => organization.id,
+                        :upstream => upstream)
             plan_action(Candlepin::Owner::UpstreamUpdate,
                         :organization_id => organization.id,
                         :upstream => upstream)

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

@@ -8,12 +8,14 @@ module Actions
           sequence do
             if repository.content.nil?
               content_create = plan_action(Candlepin::Product::ContentCreate,
+                                           owner:       repository.product.organization.label,
                                            name:        repository.name,
                                            type:        repository.content_type,
                                            label:       repository.custom_content_label,
                                            content_url: content_url(repository))
               content_id = content_create.output[:response][:id]
               plan_action(Candlepin::Product::ContentAdd,
+                                    owner: repository.product.organization.label,
                                     product_id: repository.product.cp_id,
                                     content_id: content_id)
 
@@ -23,6 +25,7 @@ module Actions
 
             if repository.gpg_key
               plan_action(Candlepin::Product::ContentUpdate,
+                          owner:       repository.organization.label,
                           content_id:  content_id,
                           name:        repository.name,
                           type:        repository.content_type,