use fill_user_password_from_cloud_auth

Author: colinsurprenant

lib/logstash/inputs/elasticsearch.rb

@@ -182,6 +182,7 @@ def register
     end
 
     validate_authentication
+    fill_user_password_from_cloud_auth
     fill_hosts_from_cloud_id
 
 
@@ -356,11 +357,6 @@ def validate_authentication
     if @api_key && @api_key.value && @ssl != true
       raise(LogStash::ConfigurationError, "Using api_key authentication requires SSL/TLS secured communication using the `ssl => true` option")
     end
-
-    if @cloud_auth
-      @user, @password = parse_user_password_from_cloud_auth(@cloud_auth)
-      params['user'], params['password'] = @user, @password
-    end
   end
 
   def setup_ssl
@@ -393,6 +389,12 @@ def setup_api_key(api_key)
     { Authorization: "ApiKey #{token}" }
   end
 
+  def fill_user_password_from_cloud_auth
+    return unless @cloud_auth
+
+    @user, @password = parse_user_password_from_cloud_auth(@cloud_auth)
+    params['user'], params['password'] = @user, @password
+  end
 
   def fill_hosts_from_cloud_id
     return unless @cloud_id