[API] Generator: Generates all spec code in elasticsearch-api

Author: picandocodigo

Diff for: elasticsearch-api/utils/thor/generate_source.rb

@@ -40,7 +40,7 @@ module API
     # here.
     #
     class SourceGenerator < Thor
-      namespace 'api:code'
+      namespace 'code'
       include Thor::Actions
       include EndpointSpecifics
 
@@ -49,26 +49,20 @@ class SourceGenerator < Thor
       desc 'generate', 'Generate source code and tests from the REST API JSON specification'
       method_option :verbose, type: :boolean, default: false,  desc: 'Output more information'
       method_option :tests,   type: :boolean, default: false,  desc: 'Generate test files'
-      method_option :api,     type: :array,   default: %w[oss xpack], desc: 'APIs to generate (oss, x-pack)'
 
       def generate
         self.class.source_root File.expand_path(__dir__)
-        @xpack = options[:api].include? 'xpack'
-        @oss   = options[:api].include? 'oss'
-
-        __generate_source(:xpack) if @xpack
-        __generate_source(:oss) if @oss
+        generate_source
         # -- Tree output
         print_tree if options[:verbose]
       end
 
       private
 
-      def __generate_source(api)
-        @current_api = api
-        @output = FilesHelper.output_dir(api)
+      def generate_source
+        @output = FilesHelper.output_dir
 
-        FilesHelper.files(api).each do |filepath|
+        FilesHelper.files.each do |filepath|
           @path = Pathname(filepath)
           @json = MultiJson.load(File.read(@path))
           @spec = @json.values.first
@@ -91,7 +85,6 @@ def __generate_source(api)
           @http_path        = __http_path
           @required_parts   = __required_parts
 
-          @module_namespace.shift if @module_namespace.first == 'xpack'
           @path_to_file = @output.join(@module_namespace.join('/')).join("#{@method_name}.rb")
           dir = @output.join(@module_namespace.join('/'))
           empty_directory(dir, verbose: false)
@@ -106,23 +99,18 @@ def __generate_source(api)
           puts
         end
 
-        run_rubocop(api)
+        run_rubocop
       end
 
       def __full_namespace
         names = @endpoint_name.split('.')
-        if @current_api == :xpack
-          names = (names.first == 'xpack' ? names : ['xpack', names].flatten)
-          # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
-          names.map do |name|
-            name
-              .gsub(/^ml$/, 'machine_learning')
-              .gsub(/^ilm$/, 'index_lifecycle_management')
-              .gsub(/^ccr/, 'cross_cluster_replication')
-              .gsub(/^slm/, 'snapshot_lifecycle_management')
-          end
-        else
-          names
+        # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
+        names.map do |name|
+          name
+            .gsub(/^ml$/, 'machine_learning')
+            .gsub(/^ilm$/, 'index_lifecycle_management')
+            .gsub(/^ccr/, 'cross_cluster_replication')
+            .gsub(/^slm/, 'snapshot_lifecycle_management')
         end
       end
 
