Skip to content

Backport 2.2 Set cache id prefix on installation #22329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Backport 2.2 Set cache id prefix on installation #22329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9519a46
Update Utility.php
Ctucker9233 Apr 6, 2019
73051ba
Update AbstractAggregateCalculator.php
Ctucker9233 Apr 6, 2019
2edcbc3
Update TaxTest.php
Ctucker9233 Apr 6, 2019
f0a01e4
Create full_discount_with_tax.php
Ctucker9233 Apr 6, 2019
e3cf581
Merge pull request #2 from Ctucker9233/Ctucker9233-issue-10790
Ctucker9233 Apr 6, 2019
4b34cbf
Merge pull request #3 from magento/2.2-develop
Ctucker9233 Apr 13, 2019
16ec2c9
Revert "Update Utility.php"
Ctucker9233 Apr 13, 2019
c1078e3
Merge pull request #4 from Ctucker9233/revert-2-Ctucker9233-issue-10790
Ctucker9233 Apr 13, 2019
ce685a9
Update Cache.php
Ctucker9233 Apr 13, 2019
3c9b366
Update PageCache.php
Ctucker9233 Apr 13, 2019
1e44444
Update CacheTest.php
Ctucker9233 Apr 13, 2019
0c29ce8
Update PageCacheTest.php
Ctucker9233 Apr 13, 2019
5dfaef4
Merge pull request #5 from Ctucker9233/Ctucker9233-18641
Ctucker9233 Apr 13, 2019
b741929
Delete TaxTest.php
Ctucker9233 Apr 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
280 changes: 0 additions & 280 deletions dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
View file
Open in desktop

This file was deleted.

26 changes: 24 additions & 2 deletions setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ class Cache implements ConfigOptionsListInterface
const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';

const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';

/**
* @var array
Expand Down Expand Up @@ -77,7 +79,7 @@ public function __construct(RedisConnectionValidator $redisValidator)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getOptions()
{
Expand Down Expand Up @@ -112,7 +114,12 @@ public function getOptions()
TextConfigOption::FRONTEND_WIZARD_TEXT,
self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
'Redis server password'
)
),
new TextConfigOption(
self::INPUT_KEY_CACHE_ID_PREFIX,
TextConfigOption::FRONTEND_WIZARD_TEXT,
self::CONFIG_PATH_CACHE_ID_PREFIX,
'ID prefix for cache keys'
];
}

Expand All @@ -124,6 +131,11 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
$configData = new ConfigData(ConfigFilePool::APP_ENV);

if (isset($options[self::INPUT_KEY_CACHE_BACKEND])) {
if (isset($options[self::INPUT_KEY_CACHE_ID_PREFIX])) {
$configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $options[self::INPUT_KEY_CACHE_ID_PREFIX]);
} else {
$configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $this->generateCachePrefix());
}
if ($options[self::INPUT_KEY_CACHE_BACKEND] == self::INPUT_VALUE_CACHE_REDIS) {
$configData->set(self::CONFIG_PATH_CACHE_BACKEND, self::CONFIG_VALUE_CACHE_REDIS);
$this->setDefaultRedisConfig($deploymentConfig, $configData);
Expand Down Expand Up @@ -241,4 +253,14 @@ private function getDefaultConfigValue($inputKey)
return '';
}
}

/**
* Generate default cache ID prefix based on installation dir
*
* @return string
*/
private function generateCachePrefix(): string
{
return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
}
}
Loading