elasticsearch-transport 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a8f6e85b60bdec378a1c8011aa76c24ab1a08f618a2f2fb38850f3b6114190
-  data.tar.gz: 25e88a3e742a0e4341ba685296425d13ddb8ed7059ef97a39174e394bec40535
+  metadata.gz: be545facbcd8066275038d52de9360f5f8151d67f682b6482b31789cb08bbf7d
+  data.tar.gz: 04aa294d2c80a8336c0dcae3492124095cecc804488fae9d15889e619d021102
 SHA512:
-  metadata.gz: 90a600694fa1172722d988da7cf09daca12160054b13c1b6a8093303529f62fcd76eb8c4367c0f936fb9d96fdc0533e849ed7c426b04f40069cf009895c06da4
-  data.tar.gz: 6f18333cf05353ed2292c7edf21cc320aa8482f72e07bfab104e7ca8b5d0d9d697f26b2562da8455852dd67afe3e1a197edf70133527287574441e85da08b566
+  metadata.gz: c08f16ae0533f7ce03cf2d87cff3765db8a31ce277ea0ffc89a6380e3cd6be075acb3d6ee99eab1091a960d838988403d3d93ba8bacc49a41b41207ff7ba3abb
+  data.tar.gz: de38a4e292eb7976fdfdca5a02b6624d8725a5f75e1500ffa6ee34034be9c0f2c487691c4fec738730c99155e3bc17fc145d77c3835902a9c16c4c612c895574

data/lib/elasticsearch/transport/client.rb

@@ -169,7 +169,8 @@ module Elasticsearch
 
       def extract_cloud_creds(arguments)
         return unless arguments[:cloud_id]
-        cloud_url, elasticsearch_instance = Base64.decode64(arguments[:cloud_id].gsub('name:', '')).split('$')
+        name = arguments[:cloud_id].split(':')[0]
+        cloud_url, elasticsearch_instance = Base64.decode64(arguments[:cloud_id].gsub("#{name}:", '')).split('$')
         [ { scheme: 'https',
             user: arguments[:user],
             password: arguments[:password],

data/lib/elasticsearch/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Transport
-    VERSION = "7.2.0"
+    VERSION = "7.2.1"
   end
 end

data/spec/elasticsearch/transport/client_spec.rb

@@ -310,6 +310,30 @@ describe Elasticsearch::Transport::Client do
         expect(client.transport.__full_url(client.transport.hosts[0])).to eq('https://elastic:changeme@abcd.localhost:9200')
       end
     end
+
+    context 'when the cluster has alternate names' do
+
+      let(:client) do
+        described_class.new(cloud_id: 'myCluster:bG9jYWxob3N0JGFiY2QkZWZnaA==', user: 'elasticfantastic', password: 'tobechanged')
+      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('elasticfantastic')
+        expect(hosts[0][:password]).to eq('tobechanged')
+        expect(hosts[0][:port]).to eq(9243)
+      end
+
+      it 'creates the correct full url' do
+        expect(client.transport.__full_url(client.transport.hosts[0])).to eq('https://elasticfantastic:tobechanged@abcd.localhost:9243')
+      end
+
+    end
   end
 
   shared_examples_for 'a client that extracts hosts' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json