From 28144f8a5a37bef8772a276fefafd9b980ae2647 Mon Sep 17 00:00:00 2001
From: Colin Surprenant <colin.surprenant@gmail.com>
Date: Fri, 20 Nov 2020 11:35:42 -0500
Subject: [PATCH] move APIConfigs into PluginMixins namespace

---
 lib/logstash/outputs/elasticsearch.rb                         | 4 ++--
 lib/logstash/outputs/elasticsearch/common.rb                  | 2 +-
 .../{outputs => plugin_mixins}/elasticsearch/api_configs.rb   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/logstash/{outputs => plugin_mixins}/elasticsearch/api_configs.rb (99%)

diff --git a/lib/logstash/outputs/elasticsearch.rb b/lib/logstash/outputs/elasticsearch.rb
index e36f2ecdb..332160649 100644
--- 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
index 03293728e..acf3a0853 100644
--- 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/lib/logstash/outputs/elasticsearch/api_configs.rb b/lib/logstash/plugin_mixins/elasticsearch/api_configs.rb
similarity index 99%
rename from lib/logstash/outputs/elasticsearch/api_configs.rb
rename to lib/logstash/plugin_mixins/elasticsearch/api_configs.rb
index cbf936367..3af1dcb52 100644
--- a/lib/logstash/outputs/elasticsearch/api_configs.rb
+++ b/lib/logstash/plugin_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.