[API] Update supported params for cat API endpoints

estolfo · estolfo · commit d86ae2f24fa0 · 2019-04-12T17:56:56.000+02:00
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/aliases.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/aliases.rb
@@ -76,12 +76,13 @@ def aliases(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:aliases, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/allocation.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/allocation.rb
@@ -73,13 +73,14 @@ def allocation(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:allocation, [
+            :format,
             :bytes,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/count.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/count.rb
@@ -73,12 +73,13 @@ def count(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:count, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/fielddata.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/fielddata.rb
@@ -57,13 +57,14 @@ def fielddata(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:fielddata, [
+            :format,
             :bytes,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
             :s,
+            :v,
             :fields ].freeze)
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/health.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/health.rb
@@ -60,13 +60,14 @@ def health(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:health, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
+            :s,
             :ts,
-            :v,
-            :s ].freeze)
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/help.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/help.rb
@@ -39,7 +39,8 @@ def help(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:help, [
-            :help ].freeze)
+            :help,
+            :s ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/indices.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/indices.rb
@@ -86,15 +86,16 @@ def indices(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:indices, [
+            :format,
             :bytes,
+            :local,
+            :master_timeout,
             :h,
             :health,
             :help,
-            :local,
-            :master_timeout,
             :pri,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/master.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/master.rb
@@ -58,12 +58,13 @@ def master(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:master, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodeattrs.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodeattrs.rb
@@ -44,12 +44,13 @@ def nodeattrs(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:nodeattrs, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodes.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodes.rb
@@ -70,13 +70,14 @@ def nodes(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:nodes, [
+            :format,
             :full_id,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/pending_tasks.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/pending_tasks.rb
@@ -59,12 +59,13 @@ def pending_tasks(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:pending_tasks, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/plugins.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/plugins.rb
@@ -45,12 +45,13 @@ def plugins(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:plugins, [
+            :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/recovery.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/recovery.rb
@@ -82,13 +82,13 @@ def recovery(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:recovery, [
+            :format,
             :bytes,
-            :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/repositories.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/repositories.rb
@@ -51,11 +51,13 @@ def repositories(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:repositories, [
+            :format,
+            :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/segments.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/segments.rb
@@ -48,12 +48,12 @@ def segments(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:segments, [
+            :format,
             :bytes,
-            :index,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/shards.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/shards.rb
@@ -84,13 +84,14 @@ def shards(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:shards, [
+            :format,
+            :bytes,
             :local,
             :master_timeout,
-            :bytes,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/snapshots.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/snapshots.rb
@@ -39,7 +39,6 @@ module Actions
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-snapshots.html
         #
         def snapshots(arguments={})
-          raise ArgumentError, "Required argument 'repository' missing" if !arguments[:repository] && !arguments[:help]
           repository = arguments.delete(:repository)
 
           method = HTTP_GET
@@ -54,11 +53,13 @@ def snapshots(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:snapshots, [
+            :format,
+            :ignore_unavailable,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/tasks.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/tasks.rb
@@ -52,12 +52,11 @@ def tasks(arguments={})
             :node_id,
             :actions,
             :detailed,
-            :parent_node,
             :parent_task,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/templates.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/templates.rb
@@ -46,14 +46,13 @@ def templates(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:templates, [
-            :name,
             :format,
             :local,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/thread_pool.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/thread_pool.rb
@@ -69,15 +69,14 @@ def thread_pool(arguments={})
         #
         # @since 6.1.1
         ParamsRegistry.register(:thread_pool, [
-            :full_id,
+            :format,
             :size,
             :local,
-            :thread_pool_patterns,
             :master_timeout,
             :h,
             :help,
-            :v,
-            :s ].freeze)
+            :s,
+            :v ].freeze)
       end
     end
   end
