[Pkg-owncloud-commits] [owncloud] 31/273: Add support for rackspace swift backends

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 159b603d1380410cb37e2a5ac1604f3ae90286c2
Author: Robin Appelman <icewind at owncloud.com>
Date:   Tue Jun 24 14:36:29 2014 +0200

    Add support for rackspace swift backends
---
 lib/private/files/objectstore/swift.php | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/lib/private/files/objectstore/swift.php b/lib/private/files/objectstore/swift.php
index 505b5be..be12d45 100644
--- a/lib/private/files/objectstore/swift.php
+++ b/lib/private/files/objectstore/swift.php
@@ -23,6 +23,7 @@ namespace OC\Files\ObjectStore;
 use Guzzle\Http\Exception\ClientErrorResponseException;
 use OCP\Files\ObjectStore\IObjectStore;
 use OpenCloud\OpenStack;
+use OpenCloud\Rackspace;
 
 class Swift implements IObjectStore {
 
@@ -37,9 +38,6 @@ class Swift implements IObjectStore {
 	private $container;
 
 	public function __construct($params) {
-		if (!isset($params['username']) || !isset($params['password'])) {
-			throw new \Exception('Access Key and Secret have to be configured.');
-		}
 		if (!isset($params['container'])) {
 			$params['container'] = 'owncloud';
 		}
@@ -48,24 +46,17 @@ class Swift implements IObjectStore {
 			$params['autocreate'] = false;
 		}
 
-		$secret = array(
-			'username' => $params['username'],
-			'password' => $params['password']
-		);
-		if (isset($params['tenantName'])) {
-			$secret['tenantName'] = $params['tenantName'];
-		}
-		if (isset($params['tenantId'])) {
-			$secret['tenantId'] = $params['tenantId'];
-		}
-
 		// the OpenCloud client library will default to 'cloudFiles' if $serviceName is null
 		$serviceName = null;
 		if ($params['serviceName']) {
 			$serviceName = $params['serviceName'];
 		}
 
-		$client = new OpenStack($params['url'], $secret);
+		if (isset($params['apiKey'])) {
+			$client = new Rackspace($params['url'], $params);
+		} else {
+			$client = new OpenStack($params['url'], $params);
+		}
 
 		$this->objectStoreService = $client->objectStoreService($serviceName, $params['region']);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git