rename bucket

jgoux · jgoux · commit adfb50df1c25 · 2024-08-15T11:01:03.000+02:00
diff --git a/apps/proxy/.env.example b/apps/proxy/.env.example
@@ -1,4 +1,4 @@
-BUCKET_NAME=test
+BUCKET_NAME=s3fs
 AWS_REGION=us-east-1
 S3FS_MOUNT=/mnt/s3
 DATA_MOUNT=/mnt/data
diff --git a/apps/proxy/tools/certbot/.env.example b/apps/proxy/tools/certbot/.env.example
@@ -5,5 +5,5 @@ AWS_ACCESS_KEY_ID=minioadmin
 AWS_ENDPOINT_URL_S3=http://minio:9000
 AWS_REGION=us-east-1
 AWS_SECRET_ACCESS_KEY=minioadmin
-BUCKET_NAME=test
+BUCKET_NAME=s3fs
 S3FS_MOUNT=/mnt/s3
diff --git a/apps/web/.env.example b/apps/web/.env.example
@@ -4,7 +4,7 @@ NEXT_PUBLIC_IS_PREVIEW=true
 NEXT_PUBLIC_WILDCARD_DOMAIN=db.example.com
 
 OPENAI_API_KEY="<openai-api-key>"
-S3_BUCKET=test
+S3_BUCKET=s3fs
 S3_ENDPOINT=http://localhost:54321/storage/v1/s3
 AWS_ACCESS_KEY_ID=625729a08b95bf1b7ff351a663f3a23c
 AWS_SECRET_ACCESS_KEY=850181e4652dd023b7a98c58ae0d2d34bd487ee0cc3254aed6eda37307425907
diff --git a/apps/web/app/api/databases/[id]/upload/route.ts b/apps/web/app/api/databases/[id]/upload/route.ts
@@ -1,5 +1,5 @@
-import { S3Client } from '@aws-sdk/client-s3'
-import { Upload } from '@aws-sdk/lib-storage'
+// import { S3Client } from '@aws-sdk/client-s3'
+// import { Upload } from '@aws-sdk/lib-storage'
 import { NextRequest, NextResponse } from 'next/server'
 import { createGzip } from 'zlib'
 import { Readable } from 'stream'
@@ -8,7 +8,7 @@ import { createScramSha256Data } from 'pg-gateway'
 import { generateDatabasePassword } from '~/utils/generate-database-password'
 
 const wildcardDomain = process.env.NEXT_PUBLIC_WILDCARD_DOMAIN ?? 'db.example.com'
-const s3Client = new S3Client({ endpoint: process.env.S3_ENDPOINT, forcePathStyle: true })
+// const s3Client = new S3Client({ endpoint: process.env.S3_ENDPOINT, forcePathStyle: true })
 
 export type DatabaseUploadResponse =
   | {
@@ -79,17 +79,21 @@ export async function POST(
   const gzip = createGzip()
   const body = Readable.from(streamToAsyncIterable(dump.stream()))
 
-  const upload = new Upload({
-    client: s3Client,
-    params: {
-      Bucket: process.env.S3_BUCKET,
-      Key: key,
-      Body: body.pipe(gzip),
-    },
-  })
-
-  await upload.done()
-
+  // const upload = new Upload({
+  //   client: s3Client,
+  //   params: {
+  //     Bucket: process.env.S3_BUCKET,
+  //     Key: key,
+  //     Body: body.pipe(gzip),
+  //   },
+  // })
+
+  // await upload.done()
+
+  const { data: storageData, error: storageError } = await supabase.storage
+    .from(process.env.S3_BUCKET!)
+    .upload(key, body.pipe(gzip), { upsert: true, duplex: 'half' })
+  console.log(storageData, storageError)
   const { data: existingDeployedDatabase } = await supabase
     .from('deployed_databases')
     .select('id')
diff --git a/supabase/config.toml b/supabase/config.toml
@@ -73,7 +73,7 @@ file_size_limit = "50MiB"
 [storage.image_transformation]
 enabled = true
 
-[storage.buckets.test]
+[storage.buckets.s3fs]
 public = false
 
 [auth]
diff --git a/supabase/migrations/20240815085531_storage.sql b/supabase/migrations/20240815085531_storage.sql
@@ -0,0 +1,7 @@
+create policy "Users can upload files to the s3fs bucket"
+on storage.objects
+for insert to authenticated
+with check (
+  bucket_id = 's3fs' and
+  (storage.foldername(name))[1] = 'dbs'
+);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-BUCKET_NAME=test`
	`1`	`+BUCKET_NAME=s3fs`
`2`	`2`	`AWS_REGION=us-east-1`
`3`	`3`	`S3FS_MOUNT=/mnt/s3`
`4`	`4`	`DATA_MOUNT=/mnt/data`