mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9483 from nextcloud/azure-blob 

add azure object storage backend
This commit is contained in:
Morris Jobke 2018-06-04 16:54:21 +02:00 committed by GitHub
parent 2d2c9ec8db ac26175a17
commit bc008f8d5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 183 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.drone.yml
View File

@ -782,6 +782,8 @@ matrix:
- TESTS: carddavtester-old-endpoint
- TESTS: object-store
OBJECT_STORE: s3
- TESTS: object-store
OBJECT_STORE: azure
# - TESTS: object-store
# OBJECT_STORE: swift
# SWIFT-AUTH: v2.0
@ -883,6 +885,13 @@ services:
when:
matrix:
OBJECT_STORE: s3
azurite:
image: arafato/azurite
environment:
- executable=blob
when:
matrix:
OBJECT_STORE: azure
dockswift:
image: icewind1991/dockswift:nextcloud-ci
environment:

2
3rdparty

@ -1 +1 @@
Subproject commit b0f180458ab55af9d6a1550f2b62dee3fdc6e1ef
Subproject commit 298ba695f5995ea65cb0a2ffa8a375805d7fcd1a

3
autotest.sh
View File

@ -369,6 +369,9 @@ function execute_tests {
if [ "$TEST_SELECTION" == "PRIMARY-s3" ]; then
GROUP='--group PRIMARY-s3'
fi
if [ "$TEST_SELECTION" == "PRIMARY-azure" ]; then
GROUP='--group PRIMARY-azure'
fi
if [ "$TEST_SELECTION" == "PRIMARY-swift" ]; then
GROUP='--group PRIMARY-swift'
fi

1
lib/composer/composer/autoload_classmap.php
View File

@ -674,6 +674,7 @@ return array(
'OC\\Files\\Node\\Root' => $baseDir . '/lib/private/Files/Node/Root.php',
'OC\\Files\\Notify\\Change' => $baseDir . '/lib/private/Files/Notify/Change.php',
'OC\\Files\\Notify\\RenameChange' => $baseDir . '/lib/private/Files/Notify/RenameChange.php',
'OC\\Files\\ObjectStore\\Azure' => $baseDir . '/lib/private/Files/ObjectStore/Azure.php',
'OC\\Files\\ObjectStore\\HomeObjectStoreStorage' => $baseDir . '/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php',
'OC\\Files\\ObjectStore\\Mapper' => $baseDir . '/lib/private/Files/ObjectStore/Mapper.php',
'OC\\Files\\ObjectStore\\NoopScanner' => $baseDir . '/lib/private/Files/ObjectStore/NoopScanner.php',

1
lib/composer/composer/autoload_static.php
View File

@ -704,6 +704,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Files\\Node\\Root' => __DIR__ . '/../../..' . '/lib/private/Files/Node/Root.php',
'OC\\Files\\Notify\\Change' => __DIR__ . '/../../..' . '/lib/private/Files/Notify/Change.php',
'OC\\Files\\Notify\\RenameChange' => __DIR__ . '/../../..' . '/lib/private/Files/Notify/RenameChange.php',
'OC\\Files\\ObjectStore\\Azure' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Azure.php',
'OC\\Files\\ObjectStore\\HomeObjectStoreStorage' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php',
'OC\\Files\\ObjectStore\\Mapper' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Mapper.php',
'OC\\Files\\ObjectStore\\NoopScanner' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/NoopScanner.php',

118
lib/private/Files/ObjectStore/Azure.php Normal file
View File

@ -0,0 +1,118 @@
<?php
/**
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Files\ObjectStore;
use MicrosoftAzure\Storage\Blob\BlobRestProxy;
use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
use OCP\Files\ObjectStore\IObjectStore;
class Azure implements IObjectStore {
/** @var string */
private $containerName;
/** @var string */
private $accountName;
/** @var string */
private $accountKey;
/** @var BlobRestProxy|null */
private $blobClient = null;
/** @var string|null */
private $endpoint = null;
/** @var bool */
private $autoCreate = false;
/**
* @param array $parameters
*/
public function __construct($parameters) {
$this->containerName = $parameters['container'];
$this->accountName = $parameters['account_name'];
$this->accountKey = $parameters['account_key'];
if (isset($parameters['endpoint'])) {
$this->endpoint = $parameters['endpoint'];
}
if (isset($parameters['autocreate'])) {
$this->autoCreate = $parameters['autocreate'];
}
}
/**
* @return BlobRestProxy
*/
private function getBlobClient() {
if (!$this->blobClient) {
$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
$connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
if ($this->endpoint) {
$connectionString .= ';BlobEndpoint=' . $this->endpoint;
}
$this->blobClient = BlobRestProxy::createBlobService($connectionString);
if ($this->autoCreate) {
try {
$this->blobClient->createContainer($this->containerName);
} catch (ServiceException $e) {
if ($e->getCode() === 409) {
// already exists
} else {
throw $e;
}
}
}
}
return $this->blobClient;
}
/**
* @return string the container or bucket name where objects are stored
*/
public function getStorageId() {
return 'azure::blob::' . $this->containerName;
}
/**
* @param string $urn the unified resource name used to identify the object
* @return resource stream with the read data
* @throws \Exception when something goes wrong, message will be logged
*/
public function readObject($urn) {
$blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
return $blob->getContentStream();
}
/**
* @param string $urn the unified resource name used to identify the object
* @param resource $stream stream with the data to write
* @throws \Exception when something goes wrong, message will be logged
*/
public function writeObject($urn, $stream) {
$this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream);
}
/**
* @param string $urn the unified resource name used to identify the object
* @return void
* @throws \Exception when something goes wrong, message will be logged
*/
public function deleteObject($urn) {
$this->getBlobClient()->deleteBlob($this->containerName, $urn);
}
}

38
tests/lib/Files/ObjectStore/AzureTest.php Normal file
View File

@ -0,0 +1,38 @@
<?php
/**
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test\Files\ObjectStore;
use OC\Files\ObjectStore\Azure;
/**
* @group PRIMARY-azure
*/
class AzureTest extends ObjectStoreTest {
protected function getInstance() {
$config = \OC::$server->getConfig()->getSystemValue('objectstore');
if (!is_array($config) || $config['class'] !== 'OC\\Files\\ObjectStore\\Azure') {
$this->markTestSkipped('objectstore not configured for azure');
}
return new Azure($config['arguments']);
}
}

12
tests/preseed-config.php
View File

@ -72,3 +72,15 @@ if (getenv('OBJECT_STORE') === 'swift') {
];
}
}
if (getenv('OBJECT_STORE') === 'azure') {
$CONFIG['objectstore'] = [
'class' => 'OC\\Files\\ObjectStore\\Azure',
'arguments' => array(
'container' => 'test',
'account_name' => 'devstoreaccount1',
'account_key' => 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
'endpoint' => 'http://' . (getenv('DRONE') === 'true' ? 'azurite' : 'localhost') . ':10000/devstoreaccount1',
'autocreate' => true
)
];
}