From 95e85cca1bd5d8959045390a80cb0d5d666d7b90 Mon Sep 17 00:00:00 2001 From: Alexander Bohndorf Date: Mon, 10 Apr 2023 18:23:03 +0200 Subject: [PATCH 1/3] [BUGFIX] Fixes errors on initializing a registry on an Amazon S3 bucket (compatibility to Amazon S3 API v3) --- packages/oc-s3-storage-adapter/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/oc-s3-storage-adapter/src/index.ts b/packages/oc-s3-storage-adapter/src/index.ts index 974cb19..49e62d1 100644 --- a/packages/oc-s3-storage-adapter/src/index.ts +++ b/packages/oc-s3-storage-adapter/src/index.ts @@ -123,7 +123,7 @@ export default function s3Adapter(conf: S3Config): StorageAdapter { return streamToString(data.Body as any); } catch (err) { - throw (err as any).code === 'NoSuchKey' + throw (err as any).Code === 'NoSuchKey' ? { code: strings.errors.STORAGE.FILE_NOT_FOUND_CODE, msg: strings.errors.STORAGE.FILE_NOT_FOUND(filePath) @@ -176,7 +176,7 @@ export default function s3Adapter(conf: S3Config): StorageAdapter { Delimiter: '/' }); - if (data.CommonPrefixes!.length === 0) { + if (data.CommonPrefixes === undefined || data.CommonPrefixes.length === 0) { throw { code: strings.errors.STORAGE.DIR_NOT_FOUND_CODE, msg: strings.errors.STORAGE.DIR_NOT_FOUND(dir) From 0a5173061144a2745d90907b095d9ec28a1349a9 Mon Sep 17 00:00:00 2001 From: Alexander Bohndorf Date: Mon, 10 Apr 2023 18:40:43 +0200 Subject: [PATCH 2/3] [TASK] Bump version of oc-s3-storage-adapter to 2.1.2 --- packages/oc-s3-storage-adapter/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oc-s3-storage-adapter/package.json b/packages/oc-s3-storage-adapter/package.json index bb68b69..59f6bef 100644 --- a/packages/oc-s3-storage-adapter/package.json +++ b/packages/oc-s3-storage-adapter/package.json @@ -1,6 +1,6 @@ { "name": "oc-s3-storage-adapter", - "version": "2.1.1", + "version": "2.1.2", "description": "S3 storage adapter for OC", "main": "lib/index.js", "types": "lib/index.d.ts", From 6b4bee5d5079e5c5a3cc7405c3ce049a1d5c88b8 Mon Sep 17 00:00:00 2001 From: Alexander Bohndorf Date: Mon, 10 Apr 2023 18:58:11 +0200 Subject: [PATCH 3/3] [TASK] Undo bump version of oc-s3-storage-adapter to 2.1.2 --- packages/oc-s3-storage-adapter/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oc-s3-storage-adapter/package.json b/packages/oc-s3-storage-adapter/package.json index 59f6bef..bb68b69 100644 --- a/packages/oc-s3-storage-adapter/package.json +++ b/packages/oc-s3-storage-adapter/package.json @@ -1,6 +1,6 @@ { "name": "oc-s3-storage-adapter", - "version": "2.1.2", + "version": "2.1.1", "description": "S3 storage adapter for OC", "main": "lib/index.js", "types": "lib/index.d.ts",