katello 3.3.2 → 3.4.0.rc1

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

@@ -23,13 +23,27 @@ module Katello
 
     api :PUT, "/products/bulk/sync", N_("Sync one or more products")
     param :ids, Array, :desc => N_("List of product ids"), :required => true
+    param :skip_metadata_check, :bool, :desc => N_("Force sync even if no upstream changes are detected. Non-yum repositories are skipped."), :required => false
+    param :validate_contents, :bool, :desc => N_("Force a sync and validate the checksums of all content. Non-yum repositories (or those with \
+                                                     On Demand download policy) are skipped."), :required => false
     def sync_products
+      skip_metadata_check = ::Foreman::Cast.to_bool(params[:skip_metadata_check])
+      validate_contents = ::Foreman::Cast.to_bool(params[:validate_contents])
+
       syncable_products = @products.syncable
       syncable_repositories = Repository.where(:product_id => syncable_products).has_url
 
+      syncable_repositories = syncable_repositories.where(:content_type => Repository::YUM_TYPE) if skip_metadata_check || validate_contents
+      syncable_repositories = syncable_repositories.where.not(:download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND) if validate_contents
+
+      fail _("No syncable repositories found for selected products and options.") if syncable_repositories.empty?
+
       task = async_task(::Actions::BulkAction,
                         ::Actions::Katello::Repository::Sync,
-                        syncable_repositories)
+                        syncable_repositories,
+                        nil,
+                        :skip_metadata_check => skip_metadata_check,
+                        :validate_contents => validate_contents)
 
       respond_for_async :resource => task
     end

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

@@ -7,7 +7,7 @@ module Katello
     before_action :find_product_for_create, :only => [:create]
     before_action :find_organization_from_product, :only => [:create]
     before_action :find_repository, :only => [:show, :update, :destroy, :sync, :export,
-                                              :remove_content, :upload_content,
+                                              :remove_content, :upload_content, :republish,
                                               :import_uploads, :gpg_key_content]
     before_action :find_content, :only => :remove_content
     before_action :find_organization_from_repo, :only => [:update]
@@ -35,6 +35,8 @@ module Katello
       param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA.")
       param :upstream_username, String, :desc => N_("Username of the upstream repository user used for authentication")
       param :upstream_password, String, :desc => N_("Password of the upstream repository user used for authentication")
+      param :ostree_upstream_sync_policy, ::Katello::Repository::OSTREE_UPSTREAM_SYNC_POLICIES, :desc => N_("policies for syncing upstream ostree repositories.")
+      param :ostree_upstream_sync_depth, :number, :desc => N_("if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided.")
     end
 
     api :GET, "/repositories", N_("List of enabled repositories")
@@ -151,6 +153,10 @@ module Katello
       repository.verify_ssl_on_sync = ::Foreman::Cast.to_bool(repo_params[:verify_ssl_on_sync]) if repo_params.key?(:verify_ssl_on_sync)
       repository.upstream_username = repo_params[:upstream_username] if repo_params.key?(:upstream_username)
       repository.upstream_password = repo_params[:upstream_password] if repo_params.key?(:upstream_password)
+      if repository.ostree?
+        repository.ostree_upstream_sync_policy = repo_params[:ostree_upstream_sync_policy]
+        repository.ostree_upstream_sync_depth = repo_params[:ostree_upstream_sync_depth]
+      end
       sync_task(::Actions::Katello::Repository::Create, repository, false, true)
       repository = Repository.find(repository.id)
       respond_for_show(:resource => repository)
@@ -164,6 +170,13 @@ module Katello
       render :json => repo_types.values
     end
 
+    api :PUT, "/repositories/:id/republish", N_("Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem.")
+    param :id, :identifier, :desc => N_("Repository identifier"), :required => true
+    def republish
+      task = async_task(::Actions::Katello::Repository::MetadataGenerate, @repository, :force => true)
+      respond_for_async :resource => task
+    end
+
     api :GET, "/repositories/:id", N_("Show a repository")
     param :id, :identifier, :required => true, :desc => N_("repository ID")
     def show