@@ -194,7 +182,7 @@ def __http_path
       def __parse_path(path)
         path.gsub(/^\//, '')
             .gsub(/\/$/, '')
-            .gsub('{', "\#{#{__utils}.__listify(_")
+            .gsub('{', "\#{Utils.__listify(_")
             .gsub('}', ')}')
       end
 
@@ -288,12 +276,8 @@ def print_tree
         say_status('tree', lines.first + "\n" + lines[1, lines.size].map { |l| ' ' * 14 + l }.join("\n"))
       end
 
-      def __utils
-        (@current_api == :xpack) ? 'Elasticsearch::API::Utils' : 'Utils'
-      end
-
-      def run_rubocop(api)
-        system("rubocop -c ./thor/.rubocop.yml --format autogenconf -x #{FilesHelper::output_dir(api)}")
+      def run_rubocop
+        system("rubocop -c ./thor/.rubocop.yml --format autogenconf -x #{FilesHelper::output_dir}")
       end
     end
   end

Diff for: elasticsearch-api/utils/thor/generator/files_helper.rb

@@ -20,53 +20,26 @@
 
 module Elasticsearch
   module API
+    # Helper with file related methods for code generation
     module FilesHelper
       PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
       SRC_PATH   = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api/')
-      OSS_OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
-      XPACK_OUTPUT_DIR = '../../elasticsearch-xpack/lib/elasticsearch/xpack/api/actions'.freeze
-
-      TESTS_DIRECTORIES = {
-        oss: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free",
-        xpack: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/platinum"
-      }.freeze
+      OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
+      TESTS_DIRECTORY = "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free".freeze
 
       # Only get JSON files and remove hidden files
-      def self.files(api)
-        json_files = if api == :xpack
-                       xpack_files
-                     else
-                       Dir.entries(SRC_PATH) - xpack_files
-                     end
+      def self.files
+        json_files = Dir.entries(SRC_PATH)
+
         json_files.reject do |file|
           File.extname(file) != '.json' ||
             File.basename(file) == '_common.json'
         end.map { |file| "#{SRC_PATH}#{file}" }
       end
 
-      XPACK_ENDPOINTS = [
-        'autoscaling', 'cross_cluster_replication', 'ccr', 'data_frame_transform_deprecated',
-        'enrich', 'eql', 'fleet', 'ilm', 'logstash', 'migration', 'watcher', 'slm'
-      ]
-      XPACK_ENDPOINTS_REGEXP = /data_stream|ml_|reload_search_analyzers|transform/
-
-      def self.xpack_files
-        xpack_tests = Dir.entries(TESTS_DIRECTORIES[:xpack])
-        Dir.entries(SRC_PATH).map do |entry|
-          filename = entry.split('.').first
-          next if filename == 'snapshot'
-
-          if xpack_tests.include?(filename) ||
-                                  XPACK_ENDPOINTS.include?(filename) ||
-                                  entry.match?(XPACK_ENDPOINTS_REGEXP)
-            entry
-          end
-        end.compact
-      end
-
       # Path to directory to copy generated files
-      def self.output_dir(api)
-        api == :xpack ? Pathname(XPACK_OUTPUT_DIR) : Pathname(OSS_OUTPUT_DIR)
+      def self.output_dir
+        Pathname(OUTPUT_DIR)
       end
 
       def self.documentation_url(documentation_url)
@@ -82,6 +55,11 @@ def self.documentation_url(documentation_url)
           documentation_url.gsub(/\/(current|master)\//, "/#{version}/")
         end
       end
+
+      def cleanup_output_dir!
+        FileUtils.remove_dir(OUTPUT_DIR)
+        Dir.mkdir(OUTPUT_DIR)
+      end
     end
   end
 end

Diff for: elasticsearch-api/utils/thor/templates/_method_setup.erb

@@ -43,7 +43,7 @@
   <%- end -%>
   <%= '  '*(@namespace_depth+4) %>path   = <%= @http_path %>
   <%- unless @params.empty? -%>
-    <%= '  '*(@namespace_depth+4) %>params = <%= __utils %>.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
+    <%= '  '*(@namespace_depth+4) %>params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
   <%- else -%>
     <%= '  '*(@namespace_depth+4) %>params = {}
   <%- end -%>

Diff for: elasticsearch-api/utils/thor/templates/_perform_request.erb

@@ -28,7 +28,7 @@ when 'mtermvectors'
 <%- when 'cluster.reroute', 'cluster.put_settings' %>
   body = arguments[:body] || {}
 <%- when 'ml.find_file_structure' %>
-  body = <%= __utils %>.__bulkify(arguments.delete(:body))
+  body = Utils.__bulkify(arguments.delete(:body))
 <%- else -%>
   <%= '  '*(@namespace_depth+3) %>body   = <%= @spec['body'].nil? ? 'nil' : 'arguments[:body]' %>
 <%- end -%>
@@ -40,12 +40,12 @@ when 'mtermvectors'
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@endpoint_name) %>
-    <%= __utils %>.__rescue_from_not_found do
+    Utils.__rescue_from_not_found do
     perform_request(method, path, params, body, headers).status == 200 ? true : false
     end
   <%- elsif needs_complex_ignore_404?(@endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
-    <%= __utils %>.__rescue_from_not_found { perform_request(method, path, params, body, headers).body }
+    Utils.__rescue_from_not_found { perform_request(method, path, params, body, headers).body }
     else
     perform_request(method, path, params, body, headers).body
     end