Manage CRR endpoints without explicit port

Issue: BB-746

Author: maeldonn

bin/replication.js

@@ -40,6 +40,7 @@ function _createSetupReplication(command, options, log) {
     const destinationEndpoint =
         config.getBootstrapList()
         .find(dest => Array.isArray(dest.servers));
+    const destSiteConfig = destinationEndpoint ? config.getReplicationSiteDestConfig(destinationEndpoint.site) : null;
     return new SetupReplication({
         source: {
             bucket: sourceBucket,
@@ -51,9 +52,8 @@ function _createSetupReplication(command, options, log) {
         target: {
             bucket: targetBucket,
             credentials: targetCredentials,
-            hosts: targetIsExternal ?
-                undefined : new RoundRobin(destinationEndpoint.servers),
-            transport: destination.transport,
+            hosts: targetIsExternal ? undefined : new RoundRobin(destSiteConfig.replicationEndpoint.servers),
+            transport: destSiteConfig?.transport || destination.transport,
             isExternal: targetIsExternal,
             siteName,
         },

extensions/replication/queueProcessor/QueueProcessor.js

@@ -259,7 +259,7 @@ class QueueProcessor extends EventEmitter {
 
         if (Array.isArray(this.destConfig.replicationEndpoint.servers)) {
             this.destHosts =
-                new RoundRobin(this.destConfig.replicationEndpoint.servers, { defaultPort: 80 });
+                new RoundRobin(this.destConfig.replicationEndpoint.servers);
             if (this.destConfig.replicationEndpoint.echo) {
                 this._setupEcho();
             }

lib/Config.js

@@ -309,13 +309,42 @@ class Config extends EventEmitter {
      * @returns {object} site specific destination configuration
      */
     getReplicationSiteDestConfig(site) {
-        const destConfig = this.extensions.replication.destination;
+        const { destination } = this.extensions.replication;
+        const siteConfig = destination.sites?.[site] || {};
+
+        const transport = siteConfig.transport || destination.transport || 'http';
+        const auth = siteConfig.auth || destination.auth;
+        const endpoint = this.bootstrapList.find(e => e.site === site);
+
         return {
-            transport: destConfig.sites?.[site]?.transport || destConfig.transport,
-            auth: destConfig.sites?.[site]?.auth || destConfig.auth,
-            replicationEndpoint: this.bootstrapList.find(endpoint => endpoint.site === site),
+            transport,
+            auth,
+            replicationEndpoint: this._normalizeEndpointServers(endpoint, transport),
         };
     }
+
+    /**
+     * Normalize replication endpoint servers by adding the default port
+     * based on the transport protocol when no explicit port is specified.
+     * @param {object|undefined} endpoint - replication endpoint object
+     * @param {string} transport - transport protocol ('http' or 'https')
+     * @returns {object|undefined} endpoint with normalized servers
+     */
+    _normalizeEndpointServers(endpoint, transport) {
+        if (!endpoint || !Array.isArray(endpoint.servers)) {
+            return endpoint;
+        }
+
+        const defaultPort = transport === 'https' ? 443 : 80;
+        const normalizedServers = endpoint.servers.map(server => {
+            if (server.includes(':')) {
+                return server;
+            }
+            return `${server}:${defaultPort}`;
+        });
+
+        return { ...endpoint, servers: normalizedServers };
+    }
 }
 
 module.exports = new Config();

tests/unit/conf/Config.js

@@ -122,6 +122,77 @@ describe('Config', () => {
             });
         });
 
+        it('should normalize server entries with default port 443 for https transport', () => {
+            const conf = new Config();
+            conf.bootstrapList = [{ site: 'site1', servers: ['s3.example.com']}];
+            conf.extensions.replication.destination = {
+                transport: 'https',
+                sites: {
+                    site1: { transport: 'https' },
+                },
+                bootstrapList: [
+                    { site: 'site1', servers: ['s3.example.com'] },
+                ],
+            };
+
+            const destConfig = conf.getReplicationSiteDestConfig('site1');
+            assert.deepStrictEqual(destConfig.replicationEndpoint.servers, ['s3.example.com:443']);
+        });
+
+        it('should normalize server entries with default port 80 for http transport', () => {
+            const conf = new Config();
+            conf.bootstrapList = [{ site: 'site1', servers: ['s3.example.com']}];
+            conf.extensions.replication.destination = {
+                transport: 'http',
+                sites: {
+                    site1: { transport: 'http' },
+                },
+                bootstrapList: [
+                    { site: 'site1', servers: ['s3.example.com'] },
+                ],
+            };
+
+            const destConfig = conf.getReplicationSiteDestConfig('site1');
+            assert.deepStrictEqual(destConfig.replicationEndpoint.servers, ['s3.example.com:80']);
+        });
+
+        it('should preserve explicit port in server entries', () => {
+            const conf = new Config();
+            conf.bootstrapList = [{ site: 'site1', servers: ['s3.example.com:8443']}];
+            conf.extensions.replication.destination = {
+                transport: 'https',
+                sites: {
+                    site1: { transport: 'https' },
+                },
+                bootstrapList: [
+                    { site: 'site1', servers: ['s3.example.com:8443'] },
+                ],
+            };
+
+            const destConfig = conf.getReplicationSiteDestConfig('site1');
+            assert.deepStrictEqual(destConfig.replicationEndpoint.servers, ['s3.example.com:8443']);
+        });
+
+        it('should not modify endpoint without servers array', () => {
+            const conf = new Config();
+            conf.bootstrapList = [{ site: 'aws1', type: 'aws_s3' }];
+            conf.extensions.replication.destination = {
+                transport: 'http',
+                sites: {
+                    aws1: { transport: 'http' },
+                },
+                bootstrapList: [
+                    { site: 'aws1', type: 'aws_s3' },
+                ],
+            };
+
+            const destConfig = conf.getReplicationSiteDestConfig('aws1');
+            assert.deepStrictEqual(destConfig.replicationEndpoint, {
+                site: 'aws1',
+                type: 'aws_s3',
+            });
+        });
+
         it('should return default replication destination config when site one is not available', () => {
             process.env.BACKBEAT_CONFIG_FILE = `${__dirname}/configs/replicationMultiDestConfig.json`;
             const conf = new Config();