Merge pull request #56777 from nextcloud/backport/56772/stable31

AndyScherzinger · web-flow · commit 8a748a730582 · 2025-12-02T08:49:59.000+01:00
[stable31] feat(ObjectStore): Allow overriding arguments per bucket
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -34,6 +34,10 @@ protected function parseParams($params) {
 			throw new \Exception('Bucket has to be configured.');
 		}
 
+		if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {
+			$params = array_merge($params, $params['perBucket'][$params['bucket']]);
+		}
+
 		$this->id = 'amazon::' . $params['bucket'];
 
 		$this->test = isset($params['test']);

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ protected function parseParams($params) {`
`34`	`34`	`throw new \Exception('Bucket has to be configured.');`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {`
	`38`	`+ $params = array_merge($params, $params['perBucket'][$params['bucket']]);`
	`39`	`+ }`
	`40`	`+`
`37`	`41`	`$this->id = 'amazon::' . $params['bucket'];`
`38`	`42`
`39`	`43`	`$this->test = isset($params['test']);`