summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/s3-external.yml71
-rw-r--r--apps/files_external/tests/Storage/Amazons3Test.php6
-rw-r--r--apps/files_external/tests/Storage/VersionedAmazonS3Test.php43
-rw-r--r--tests/lib/Files/Storage/Storage.php3
4 files changed, 117 insertions, 6 deletions
diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml
index c51d070533d..497de81ae2f 100644
--- a/.github/workflows/s3-external.yml
+++ b/.github/workflows/s3-external.yml
@@ -14,7 +14,7 @@ env:
APP_NAME: files_external
jobs:
- s3-external-tests:
+ s3-external-tests-minio:
runs-on: ubuntu-latest
strategy:
@@ -23,11 +23,14 @@ jobs:
matrix:
php-versions: ['7.4', '8.0']
- name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
+ name: php${{ matrix.php-versions }}-minio
services:
minio:
- image: minio/minio:RELEASE.2021-10-06T23-36-31Z
+ env:
+ MINIO_ACCESS_KEY: minio
+ MINIO_SECRET_KEY: minio123
+ image: bitnami/minio:2021.10.6
ports:
- "9000:9000"
@@ -52,14 +55,70 @@ jobs:
php -S localhost:8080 &
- name: PHPUnit
run: |
- echo "<?php return ['run' => true,'hostname' => 'localhost','key' => 'minioadmin','secret' => 'minioadmin', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
+ echo "<?php return ['run' => true,'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
+ phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
+ - name: S3 logs
+ if: always()
+ run: |
+ docker ps -a
+ docker logs $(docker ps -aq)
+ s3-external-tests-localstack:
+ runs-on: ubuntu-latest
+
+ strategy:
+ # do not stop on another job's failure
+ fail-fast: false
+ matrix:
+ php-versions: ['7.4', '8.0']
+
+ name: php${{ matrix.php-versions }}-localstack
+
+ services:
+ minio:
+ env:
+ SERVICES: s3
+ DEBUG: 1
+ image: localstack/localstack:0.12.7
+ ports:
+ - "4566:4566"
+
+ steps:
+ - name: Checkout server
+ uses: actions/checkout@v2
+ with:
+ submodules: true
+
+ - name: Set up php ${{ matrix.php-versions }}
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php-versions }}
+ tools: phpunit
+ extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+
+ - name: Set up Nextcloud
+ run: |
+ mkdir data
+ ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
+ ./occ app:enable --force ${{ env.APP_NAME }}
+ php -S localhost:8080 &
+ - name: PHPUnit
+ run: |
+ echo "<?php return ['run' => true,'hostname' => 'localhost','key' => 'ignored','secret' => 'ignored', 'bucket' => 'bucket', 'port' => 4566, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
+ phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
+ phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
+ - name: S3 logs
+ if: always()
+ run: |
+ docker ps -a
+ docker logs $(docker ps -aq)
+
s3-external-summary:
runs-on: ubuntu-latest
- needs: s3-external-tests
+ needs: [s3-external-tests-minio, s3-external-tests-localstack]
if: always()
steps:
- name: Summary status
- run: if ${{ needs.s3-external-tests.result != 'success' }}; then exit 1; fi
+ run: if ${{ needs.s3-external-tests-minio.result != 'success' }} || ${{ needs.s3-external-tests-localstack.result != 'success' }}; then exit 1; fi
diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php
index c013d304cce..d231539fb54 100644
--- a/apps/files_external/tests/Storage/Amazons3Test.php
+++ b/apps/files_external/tests/Storage/Amazons3Test.php
@@ -38,6 +38,8 @@ use OCA\Files_External\Lib\Storage\AmazonS3;
*/
class Amazons3Test extends \Test\Files\Storage\Storage {
private $config;
+ /** @var AmazonS3 */
+ protected $instance;
protected function setUp(): void {
parent::setUp();
@@ -60,4 +62,8 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
public function testStat() {
$this->markTestSkipped('S3 doesn\'t update the parents folder mtime');
}
+
+ public function testHashInFileName() {
+ $this->markTestSkipped('Localstack has a bug with hashes in filename');
+ }
}
diff --git a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
new file mode 100644
index 00000000000..a16a9944d57
--- /dev/null
+++ b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2021 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 OCA\Files_External\Tests\Storage;
+
+/**
+ * @group DB
+ */
+class VersionedAmazonS3Test extends Amazons3Test {
+ protected function setUp(): void {
+ parent::setUp();
+ try {
+ $this->instance->getConnection()->putBucketVersioning([
+ 'Bucket' => $this->instance->getBucket(),
+ 'VersioningConfiguration' => [
+ 'Status' => 'Enabled',
+ ],
+ ]);
+ } catch (\Exception $e) {
+ $this->markTestSkipped("s3 backend doesn't seem to support versioning");
+ }
+ }
+}
diff --git a/tests/lib/Files/Storage/Storage.php b/tests/lib/Files/Storage/Storage.php
index 9fae1a8484a..c4248b7e0da 100644
--- a/tests/lib/Files/Storage/Storage.php
+++ b/tests/lib/Files/Storage/Storage.php
@@ -498,6 +498,9 @@ abstract class Storage extends \Test\TestCase {
$this->assertTrue($this->instance->file_exists('target/subfolder'));
$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
+ $contents = iterator_to_array($this->instance->getDirectoryContent(''));
+ $this->assertCount(1, $contents);
+
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 03:22:10 +0000