@@ -174,7 +187,16 @@ module Katello
     param :id, :identifier, :required => true, :desc => N_("repository ID")
     param :source_url, String, :desc => N_("temporarily override feed URL for sync"), :required => false
     param :incremental, :bool, :desc => N_("perform an incremental import"), :required => false
+    param :skip_metadata_check, :bool, :desc => N_("Force sync even if no upstream changes are detected. Only used with yum repositories."), :required => false
+    param :validate_contents, :bool, :desc => N_("Force a sync and validate the checksums of all content. Only used with yum repositories."), :required => false
     def sync
+      sync_options = {
+        :skip_metadata_check => ::Foreman::Cast.to_bool(params[:skip_metadata_check]),
+        :validate_contents => ::Foreman::Cast.to_bool(params[:validate_contents]),
+        :incremental => ::Foreman::Cast.to_bool(params[:incremental]),
+        :source_url => params[:source_url]
+      }
+
       if params[:source_url].present? && params[:source_url] !~ /\A#{URI.regexp}\z/
         fail HttpErrors::BadRequest, _("source URL is malformed")
       end
@@ -183,9 +205,10 @@ module Katello
         fail HttpErrors::BadRequest, _("attempted to sync without a feed URL")
       end
 
-      task = async_task(::Actions::Katello::Repository::Sync, @repository,
-                          nil, params[:source_url], ::Foreman::Cast.to_bool(params[:incremental]))
+      task = async_task(::Actions::Katello::Repository::Sync, @repository, nil, sync_options)
       respond_for_async :resource => task
+    rescue Errors::InvalidActionOptionError => e
+      raise HttpErrors::BadRequest, e.message
     end
 
     api :POST, "/repositories/:id/export", N_("Export a repository")
@@ -229,6 +252,8 @@ module Katello
     param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA.")
     param :upstream_username, String, :desc => N_("Username of the upstream repository user for authentication")
     param :upstream_password, String, :desc => N_("Password of the upstream repository user for authentication")
+    param :ostree_upstream_sync_policy, ::Katello::Repository::OSTREE_UPSTREAM_SYNC_POLICIES, :desc => N_("policies for syncing upstream ostree repositories.")
+    param :ostree_upstream_sync_depth, :number, :desc => N_("if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided.")
     def update
       repo_params = repository_params
       sync_task(::Actions::Katello::Repository::Update, @repository, repo_params)
@@ -277,9 +302,11 @@ module Katello
     desc "Remove content from a repository"
     param :id, :identifier, :required => true, :desc => "repository ID"
     param 'ids', Array, :required => true, :desc => "Array of content ids to remove"
+    param 'sync_capsule', :bool, :desc => N_("Whether or not to sync an external capsule after upload. Default: true")
     def remove_content
+      sync_capsule = ::Foreman::Cast.to_bool(params.fetch(:sync_capsule, true))
       fail _("No content ids provided") if @content.blank?
-      respond_for_async :resource => sync_task(::Actions::Katello::Repository::RemoveContent, @repository, @content)
+      respond_for_async :resource => sync_task(::Actions::Katello::Repository::RemoveContent, @repository, @content, sync_capsule: sync_capsule)
     end
 
     api :POST, "/repositories/:id/upload_content", N_("Upload content into the repository")
@@ -312,6 +339,9 @@ module Katello
     api :PUT, "/repositories/:id/import_uploads", N_("Import uploads into a repository")
     param :id, :identifier, :required => true, :desc => N_("Repository id")
     param :upload_ids, Array, :desc => N_("Array of upload ids to import"), :deprecated => true
