move APIConfigs into PluginMixins namespace

logstash-plugins · Nov 20, 2020 · 28144f8 · 28144f8
1 parent 53dab0c
commit 28144f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/logstash/outputs/elasticsearch.rb b/lib/logstash/outputs/elasticsearch.rb
@@ -88,7 +88,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
 
   require "logstash/outputs/elasticsearch/http_client"
   require "logstash/outputs/elasticsearch/http_client_builder"
-  require "logstash/outputs/elasticsearch/api_configs"
+  require "logstash/plugin_mixins/elasticsearch/api_configs"
   require "logstash/outputs/elasticsearch/common"
   require "logstash/outputs/elasticsearch/ilm"
   require 'logstash/plugin_mixins/ecs_compatibility_support'
@@ -103,7 +103,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   include(LogStash::PluginMixins::ECSCompatibilitySupport)
 
   # Generic/API config options that any document indexer output needs
-  include(LogStash::Outputs::ElasticSearch::APIConfigs)
+  include(LogStash::PluginMixins::ElasticSearch::APIConfigs)
 
   DEFAULT_POLICY = "logstash-policy"
 

diff --git a/lib/logstash/outputs/elasticsearch/common.rb b/lib/logstash/outputs/elasticsearch/common.rb
@@ -153,7 +153,7 @@ def setup_hosts
 
     def hosts_default?(hosts)
       # NOTE: would be nice if pipeline allowed us a clean way to detect a config default :
-      hosts.is_a?(Array) && hosts.size == 1 && hosts.first.equal?(APIConfigs::DEFAULT_HOST)
+      hosts.is_a?(Array) && hosts.size == 1 && hosts.first.equal?(LogStash::PluginMixins::ElasticSearch::APIConfigs::DEFAULT_HOST)
     end
     private :hosts_default?
 

diff --git a/...tash/outputs/elasticsearch/api_configs.rb → ...lugin_mixins/elasticsearch/api_configs.rb b/...tash/outputs/elasticsearch/api_configs.rb → ...lugin_mixins/elasticsearch/api_configs.rb
@@ -1,4 +1,4 @@
-module LogStash; module Outputs; class ElasticSearch
+module LogStash; module PluginMixins; module ElasticSearch
   module APIConfigs
 
     # This module defines common options that can be reused by alternate elasticsearch output plugins such as the elasticsearch_data_streams output.