CNS with MQ Service - Integration & Web Api builds are failing

Author: glo63652

lib/internal/Magento/Framework/Amqp/Connection/Factory.php

@@ -8,9 +8,9 @@
 namespace Magento\Framework\Amqp\Connection;
 
 use Magento\Framework\App\ObjectManager;
+use PhpAmqpLib\Connection\AMQPConnectionFactory;
+use PhpAmqpLib\Connection\AMQPConnectionConfig;
 use PhpAmqpLib\Connection\AbstractConnection;
-use PhpAmqpLib\Connection\AMQPSSLConnection;
-use PhpAmqpLib\Connection\AMQPStreamConnection;
 
 /**
  * Create connection based on options.
@@ -25,20 +25,50 @@ class Factory
      */
     public function create(FactoryOptions $options): AbstractConnection
     {
-        $connectionType = $options->isSslEnabled() ? AMQPSSLConnection::class : AMQPStreamConnection::class;
-        $parameters = [
-            'host' => $options->getHost(),
-            'port' => $options->getPort(),
-            'user' => $options->getUsername(),
-            'password' => $options->getPassword(),
-            'vhost' => $options->getVirtualHost() !== null ? $options->getVirtualHost() : '/',
-        ];
+        $config = ObjectManager::getInstance()->create(AMQPConnectionConfig::class);
 
+        // Set host, port, user, password, and vhost from options
+        $config->setHost($options->getHost());
+        $config->setPort((int)$options->getPort());
+        $config->setUser($options->getUsername());
+        $config->setPassword($options->getPassword());
+        $config->setVhost($options->getVirtualHost() !== null ? $options->getVirtualHost() : '/');
+
+        // Set SSL options if SSL is enabled
         if ($options->isSslEnabled()) {
-            $parameters['ssl_options'] = $options->getSslOptions() !== null
-                ? $options->getSslOptions()
-                : ['verify_peer' => true];
+            $config->setIsSecure(true);
+            $sslOptions = $options->getSslOptions();
+            if ($sslOptions) {
+                if (isset($sslOptions['cafile'])) {
+                    $config->setSslCaCert($sslOptions['cafile']);
+                }
+                if (isset($sslOptions['local_cert'])) {
+                    $config->setSslCert($sslOptions['local_cert']);
+                }
+                if (isset($sslOptions['local_pk'])) {
+                    $config->setSslKey($sslOptions['local_pk']);
+                }
+                if (isset($sslOptions['verify_peer'])) {
+                    $config->setSslVerify($sslOptions['verify_peer']);
+                }
+                if (isset($sslOptions['verify_peer_name'])) {
+                    $config->setSslVerifyName($sslOptions['verify_peer_name']);
+                }
+                if (isset($sslOptions['passphrase'])) {
+                    $config->setSslPassPhrase($sslOptions['passphrase']);
+                }
+                if (isset($sslOptions['ciphers'])) {
+                    $config->setSslCiphers($sslOptions['ciphers']);
+                }
+            } else {
+                // Default SSL verification option
+                $config->setSslVerify(true);
+            }
+        } else {
+            $config->setIsSecure(false);
         }
-        return ObjectManager::getInstance()->create($connectionType, $parameters);
+
+        // Use the connection factory to create the connection
+        return AMQPConnectionFactory::create($config);
     }
 }

lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php

@@ -11,8 +11,7 @@
 use Magento\Framework\Amqp\Connection\FactoryOptions;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PhpAmqpLib\Connection\AMQPSSLConnection;
-use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Connection\AMQPConnectionConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -75,9 +74,9 @@ protected function setUp(): void
      * @return void
      * @dataProvider connectionDataProvider
      */
-    public function testSSLConnection($sslEnabled, $connectionClass)
+    public function testSSLConnection(bool $sslEnabled, string $connectionClass)
     {
-        $this->optionsMock->expects($this->exactly(2))
+        $this->optionsMock->expects($this->once())
             ->method('isSslEnabled')
             ->willReturn($sslEnabled);
         $this->optionsMock->expects($this->once())
@@ -99,10 +98,18 @@ public function testSSLConnection($sslEnabled, $connectionClass)
             ->method('getSslOptions')
             ->willReturn(null);
 
+        $connection = $this->objectManager->getObject($connectionClass, [
+                '127.0.0.1',
+                '5672',
+                'guest',
+                'guest',
+                '/']
+        );
+
         $this->objectManagerInterface->expects($this->any())
             ->method('create')
             ->with($connectionClass)
-            ->willReturn($this->createMock($connectionClass));
+            ->willReturn($connection);
 
         \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerInterface);
 
@@ -118,12 +125,12 @@ public static function connectionDataProvider()
     {
         return [
             [
-                'sslEnabled' => true,
-                'connectionClass' => AMQPSSLConnection::class,
+                'ssl_enabled' => true,
+                'connection_class' => AMQPConnectionConfig::class,
             ],
             [
-                'sslEnabled' => false,
-                'connectionClass' => AMQPStreamConnection::class,
+                'ssl_enabled' => false,
+                'connection_class' => AMQPConnectionConfig::class,
             ],
         ];
     }