+    param :async, :bool, desc: N_("Do not wait for the ImportUpload action to finish. Default: false")
+    param 'publish_repository', :bool, :desc => N_("Whether or not to regenerate the repository on disk. Default: true")
+    param 'sync_capsule', :bool, :desc => N_("Whether or not to sync an external capsule after upload. Default: true")
     param :uploads, Array, :desc => N_("Array of uploads to import") do
       param 'id', String, :required => true
       param 'size', String
@@ -319,44 +349,37 @@ module Katello
       param 'name', String, :desc => N_("Needs to only be set for file repositories")
     end
     def import_uploads
+      generate_metadata = ::Foreman::Cast.to_bool(params.fetch(:publish_repository, true))
+      sync_capsule = ::Foreman::Cast.to_bool(params.fetch(:sync_capsule, true))
+      async = ::Foreman::Cast.to_bool(params.fetch(:async, false))
       if params['upload_ids'].empty? && params['uploads'].empty?
         fail HttpErrors::BadRequest, _('No upload param specified. Either uploads or upload_ids (deprecated) is required.')
       end
 
+      uploads = params['uploads'] || []
+
       if params.key?(:upload_ids)
         ::Foreman::Deprecation.api_deprecation_warning("The parameter upload_ids will be removed in Katello 3.3. Please update to use the uploads parameter.")
-
-        params[:upload_ids].each do |upload_id|
-          begin
-            sync_task(::Actions::Katello::Repository::ImportUpload, @repository, upload_id)
-          rescue => e
-            raise HttpErrors::BadRequest, e.message
-          end
-        end
+        params[:upload_ids].each { |upload_id| uploads << {'id' => upload_id} }
       end
 
-      if params.key?(:uploads)
-        params[:uploads].each do |upload|
-          if @repository.file?
-            upload.except('id').except('name')
-          else
-            upload.except('id')
-          end
-
-          begin
-            sync_task(
-              ::Actions::Katello::Repository::ImportUpload,
-              @repository,
-              upload['id'],
-              upload.except('id')
-            )
-          rescue => e
-            raise HttpErrors::BadRequest, e.message
-          end
+      upload_ids = uploads.map { |upload| upload['id'] }
+      unit_keys = uploads.map do |upload|
+        if @repository.file?
+          upload.except('id').except('name')
+        else
+          upload.except('id')
         end
       end
 
-      render :nothing => true
+      begin
+        task = send(async ? :async_task : :sync_task, ::Actions::Katello::Repository::ImportUpload,
+                    @repository, upload_ids, :unit_keys => unit_keys,
+                    :generate_metadata => generate_metadata, :sync_capsule => sync_capsule)
+        respond_for_async(resource: task)
+      rescue => e
+        raise HttpErrors::BadRequest, e.message
+      end
     end
 
     # returns the content of a repo gpg key, used directly by yum
@@ -395,7 +418,9 @@ module Katello
     end
 
     def repository_params
-      keys = [:download_policy, :mirror_on_sync, :verify_ssl_on_sync, :upstream_password, :upstream_username]
+      keys = [:download_policy, :mirror_on_sync, :verify_ssl_on_sync, :upstream_password, :upstream_username,
+              :ostree_upstream_sync_depth, :ostree_upstream_sync_policy
+             ]
       keys += [:label, :content_type] if params[:action] == "create"
       if params[:action] == 'create' || @repository.custom?
         keys += [:url, :gpg_key_id, :unprotected, :name, :checksum_type, :docker_upstream_name]

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

@@ -13,6 +13,7 @@ module Katello
     api :GET, "/products/:product_id/repository_sets", N_("List repository sets for a product.")
     param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
     param :name, String, :required => false, :desc => N_("Repository set name to search on")
+    param_group :search, Api::V2::ApiController
     def index
       collection = {}
       collection[:results] = @product.displayable_product_contents

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

@@ -3,7 +3,7 @@ module Katello
     include Katello::Concerns::FilteredAutoCompleteSearch
 
     before_action :find_activation_key
