Skip to content

Commit 99f1f6c

Browse files
committed
AC-6974::Cloud Native S3 Web API test Failures -2.4-develop - Fixed GraphQL testCacheIdHeaderWithCurrency Test
1 parent 4a78eac commit 99f1f6c

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig)
7272
// Use given salt if set, else use current
7373
$id_salt = $data[ConfigOptionsListConstants::INPUT_KEY_SALT] ?? $currentIdSalt;
7474

75-
// If there is no id_salt given or currently set, generate a new one
75+
// If there is no salt given or currently set, generate a new one
7676
$id_salt = $id_salt ?? $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
7777

78-
if (!$this->isDataEmpty($data, ConfigOptionsListConstants::INPUT_KEY_SALT)) {
79-
$configData->set(ConfigOptionsListConstants::CONFIG_PATH_SALT, $id_salt);
80-
}
78+
$configData->set(ConfigOptionsListConstants::CONFIG_PATH_SALT, $id_salt);
8179

8280
return [$configData];
8381
}
@@ -89,20 +87,4 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
8987
{
9088
return [];
9189
}
92-
93-
/**
94-
* Check if data ($data) with key ($key) is empty
95-
*
96-
* @param array $data
97-
* @param string $key
98-
* @return bool
99-
*/
100-
private function isDataEmpty(array $data, $key)
101-
{
102-
if (isset($data[$key]) && $data[$key] !== '') {
103-
return false;
104-
}
105-
106-
return true;
107-
}
10890
}

0 commit comments

Comments
 (0)