ci/cd: using minio to test s3

store-craft · Jan 14, 2025 · c3ae7c2 · c3ae7c2
1 parent 411f7d2
commit c3ae7c2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@
 
 [![Core](https://github.com/store-craft/storecraft/actions/workflows/test.core.yml/badge.svg)](https://github.com/store-craft/storecraft/actions/workflows/test.core.yml)
 [![MongoDB](https://github.com/store-craft/storecraft/actions/workflows/test.database-mongodb.yml/badge.svg)](https://github.com/store-craft/storecraft/actions/workflows/test.database-mongodb.yml)[![SQLite / Postgres / MySQL](https://github.com/store-craft/storecraft/actions/workflows/test.database-sql.yml/badge.svg)](https://github.com/store-craft/storecraft/actions/workflows/test.database-sql.yml)
+[![S3 Compatible](https://github.com/store-craft/storecraft/actions/workflows/test.storage-s3-compatible.yml/badge.svg)](https://github.com/store-craft/storecraft/actions/workflows/test.storage-s3-compatible.yml)
+
 
 # The <img src='https://storecraft.app/storecraft-color.svg' height='24px' style="transform: translateY(4px);" /> mono-repo
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/rest/con.storage.routes.js b/packages/core/rest/con.storage.routes.js
@@ -57,7 +57,10 @@ export const create_routes = (app) => {
         res.sendJson(r);
       } else {
 
-        await app.storage.putStream(file_key, req.body);
+        await app.storage.putStream(
+          file_key, req.body, {}, 
+          parseInt(req.headers.get("Content-Length") ?? '0')
+        );
 
         res.headers.set(HEADER_PRESIGNED, 'false');
         res.end();

diff --git a/packages/core/storage/types.storage.d.ts b/packages/core/storage/types.storage.d.ts
@@ -85,7 +85,7 @@ export declare interface storage_driver {
    */
   putBlob: (key: string, blob: Blob, meta?: MetaData) => Promise<boolean>; 
   putArraybuffer: (key: string, buffer: ArrayBuffer, meta?: MetaData) => Promise<boolean>; 
-  putStream: (key: string, stream: Partial<ReadableStream<any>>, meta?: MetaData) => Promise<boolean>; 
+  putStream: (key: string, stream: Partial<ReadableStream<any>>, meta?: MetaData, bytesLength: number) => Promise<boolean>; 
   putSigned?: (key: string) => Promise<StorageSignedOperation | undefined>; 
 
   /**

diff --git a/packages/core/test-runner/storage/index.js b/packages/core/test-runner/storage/index.js
@@ -155,10 +155,7 @@ export const create = (storage, name) => {
     for (const d of data) {
       // @ts-ignore
       const success = await storage.putStream(
-        d.key, d.stream, 
-        {
-          'Content-Length': d.length
-        }
+        d.key, d.stream, {}, d.buffer.byteLength
       );
       // read
       const get_stream = await storage.getStream(d.key);

diff --git a/packages/storage/storage-s3-compatible/README.md b/packages/storage/storage-s3-compatible/README.md
@@ -5,6 +5,8 @@
        width='90%' />
 </div><hr/><br/>
 
+[![S3 Compatible](https://github.com/store-craft/storecraft/actions/workflows/test.storage-s3-compatible.yml/badge.svg)](https://github.com/store-craft/storecraft/actions/workflows/test.storage-s3-compatible.yml)
+
 `fetch` ready support for an `S3` like storage:
 - `Amazon S3`
 - `Cloudflare R2`

diff --git a/packages/storage/storage-s3-compatible/adapter.js b/packages/storage/storage-s3-compatible/adapter.js
@@ -136,10 +136,15 @@ export class S3CompatibleStorage {
    * 
    * @type {storage["putStream"]}
    */
-  async putStream(key, stream, meta) {
-    // @ts-ignore
+  async putStream(key, stream, meta={}, bytesLength=0) {
+    const extra_headers = {};
+    if(Boolean(bytesLength)) {
+      extra_headers["Content-Length"] = bytesLength;
+    }
+
     return this.#put_internal(
-      key, stream, meta
+      // @ts-ignore
+      key, stream, extra_headers
     );
   }
 

diff --git a/packages/storage/storage-s3-compatible/package.json b/packages/storage/storage-s3-compatible/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/storage-s3-compatible",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Official S3-Compatible Storage adapter for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "test": "node ./tests/storage.s3-compatible.test.js",
-    "prepublishOnly": "npm version patch --force"
+    "prepublishOnly": "npm version patch --force",
+    "sc-publish": "npm publish"
   },
   "type": "module",
   "main": "adapter.js",