-    before_action :find_host, :only => :index
+    before_action :find_host, :only => [:index, :auto_complete_search]
     before_action :find_optional_organization, :only => [:index, :available, :show]
     before_action :find_organization, :only => [:upload, :delete_manifest,
                                                 :refresh_manifest, :manifest_history]

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

@@ -21,6 +21,7 @@ module Katello
     param :name, String, :desc => N_("filter by name")
     param :sync_date, String, :desc => N_("filter by sync date")
     param :interval, SyncPlan::TYPES, :desc => N_("filter by interval")
+    param_group :search, Api::V2::ApiController
     def index
       respond_for_index(:collection => scoped_search(index_relation.uniq, :name, :asc))
     end

data/app/controllers/katello/concerns/api/v2/content_overrides_controller.rb

@@ -0,0 +1,39 @@
+module Katello
+  module Concerns
+    module Api::V2::ContentOverridesController
+      extend ActiveSupport::Concern
+
+      # overriden_object => pass it either an activation key or content host
+      def validate_content_overrides_enabled(content_params, overriden_object = nil)
+        name = content_params[:name] || "enabled"
+        compare_value = content_params[:value].to_s.downcase
+        remove = content_params.key?(:remove) ? Foreman::Cast.to_bool(content_params[:remove]) : nil
+        content_label = content_params[:content_label]
+
+        if !remove && name == "enabled" &&
+                       (compare_value.blank? || (compare_value != "default" &&
+                        ::Foreman::Cast.to_bool(compare_value).nil?))
+          fail HttpErrors::BadRequest, _("Value must either be a boolean or 'default' for 'enabled'")
+        end
+
+        if content_label.blank? || (overriden_object &&
+                                    !overriden_object.valid_content_override_label?(content_label))
+          fail HttpErrors::BadRequest, _("Invalid content label: %s") % content_params[:content_label]
+        end
+
+        override = ::Katello::ContentOverride.new(content_params[:content_label])
+        override.name = name
+        if remove || (name == "enabled" && compare_value == "default")
+          override.value = nil
+        else
+          if name == "enabled"
+            override.value = ::Foreman::Cast.to_bool(compare_value) ? "1" : "0"
+          else
+            override.value = content_params[:value]
+          end
+        end
+        override
+      end
+    end
+  end
+end

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

@@ -29,6 +29,7 @@ module Katello
             @taxonomy = Organization.new(resource_params)
             sync_task(::Actions::Katello::Organization::Create, @taxonomy)
             @taxonomy.reload
+            switch_taxonomy
             if @count_nil_hosts > 0
               redirect_to send("step2_#{taxonomy_single}_path", @taxonomy)
             else

data/app/controllers/katello/providers_controller.rb

@@ -1,5 +1,7 @@
 module Katello
   class ProvidersController < Katello::ApplicationController
+    helper Rails.application.routes.url_helpers
+    helper ReactjsHelper
     before_action :find_rh_provider, :only => [:redhat_provider, :redhat_provider_tab]
     before_action :search_filter, :only => [:auto_complete_search]
 
@@ -37,7 +39,7 @@ module Katello
     end
 
     def controller_display_name
-      return 'provider'
+      'provider'
     end
 
     def search_filter

data/app/controllers/katello/sync_management_controller.rb

@@ -4,6 +4,8 @@ module Katello
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::NumberHelper
     include SyncManagementHelper::RepoMethods
+    helper Rails.application.routes.url_helpers
+    helper ReactjsHelper
     respond_to :html, :json
 
     def section_id

data/app/helpers/katello/errata_mailer_helper.rb

@@ -14,7 +14,7 @@ module Katello
     end
 
     def erratum_path(erratum)
