🚧 s3client doesn't work inside worker, removing it

owid · Aug 8, 2024 · c684c2f · c684c2f
1 parent 4fbf269
commit c684c2f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 31 deletions.
diff --git a/functions/_common/grapherRenderer.ts b/functions/_common/grapherRenderer.ts
@@ -20,34 +20,34 @@ import { Env } from "../grapher/thumbnail/[slug].js"
 import { R2GrapherConfigDirectory } from "@ourworldindata/types"
 import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3"
 
-async function getFileFromR2(key: string, env: Env): Promise<string | null> {
-    const s3Client = new S3Client({
-        endpoint: env.R2_ENDPOINT,
-        forcePathStyle: false,
-        region: env.R2_REGION,
-        credentials: {
-            accessKeyId: env.R2_ACCESS_KEY_ID,
-            secretAccessKey: env.R2_SECRET_ACCESS_KEY,
-        },
-    })
-
-    const params = {
-        Bucket: env.GRAPHER_CONFIG_R2_BUCKET,
-        Key: key,
-    }
-
-    try {
-        console.log("preparing s3 get")
-        const response = await s3Client.send(new GetObjectCommand(params))
-        console.log("got s3 response")
-        const content = await response.Body.transformToString()
-        console.log("got s3 content")
-        return content
-    } catch (err) {
-        if (err.name === "NoSuchKey") return null
-        else throw err
-    }
-}
+// async function getFileFromR2(key: string, env: Env): Promise<string | null> {
+//     const s3Client = new S3Client({
+//         endpoint: env.R2_ENDPOINT,
+//         forcePathStyle: false,
+//         region: env.R2_REGION,
+//         credentials: {
+//             accessKeyId: env.R2_ACCESS_KEY_ID,
+//             secretAccessKey: env.R2_SECRET_ACCESS_KEY,
+//         },
+//     })
+
+//     const params = {
+//         Bucket: env.GRAPHER_CONFIG_R2_BUCKET,
+//         Key: key,
+//     }
+
+//     try {
+//         console.log("preparing s3 get")
+//         const response = await s3Client.send(new GetObjectCommand(params))
+//         console.log("got s3 response")
+//         const content = await response.Body.transformToString()
+//         console.log("got s3 content")
+//         return content
+//     } catch (err) {
+//         if (err.name === "NoSuchKey") return null
+//         else throw err
+//     }
+// }
 
 declare global {
     // eslint-disable-next-line no-var

diff --git a/functions/package.json b/functions/package.json
@@ -1,7 +1,6 @@
 {
   "name": "owid-functions",
   "dependencies": {
-    "@aws-sdk/client-s3": "3.572.0",
     "@ourworldindata/grapher": "workspace:^",
     "@ourworldindata/utils": "workspace:^",
     "itty-router": "^5.0.17",

diff --git a/yarn.lock b/yarn.lock
@@ -425,7 +425,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-s3@npm:3.572.0, @aws-sdk/client-s3@npm:^3.572.0":
+"@aws-sdk/client-s3@npm:^3.572.0":
   version: 3.572.0
   resolution: "@aws-sdk/client-s3@npm:3.572.0"
   dependencies:
@@ -15274,7 +15274,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "owid-functions@workspace:functions"
   dependencies:
-    "@aws-sdk/client-s3": "npm:3.572.0"
     "@cloudflare/workers-types": "npm:^4.20240614.0"
     "@ourworldindata/grapher": "workspace:^"
     "@ourworldindata/utils": "workspace:^"