[CLIENT] Support providing a cloud id

Author: estolfo

elasticsearch-transport/lib/elasticsearch/transport/client.rb

@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'base64'
+
 module Elasticsearch
   module Transport
 
@@ -117,7 +119,8 @@ def initialize(arguments={}, &block)
         @arguments[:http]               ||= {}
         @options[:http]               ||= {}
 
-        @seeds = __extract_hosts(@arguments[:hosts] ||
+        @seeds = extract_cloud_creds(@arguments)
+        @seeds ||= __extract_hosts(@arguments[:hosts] ||
                                      @arguments[:host] ||
                                      @arguments[:url] ||
                                      @arguments[:urls] ||
@@ -156,6 +159,15 @@ def perform_request(method, path, params={}, body=nil, headers=nil)
 
       private
 
+      def extract_cloud_creds(arguments)
+        return unless arguments[:cloud_id]
+        cloud_url, elasticsearch_instance = Base64.decode64(arguments[:cloud_id].gsub('name:', '')).split('$')
+        [ { :scheme => 'https',
+          :user => arguments[:user],
+          :password => arguments[:password],
+          :host => "#{elasticsearch_instance}.#{cloud_url}" } ]
+      end
+
       # Normalizes and returns hosts configuration.
       #
       # Arrayifies the `hosts_config` argument and extracts `host` and `port` info from strings.

elasticsearch-transport/lib/elasticsearch/transport/transport/base.rb

@@ -148,7 +148,7 @@ def __build_connections
           Connections::Collection.new \
             :connections => hosts.map { |host|
             host[:protocol] = host[:scheme] || options[:scheme] || options[:http][:scheme] || DEFAULT_PROTOCOL
-            host[:port] ||= options[:port] || options[:http][:port] || DEFAULT_PORT
+            host[:port] ||= options[:port] || options[:http][:port] || DEFAULT_PORT unless options[:cloud_id]
             if (options[:user] || options[:http][:user]) && !host[:user]
               host[:user] ||= options[:user] || options[:http][:user]
               host[:password] ||= options[:password] || options[:http][:password]
@@ -234,7 +234,8 @@ def __convert_to_json(o=nil, options={})
         def __full_url(host)
           url  = "#{host[:protocol]}://"
           url += "#{CGI.escape(host[:user])}:#{CGI.escape(host[:password])}@" if host[:user]
-          url += "#{host[:host]}:#{host[:port]}"
+          url += "#{host[:host]}"
+          url += ":#{host[:port]}" if host[:port]
           url += "#{host[:path]}" if host[:path]
           url
         end

elasticsearch-transport/spec/elasticsearch/transport/client_spec.rb

@@ -270,6 +270,28 @@
     end
   end
 
+  context 'when cloud credentials are provided' do
+
+    let(:client) do
+      described_class.new(cloud_id: 'name:bG9jYWxob3N0JGFiY2QkZWZnaA==', user: 'elastic', password: 'changeme')
+    end
+
+    let(:hosts) do
+      client.transport.hosts
+    end
+
+    it 'extracts the cloud credentials' do
+      expect(hosts[0][:host]).to eq('abcd.localhost')
+      expect(hosts[0][:protocol]).to eq('https')
+      expect(hosts[0][:user]).to eq('elastic')
+      expect(hosts[0][:password]).to eq('changeme')
+    end
+
+    it 'creates the correct full url' do
+      expect(client.transport.__full_url(client.transport.hosts[0])).to eq('https://elastic:changeme@abcd.localhost')
+    end
+  end
+
   shared_examples_for 'a client that extracts hosts' do
 
     context 'when the hosts are a String' do