-      "#{Setting[:foreman_url]}/errata/#{erratum.uuid}/info"
+      "#{Setting[:foreman_url]}/errata/#{erratum.uuid}"
     end
 
     def repository_erratum_path(repository, type = nil)

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -194,20 +194,15 @@ module Katello
         return [] unless host.operatingsystem.is_a?(Redhat)
 
         new_host = ::Host.new
-        # there is foreman bug right now that prevents
-        # os and arch to get updated properly,
-        # http://projects.theforeman.org/issues/14737
-        # so we are going to hard code it to use what
-        # is in the param host for now.
         new_host.operatingsystem = param_host.operatingsystem.present? ? param_host.operatingsystem : host.operatingsystem
         new_host.architecture = param_host.architecture.present? ? param_host.architecture : host.architecture
 
         if (host.is_a? Hostgroup)
-          new_host.content_facet = Host::ContentFacet.new(:lifecycle_environment_id => host.lifecycle_environment_id,
+          new_host.content_facet = ::Katello::Host::ContentFacet.new(:lifecycle_environment_id => host.lifecycle_environment_id,
                                                           :content_view_id => host.content_view_id,
                                                           :content_source_id => host.content_source_id)
         elsif host.content_facet.present?
-          new_host.content_facet = Host::ContentFacet.new(:lifecycle_environment_id => host.content_facet.lifecycle_environment_id,
+          new_host.content_facet = ::Katello::Host::ContentFacet.new(:lifecycle_environment_id => host.content_facet.lifecycle_environment_id,
                                                           :content_view_id => host.content_facet.content_view_id,
                                                           :content_source_id => host.content_source_id)
         end

data/app/lib/actions/candlepin/candlepin_listening_service.rb

@@ -60,7 +60,8 @@ module Actions
         else
           suspended_action.notify_not_connected("Not Connected")
         end
-      rescue ::TransportFailure => e
+      rescue => e
+        raise e unless e.class.name.include? "TransportFailure"
         suspended_action.notify_not_connected(e.message)
       end
 

data/app/lib/actions/candlepin/environment/set_content.rb

@@ -10,7 +10,7 @@ module Actions
         def existing_ids
           ::Katello::Resources::Candlepin::Environment.
               find(input[:cp_environment_id])[:environmentContent].map do |content|
-            content[:contentId]
+            content[:content][:id]
           end
         end
 

data/app/lib/actions/candlepin/owner/upstream_regenerate_certificates.rb

@@ -0,0 +1,17 @@
+module Actions
+  module Candlepin
+    module Owner
+      class UpstreamRegenerateCertificates < Candlepin::Abstract
+        input_format do
+          param :organization_id
+          param :upstream
+        end
+
+        def run
+          organization = ::Organization.find(input[:organization_id])
+          output[:response] = organization.redhat_provider.owner_regenerate_upstream_certificates(input[:upstream])
+        end
+      end
+    end
+  end
+end

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

@@ -5,11 +5,12 @@ module Actions
         input_format do
           param :product_id
           param :content_id
+          param :owner
         end
 
         def run
           output[:response] = ::Katello::Resources::Candlepin::Product.
-              add_content(input[:product_id], input[:content_id], true)
+              add_content(input[:owner], input[:product_id], input[:content_id], true)
         end
       end
     end

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

@@ -7,11 +7,13 @@ module Actions
           param :type
           param :label
           param :content_url
+          param :owner
         end
 
         def run
           output[:response] = ::Katello::Resources::Candlepin::Content.
-              create(name: input[:name],
+              create(input[:owner],
+                     name: input[:name],
                      contentUrl: input[:content_url],
                      type: input[:type],
                      label: input[:label],

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

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

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

@@ -5,11 +5,12 @@ module Actions
         input_format do
           param :product_id
           param :content_id
+          param :owner
         end
 
         def run
           output[:response] = ::Katello::Resources::Candlepin::Product.
-              remove_content(input[:product_id], input[:content_id])
+              remove_content(input[:owner], input[:product_id], input[:content_id])
         end
       end
     end