Merge branch '2.4-develop' into spartans_pr_26082025

Author: magento-devops-queue-mgr-svc

app/code/Magento/Amqp/Setup/ConfigOptionsList.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\Amqp\Setup;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\TextConfigOption;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Deployment configuration options needed for Setup application
@@ -26,6 +26,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     public const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
     public const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
     public const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
+    public const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='queue-default-connection';
 
     /**
      * Path to the values in the deployment config
@@ -203,6 +204,11 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
             if (!$result) {
                 $errors[] = "Could not connect to the Amqp Server.";
             }
+
+            if (isset($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])
+                && $options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION] !== 'amqp') {
+                $errors = [];
+            }
         }
 
         return $errors;

app/code/Magento/AsyncConfig/etc/queue_publisher.xml

@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="async_config.saveConfig"/>
+    <publisher topic="async_config.saveConfig" queue="saveConfig"/>
 </config>

app/code/Magento/AsynchronousOperations/Model/MassConsumer.php

@@ -7,7 +7,9 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\MessageQueue\CallbackInvokerInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
 use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
 use Magento\Framework\MessageQueue\ConsumerInterface;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
@@ -41,24 +43,32 @@ class MassConsumer implements ConsumerInterface
      */
     private $registry;
 
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
     /**
      * Initialize dependencies.
      *
      * @param CallbackInvokerInterface $invoker
      * @param ConsumerConfigurationInterface $configuration
      * @param MassConsumerEnvelopeCallbackFactory $massConsumerEnvelopeCallback
      * @param Registry $registry
+     * @param ConsumerConfig|null $consumerConfig
      */
     public function __construct(
         CallbackInvokerInterface $invoker,
         ConsumerConfigurationInterface $configuration,
         MassConsumerEnvelopeCallbackFactory $massConsumerEnvelopeCallback,
-        Registry $registry
+        Registry $registry,
+        ?ConsumerConfig $consumerConfig = null
     ) {
         $this->invoker = $invoker;
         $this->configuration = $configuration;
         $this->massConsumerEnvelopeCallback = $massConsumerEnvelopeCallback;
         $this->registry = $registry;
+        $this->consumerConfig = $consumerConfig ?: ObjectManager::getInstance()->get(ConsumerConfig::class);
     }
 
     /**

app/code/Magento/Catalog/etc/queue_publisher.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="product_action_attribute.update"/>
-    <publisher topic="product_action_attribute.website.update"/>
-    <publisher topic="catalog_website_attribute_value_sync"/>
+    <publisher topic="product_action_attribute.update" queue="product_action_attribute.update"/>
+    <publisher topic="product_action_attribute.website.update" queue="product_action_attribute.website.update"/>
+    <publisher topic="catalog_website_attribute_value_sync" queue="catalog_website_attribute_value_sync"/>
 </config>

app/code/Magento/CatalogUrlRewrite/etc/queue_publisher.xml

@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="catalog_product_generate_urls"/>
+    <publisher topic="catalog_product_generate_urls" queue="catalog_product_generate_urls"/>
 </config>

app/code/Magento/ImportExport/etc/queue_publisher.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="import_export.export"/>
+    <publisher topic="import_export.export" queue="export"/>
 </config>

app/code/Magento/MediaContentSynchronization/etc/queue_publisher.xml

@@ -1,10 +1,10 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="media.content.synchronization"/>
+    <publisher topic="media.content.synchronization" queue="media.content.synchronization"/>
 </config>

app/code/Magento/MediaGalleryRenditions/etc/queue_publisher.xml

@@ -1,10 +1,10 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="media.gallery.renditions.update"/>
+    <publisher topic="media.gallery.renditions.update" queue="media.gallery.renditions.update"/>
 </config>

app/code/Magento/MediaGallerySynchronization/etc/queue_publisher.xml

@@ -1,10 +1,10 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="media.gallery.synchronization"/>
+    <publisher topic="media.gallery.synchronization" queue="media.gallery.synchronization"/>
 </config>

app/code/Magento/MediaStorage/etc/queue_publisher.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="media.storage.catalog.image.resize"/>
+    <publisher topic="media.storage.catalog.image.resize" queue="media.storage.catalog.image.resize"/>
 </config>