sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch from ocis/s3ng to decomposed/decomposed_s3 storage drivers

Browse Source 
ocis/s3ng are still supported for backwards compatibility reasons, but
they need to be configured using the decomposed/decomposed_s3 options.
This commit is contained in:
André Duffeck
2025-01-24 11:04:23 +01:00
parent e428d56443
commit 57fa8eb43c
24 changed files with 331 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/bootstrap/FeatureContext.php
+3 -3
View File
@@ -752,7 +752,7 @@ class FeatureContext extends BehatVariablesContext {
*/
public function getStorageUsersRoot(): string {
$ocDataPath = getenv("OC_BASE_DATA_PATH") ? getenv("OC_BASE_DATA_PATH") : getenv("HOME") . '/.opencloud';
return getenv("STORAGE_USERS_OCIS_ROOT") ? getenv("STORAGE_USERS_OCIS_ROOT") : $ocDataPath . "/storage/users";
return getenv("STORAGE_USERS_DECOMPOSED_ROOT") ? getenv("STORAGE_USERS_DECOMPOSED_ROOT") : $ocDataPath . "/storage/users";
}
/**
@@ -3008,9 +3008,9 @@ class FeatureContext extends BehatVariablesContext {
public static function isExpectedToFail(string $scenarioLine): bool {
$expectedFailFile = \getenv('EXPECTED_FAILURES_FILE');
if (!$expectedFailFile) {
$expectedFailFile = __DIR__ . '/../expected-failures-localAPI-on-OCIS-storage.md';
$expectedFailFile = __DIR__ . '/../expected-failures-localAPI-on-decomposed-storage.md';
if (\strpos($scenarioLine, "coreApi") === 0) {
$expectedFailFile = __DIR__ . '/../expected-failures-API-on-OCIS-storage.md';
$expectedFailFile = __DIR__ . '/../expected-failures-API-on-decomposed-storage.md';
}
}