add azure unit tests with azurite

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2018-06-04 14:17:49 +02:00
parent 3f82ed377c
commit ac26175a17
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
5 changed files with 90 additions and 1 deletions

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:

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

View File

@ -22,6 +22,7 @@
namespace OC\Files\ObjectStore;
use MicrosoftAzure\Storage\Blob\BlobRestProxy;
use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
use OCP\Files\ObjectStore\IObjectStore;
class Azure implements IObjectStore {
@ -33,6 +34,10 @@ class Azure implements IObjectStore {
private $accountKey;
/** @var BlobRestProxy|null */
private $blobClient = null;
/** @var string|null */
private $endpoint = null;
/** @var bool */
private $autoCreate = false;
/**
* @param array $parameters
@ -41,6 +46,12 @@ class Azure implements IObjectStore {
$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'];
}
}
/**
@ -48,8 +59,24 @@ class Azure implements IObjectStore {
*/
private function getBlobClient() {
if (!$this->blobClient) {
$connectionString = "DefaultEndpointsProtocol=https;AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
$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;
}

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']);
}
}

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
)
];
}