[CI] Update X-Pack test runner

Author: picandocodigo

elasticsearch-xpack/lib/elasticsearch/xpack.rb

@@ -44,128 +44,117 @@ class Client
 Elasticsearch::API::COMMON_PARAMS.push :job_id, :datafeed_id, :filter_id, :snapshot_id, :category_id, :policy_id
 
 module Elasticsearch
-  module Transport
-    class Client
-      # When a method is called on the client, if it's one of the xpack root
-      # namespace methods, send them to the xpack client.
-      # E.g.: client.xpack.usage => client.usage
-      # Excluding `info` since OSS and XPACK both have info endpoints.
-      TOP_LEVEL_METHODS = [
-        :open_point_in_time,
-        :close_point_in_time,
-        :terms_enum,
-        :usage
-      ].freeze
-
-      def method_missing(method, *args, &block)
-        return xpack.send(method, *args, &block) if TOP_LEVEL_METHODS.include?(method)
-
-        super
-      end
+  class Client
+    # When a method is called on the client, if it's one of the xpack root
+    # namespace methods, send them to the xpack client.
+    # E.g.: client.xpack.usage => client.usage
+    # Excluding `info` since OSS and XPACK both have info endpoints.
+    TOP_LEVEL_METHODS = [:open_point_in_time, :close_point_in_time, :terms_enum, :usage].freeze
 
-      def respond_to_missing?(method_name, *args)
-        TOP_LEVEL_METHODS.include?(method_name) || super
+    TOP_LEVEL_METHODS.each do |method|
+      define_method :"#{method}" do |value|
+        xpack.send(method, *[value])
       end
+    end
 
-      def xpack
-        @xpack ||= Elasticsearch::XPack::API::Client.new(self)
-      end
+    def xpack
+      @xpack ||= Elasticsearch::XPack::API::Client.new(self)
+    end
 
-      def security
-        @security ||= xpack.security
-      end
+    def security
+      @security ||= xpack.security
+    end
 
-      def ml
-        @ml ||= xpack.ml
-      end
+    def ml
+      @ml ||= xpack.ml
+    end
 
-      def rollup
-        @rollup ||= xpack.rollup
-      end
+    def rollup
+      @rollup ||= xpack.rollup
+    end
 
-      def watcher
-        @watcher ||= xpack.watcher
-      end
+    def watcher
+      @watcher ||= xpack.watcher
+    end
 
-      def graph
-        @graph ||= xpack.graph
-      end
+    def graph
+      @graph ||= xpack.graph
+    end
 
-      def migration
-        @migration ||= xpack.migration
-      end
+    def migration
+      @migration ||= xpack.migration
+    end
 
-      def sql
-        @sql ||= xpack.sql
-      end
+    def sql
+      @sql ||= xpack.sql
+    end
 
-      def deprecation
-        @deprecation ||= xpack.deprecation
-      end
+    def deprecation
+      @deprecation ||= xpack.deprecation
+    end
 
-      def data_frame
-        @data_frame ||= xpack.data_frame
-      end
+    def data_frame
+      @data_frame ||= xpack.data_frame
+    end
 
-      def ilm
-        @ilm ||= xpack.ilm
-      end
+    def ilm
+      @ilm ||= xpack.ilm
+    end
 
-      def license
-        @license ||= xpack.license
-      end
+    def license
+      @license ||= xpack.license
+    end
 
-      def transform
-        @transform ||= xpack.transform
-      end
+    def transform
+      @transform ||= xpack.transform
+    end
 
-      def async_search
-        @async_search ||= xpack.async_search
-      end
+    def async_search
+      @async_search ||= xpack.async_search
+    end
 
-      def cat
-        @cat ||= xpack.cat
-      end
+    def cat
+      @cat ||= xpack.cat
+    end
 
-      def indices
-        @indices ||= xpack.indices
-      end
+    def indices
+      @indices ||= xpack.indices
+    end
 
-      def searchable_snapshots
-        @searchable_snapshots ||= xpack.searchable_snapshots
-      end
+    def searchable_snapshots
+      @searchable_snapshots ||= xpack.searchable_snapshots
+    end
 
-      def cross_cluster_replication
-        @cross_cluster_replication ||= xpack.cross_cluster_replication
-      end
+    def cross_cluster_replication
+      @cross_cluster_replication ||= xpack.cross_cluster_replication
+    end
 
-      def autoscaling
-        @autoscaling ||= xpack.autoscaling
-      end
+    def autoscaling
+      @autoscaling ||= xpack.autoscaling
+    end
 
-      def enrich
-        @enrich ||= xpack.enrich
-      end
+    def enrich
+      @enrich ||= xpack.enrich
+    end
 
-      def eql
-        @eql ||= xpack.eql
-      end
+    def eql
+      @eql ||= xpack.eql
+    end
 
-      def snapshot_lifecycle_management
-        @snapshot_lifecycle_management ||= xpack.snapshot_lifecycle_management
-      end
+    def snapshot_lifecycle_management
+      @snapshot_lifecycle_management ||= xpack.snapshot_lifecycle_management
+    end
 
-      def text_structure
-        @text_structure ||= xpack.text_structure
-      end
+    def text_structure
+      @text_structure ||= xpack.text_structure
+    end
 
-      def logstash
-        @logstash ||= xpack.logstash
-      end
+    def logstash
+      @logstash ||= xpack.logstash
+    end
 
-      def fleet
-        @fleet ||= xpack.fleet
-      end
+    def fleet
+      @fleet ||= xpack.fleet
     end
   end
-end if defined?(Elasticsearch::Transport::Client)
+end if defined?(Elasticsearch::Client)

elasticsearch-xpack/test/test_helper.rb

@@ -26,7 +26,7 @@
 
 require 'ansi'
 
-require 'elasticsearch/transport'
+require 'elasticsearch'
 require 'elasticsearch/xpack'
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new