[CLIENT] Allow a port to be set with a Cloud id and use default if no port is provided

Author: estolfo

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

@@ -48,6 +48,11 @@ class Client
       # @since 7.0.0
       DEFAULT_HOST = 'localhost:9200'.freeze
 
+      # The default port to use if connecting using a Cloud ID.
+      #
+      # @since 7.2.0
+      DEFAULT_CLOUD_PORT = 9243
+
       # Returns the transport object.
       #
       # @see Elasticsearch::Transport::Transport::Base
@@ -162,10 +167,11 @@ def perform_request(method, path, params={}, body=nil, headers=nil)
       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}" } ]
+        [ { scheme: 'https',
+            user: arguments[:user],
+            password: arguments[:password],
+            host: "#{elasticsearch_instance}.#{cloud_url}",
+            port: arguments[:port] || DEFAULT_CLOUD_PORT } ]
       end
 
       # Normalizes and returns hosts configuration.

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

@@ -285,10 +285,30 @@
       expect(hosts[0][:protocol]).to eq('https')
       expect(hosts[0][:user]).to eq('elastic')
       expect(hosts[0][:password]).to eq('changeme')
+      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://elastic:changeme@abcd.localhost')
+      expect(client.transport.__full_url(client.transport.hosts[0])).to eq('https://elastic:changeme@abcd.localhost:9243')
+    end
+
+    context 'when a port is specified' do
+
+      let(:client) do
+        described_class.new(cloud_id: 'name:bG9jYWxob3N0JGFiY2QkZWZnaA==', user: 'elastic', password: 'changeme', port: 9200 )
+      end
+
+      it 'sets the specified port along with 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')
+        expect(hosts[0][:port]).to eq(9200)
+      end
+
+      it 'creates the correct full url' do
+        expect(client.transport.__full_url(client.transport.hosts[0])).to eq('https://elastic:changeme@abcd.localhost:9200')
+      end
     end
   end