AC-6974::Cloud Native S3 Web API test Failures -2.4-develop - Fixed GraphQL testCacheIdHeaderWithCurrency Test

Author: rimple-saini

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

@@ -21,26 +21,27 @@
 class ConfigOptionsList implements ConfigOptionsListInterface
 {
     /**
-     * Input key for the option
-     */
-    private const INPUT_KEY_SALT ='id_salt';
-
-    /**
-     * Path to the values in the deployment config
+     * @var Random
      */
-    private const CONFIG_PATH_SALT = 'cache/graphql/id_salt';
+    private $random;
 
     /**
-     * @var Random
+     * Deployment configuration
+     *
+     * @var DeploymentConfig
      */
-    private $random;
+    private $deploymentConfig;
 
     /**
      * @param Random $random
+     * @param DeploymentConfig $deploymentConfig
      */
-    public function __construct(Random $random)
-    {
+    public function __construct(
+        Random $random,
+        DeploymentConfig $deploymentConfig
+    ) {
         $this->random = $random;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -50,9 +51,9 @@ public function getOptions(): array
     {
         return [
             new TextConfigOption(
-                self::INPUT_KEY_SALT,
+                ConfigOptionsListConstants::INPUT_KEY_SALT,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
-                self::CONFIG_PATH_SALT,
+                ConfigOptionsListConstants::CONFIG_PATH_SALT,
                 'GraphQl Salt'
             ),
         ];
@@ -64,11 +65,18 @@ public function getOptions(): array
      */
     public function createConfig(array $data, DeploymentConfig $deploymentConfig)
     {
+        $currentIdSalt = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_SALT);
+
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
 
-        if (!$this->isDataEmpty($data, self::INPUT_KEY_SALT)) {
-            $salt = $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
-            $configData->set(self::CONFIG_PATH_SALT, $salt);
+        // Use given salt if set, else use current
+        $id_salt = $data[ConfigOptionsListConstants::INPUT_KEY_SALT] ?? $currentIdSalt;
+
+        // If there is no id_salt given or currently set, generate a new one
+        $id_salt = $id_salt ?? $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
+
+        if (!$this->isDataEmpty($data, ConfigOptionsListConstants::INPUT_KEY_SALT)) {
+            $configData->set(ConfigOptionsListConstants::CONFIG_PATH_SALT, $id_salt);
         }
 
         return [$configData];

lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php

@@ -40,6 +40,7 @@ class ConfigOptionsListConstants
     public const CONFIG_PATH_DB_LOGGER_LOG_EVERYTHING = 'db_logger/log_everything';
     public const CONFIG_PATH_DB_LOGGER_QUERY_TIME_THRESHOLD = 'db_logger/query_time_threshold';
     public const CONFIG_PATH_DB_LOGGER_INCLUDE_STACKTRACE = 'db_logger/include_stacktrace';
+    public const CONFIG_PATH_SALT = 'cache/graphql/id_salt';
     /**#@-*/
 
     /**
@@ -85,6 +86,7 @@ class ConfigOptionsListConstants
     public const INPUT_KEY_RESOURCE = 'resource';
     public const INPUT_KEY_SKIP_DB_VALIDATION = 'skip-db-validation';
     public const INPUT_KEY_CACHE_HOSTS = 'http-cache-hosts';
+    public const INPUT_KEY_SALT = 'id_salt';
     /**#@-*/
 
     /**#@+