repositories_controller.rb in katello-3.5.0.rc2

- old
+ new

@@ -169,24 +169,24 @@
       repo_types = creatable ? RepositoryTypeManager.creatable_repository_types : RepositoryTypeManager.repository_types
       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
+    param :id, :number, :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")
+    param :id, :number, :required => true, :desc => N_("repository ID")
     def show
       respond_for_show(:resource => @repository)
     end
 
     api :POST, "/repositories/:id/sync", N_("Sync a repository")
-    param :id, :identifier, :required => true, :desc => N_("repository ID")
+    param :id, :number, :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
@@ -210,11 +210,11 @@
     rescue Errors::InvalidActionOptionError => e
       raise HttpErrors::BadRequest, e.message
     end
 
     api :POST, "/repositories/:id/export", N_("Export a repository")
-    param :id, :identifier, :desc => N_("Repository identifier"), :required => true
+    param :id, :number, :desc => N_("Repository identifier"), :required => true
     param :export_to_iso, :bool, :desc => N_("Export to ISO format"), :required => false
     param :iso_mb_size, :number, :desc => N_("maximum size of each ISO in MB"), :required => false
     param :since, Date, :desc => N_("Optional date of last export (ex: 2010-01-01T12:00:00Z)"), :required => false
     def export
       if params[:export_to_iso].blank? && params[:iso_mb_size].present?
@@ -239,11 +239,11 @@
       respond_for_async :resource => task
     end
 
     api :PUT, "/repositories/:id", N_("Update a repository")
     param :name, String, :desc => N_("New name for the repository")
-    param :id, :identifier, :required => true, :desc => N_("repository ID")
+    param :id, :number, :required => true, :desc => N_("repository ID")
     param :gpg_key_id, :number, :desc => N_("ID of a gpg key that will be assigned to this repository")
     param :unprotected, :bool, :desc => N_("true if this repository can be published via HTTP")
     param :checksum_type, String, :desc => N_("checksum of the repository, currently 'sha1' & 'sha256' are supported.'")
     param :url, String, :desc => N_("the feed url of the original repository ")
     param :docker_upstream_name, String, :desc => N_("name of the upstream docker repository")
@@ -259,11 +259,11 @@
       sync_task(::Actions::Katello::Repository::Update, @repository, repo_params)
       respond_for_show(:resource => @repository)
     end
 
     api :DELETE, "/repositories/:id", N_("Destroy a custom repository")
-    param :id, :identifier, :required => true
+    param :id, :number, :required => true
     def destroy
       sync_task(::Actions::Katello::Repository::Destroy, @repository)
       respond_for_destroy
     end
 
@@ -288,31 +288,31 @@
       repo = Repository.where(:pulp_id => repo_id).first
       fail _("Couldn't find repository '%s'") % repo_id if repo.nil?
       Rails.logger.info("Sync_complete called for #{repo.name}, running after_sync.")
 
       unless repo.dynflow_handled_last_sync?(task_id)
-        async_task(::Actions::Katello::Repository::Sync, repo, task_id)
+        async_task(::Actions::Katello::Repository::ScheduledSync, repo, task_id)
       end
       render :json => {}
     end
 
     api :PUT, "/repositories/:id/remove_packages"
     api :PUT, "/repositories/:id/remove_docker_manifests"
     api :PUT, "/repositories/:id/remove_puppet_modules"
     api :PUT, "/repositories/:id/remove_content"
     desc "Remove content from a repository"
-    param :id, :identifier, :required => true, :desc => "repository ID"
+    param :id, :number, :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, sync_capsule: sync_capsule)
     end
 
     api :POST, "/repositories/:id/upload_content", N_("Upload content into the repository")
-    param :id, :identifier, :required => true, :desc => N_("repository ID")
+    param :id, :number, :required => true, :desc => N_("repository ID")
     param :content, File, :required => true, :desc => N_("Content files to upload. Can be a single file or array of files.")
     def upload_content
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Docker content.") if @repository.docker?
 
       filepaths = Array.wrap(params[:content]).compact.collect do |content|
@@ -334,11 +334,11 @@
         :with_logging => true
       )
     end
 
     api :PUT, "/repositories/:id/import_uploads", N_("Import uploads into a repository")
-    param :id, :identifier, :required => true, :desc => N_("Repository id")
+    param :id, :number, :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
@@ -383,10 +383,10 @@
 
     # returns the content of a repo gpg key, used directly by yum
     # we don't want to authenticate, authorize etc, trying to distinguish between a yum request and normal api request
     # might not always be 100% bullet proof, and its more important that yum can fetch the key.
     api :GET, "/repositories/:id/gpg_key_content", N_("Return the content of a repo gpg key, used directly by yum")
-    param :id, :identifier, :required => true
+    param :id, :number, :required => true
     def gpg_key_content
       if @repository.gpg_key && @repository.gpg_key.content.present?
         render(:plain => @repository.gpg_key.content, :layout => false)
       else
         head(404)