Drop exposed S3 handler in favor of @balena/pinejs-webresource-s3 han…

…dler Change-type: major
balena-io · Jan 6, 2025 · 7edc621 · 7edc621
1 parent 89b0cbf
commit 7edc621
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 154 deletions.
diff --git a/package.json b/package.json
@@ -69,6 +69,7 @@
   "devDependencies": {
     "@balena/lint": "^8.2.8",
     "@balena/pinejs": "file:./",
+    "@balena/pinejs-webresource-s3": "^1.0.2",
     "@faker-js/faker": "^9.3.0",
     "@types/busboy": "^1.5.4",
     "@types/chai": "^5.0.1",

diff --git a/src/webresource-handler/handlers/S3Handler.ts b/src/webresource-handler/handlers/S3Handler.ts
diff --git a/src/webresource-handler/handlers/index.ts b/src/webresource-handler/handlers/index.ts
@@ -1,2 +1 @@
 export * from './NoopHandler.js';
-export * from './S3Handler.js';
diff --git a/test/fixtures/06-webresource/config.ts b/test/fixtures/06-webresource/config.ts
@@ -1,21 +1,20 @@
 import type { ConfigLoader } from '@balena/pinejs';
-import { webResourceHandler } from '@balena/pinejs';
+import { S3Handler } from '@balena/pinejs-webresource-s3';
 import { v1AbstractSqlModel, v1Translations } from './translations/v1/index.js';
 import { requiredVar, intVar } from '@balena/env-parsing';
 
 const apiRoot = 'example';
 const modelName = 'example';
 const modelFile = import.meta.dirname + '/example.sbvr';
 
-const s3Handler: webResourceHandler.WebResourceHandler =
-	new webResourceHandler.S3Handler({
-		bucket: requiredVar('S3_STORAGE_ADAPTER_BUCKET'),
-		region: requiredVar('S3_REGION'),
-		accessKey: requiredVar('S3_ACCESS_KEY'),
-		secretKey: requiredVar('S3_SECRET_KEY'),
-		endpoint: requiredVar('S3_ENDPOINT'),
-		maxSize: intVar('PINEJS_WEBRESOURCE_MAXFILESIZE'),
-	});
+const s3Handler = new S3Handler({
+	bucket: requiredVar('S3_STORAGE_ADAPTER_BUCKET'),
+	region: requiredVar('S3_REGION'),
+	accessKey: requiredVar('S3_ACCESS_KEY'),
+	secretKey: requiredVar('S3_SECRET_KEY'),
+	endpoint: requiredVar('S3_ENDPOINT'),
+	maxSize: intVar('PINEJS_WEBRESOURCE_MAXFILESIZE'),
+});
 
 export default {
 	models: [
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './NoopHandler.js';
		export * from './S3Handler.js';