From 723026cc5986847b1d56554c8ecef165f66281a2 Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Thu, 24 Oct 2024 22:08:00 +0700 Subject: [PATCH] chore: update datalake configs (#7033) Signed-off-by: Alexander Onnikov --- server/datalake/src/client.ts | 1 + workers/datalake/schema/datalake.sql | 2 +- workers/datalake/wrangler.toml | 74 +++++++++++++++++++++++++--- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/server/datalake/src/client.ts b/server/datalake/src/client.ts index 807c63145a..2330454c90 100644 --- a/server/datalake/src/client.ts +++ b/server/datalake/src/client.ts @@ -230,6 +230,7 @@ export class Client { } }) } catch (err) { + ctx.error('failed to upload via signed url', { workspace, objectName, err }) await this.signObjectDelete(ctx, workspace, objectName) throw new Error('Failed to upload via signed URL') } diff --git a/workers/datalake/schema/datalake.sql b/workers/datalake/schema/datalake.sql index 4dfbfed035..d9b36f1b0b 100644 --- a/workers/datalake/schema/datalake.sql +++ b/workers/datalake/schema/datalake.sql @@ -7,7 +7,7 @@ DROP TYPE IF EXISTS blob.location; -- B L O B -CREATE TYPE blob.location AS ENUM ('kv', 'weur', 'eeur', 'wnam', 'enam', 'apac'); +CREATE TYPE blob.location AS ENUM ('weur', 'eeur', 'wnam', 'enam', 'apac'); \echo "Creating blob.data..." CREATE TABLE blob.data ( diff --git a/workers/datalake/wrangler.toml b/workers/datalake/wrangler.toml index 12f3afc6a3..f578e1f574 100644 --- a/workers/datalake/wrangler.toml +++ b/workers/datalake/wrangler.toml @@ -10,16 +10,16 @@ kv_namespaces = [ ] r2_buckets = [ - { binding = "DATALAKE_APAC", bucket_name = "datalake-apac", preview_bucket_name = "dev-datalake-eu-west" }, - { binding = "DATALAKE_EEUR", bucket_name = "datalake-eeur", preview_bucket_name = "dev-datalake-eu-west" }, - { binding = "DATALAKE_WEUR", bucket_name = "datalake-weur", preview_bucket_name = "dev-datalake-eu-west" }, - { binding = "DATALAKE_ENAM", bucket_name = "datalake-enam", preview_bucket_name = "dev-datalake-eu-west" }, - { binding = "DATALAKE_WNAM", bucket_name = "datalake-wnam", preview_bucket_name = "dev-datalake-eu-west" } + { binding = "DATALAKE_APAC", bucket_name = "datalake-eu-west", preview_bucket_name = "dev-datalake-eu-west" }, + { binding = "DATALAKE_EEUR", bucket_name = "datalake-eu-west", preview_bucket_name = "dev-datalake-eu-west" }, + { binding = "DATALAKE_WEUR", bucket_name = "datalake-eu-west", preview_bucket_name = "dev-datalake-eu-west" }, + { binding = "DATALAKE_ENAM", bucket_name = "datalake-eu-west", preview_bucket_name = "dev-datalake-eu-west" }, + { binding = "DATALAKE_WNAM", bucket_name = "datalake-eu-west", preview_bucket_name = "dev-datalake-eu-west" } ] [[hyperdrive]] binding = "HYPERDRIVE" -id = "87259c3ae41e41a7b35e610d4282d85a" +id = "055e968f3067414eaa30467d8a9c5021" localConnectionString = "postgresql://root:roach@localhost:26257/datalake" [observability] @@ -46,3 +46,65 @@ DATALAKE_WNAM_BUCKET_NAME = "datalake-wnam" # STREAMS_ACCOUNT_ID = "" # STREAMS_AUTH_KEY = "" # R2_ACCOUNT_ID = "" + + +[env.staging] +name = "datalake-worker-staging" + +kv_namespaces = [ + { binding = "datalake_blobs", id = "d52f8b6a9a1e495a8d6625d14d8f3188" } +] + +r2_buckets = [ + { binding = "DATALAKE_APAC", bucket_name = "datalake-staging-wnam" }, + { binding = "DATALAKE_EEUR", bucket_name = "datalake-staging-wnam" }, + { binding = "DATALAKE_WEUR", bucket_name = "datalake-staging-weur" }, + { binding = "DATALAKE_ENAM", bucket_name = "datalake-staging-wnam" }, + { binding = "DATALAKE_WNAM", bucket_name = "datalake-staging-wnam" } +] + +hyperdrive = [ + { binding = "HYPERDRIVE", id = "1f713bb2ec1b464cb663983feca4c89e" } +] + +[env.staging.vars] +DATALAKE_EEUR_BUCKET_NAME = "datalake-staging-weur" +DATALAKE_WEUR_BUCKET_NAME = "datalake-staging-wnam" +DATALAKE_APAC_BUCKET_NAME = "datalake-staging-wnam" +DATALAKE_ENAM_BUCKET_NAME = "datalake-staging-wnam" +DATALAKE_WNAM_BUCKET_NAME = "datalake-staging-wnam" + +[env.staging.observability] +enabled = true +head_sampling_rate = 1 + + +[env.dev] +name = "datalake-worker-dev" + +kv_namespaces = [ + { binding = "datalake_blobs", id = "5acdcea18a504ab3a2d73556314b0047" } +] + +r2_buckets = [ + { binding = "DATALAKE_APAC", bucket_name = "datalake-dev" }, + { binding = "DATALAKE_EEUR", bucket_name = "datalake-dev" }, + { binding = "DATALAKE_WEUR", bucket_name = "datalake-dev" }, + { binding = "DATALAKE_ENAM", bucket_name = "datalake-dev" }, + { binding = "DATALAKE_WNAM", bucket_name = "datalake-dev" } +] + +hyperdrive = [ + { binding = "HYPERDRIVE", id = "055e968f3067414eaa30467d8a9c5021" } +] + +[env.dev.vars] +DATALAKE_EEUR_BUCKET_NAME = "datalake-dev" +DATALAKE_WEUR_BUCKET_NAME = "datalake-dev" +DATALAKE_APAC_BUCKET_NAME = "datalake-dev" +DATALAKE_ENAM_BUCKET_NAME = "datalake-dev" +DATALAKE_WNAM_BUCKET_NAME = "datalake-dev" + +[env.dev.observability] +enabled = true +head_sampling_rate = 1