diff --git a/devTools/syncGraphersToR2/syncGraphersToR2.ts b/devTools/syncGraphersToR2/syncGraphersToR2.ts index 75c71543610..9e546950939 100644 --- a/devTools/syncGraphersToR2/syncGraphersToR2.ts +++ b/devTools/syncGraphersToR2/syncGraphersToR2.ts @@ -22,7 +22,6 @@ import { KnexReadonlyTransaction, knexReadonlyTransaction, } from "../../db/db.js" -import { R2GrapherConfigDirectory } from "../../adminSiteServer/chartConfigR2Helpers.js" import { DbRawChartConfig, excludeUndefined } from "@ourworldindata/utils" import { chunk } from "lodash" import ProgressBar from "progress" @@ -31,6 +30,7 @@ import { HexString, hexToBytes, } from "../../serverUtils/serverUtil.js" +import { R2GrapherConfigDirectory } from "@ourworldindata/types" type HashAndId = Pick diff --git a/wrangler.toml b/wrangler.toml index 0c232fd44b9..1d28e99e333 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -6,8 +6,8 @@ pages_build_output_dir = "./localBake" # Vars that should be available in all envs, including local dev [vars] ENV = "development" -GRAPHER_CONFIG_R2_BUCKET_URL = "https://grapher-configs-staging.ourworldindata.org" -GRAPHER_CONFIG_R2_BUCKET_FALLBACK_URL = "https://grapher-configs.ourworldindata.org" +GRAPHER_CONFIG_R2_BUCKET_URL = "https://grapher-configs-staging.owid.io" +GRAPHER_CONFIG_R2_BUCKET_FALLBACK_URL = "https://grapher-configs.owid.io" GRAPHER_CONFIG_R2_BUCKET_FALLBACK_PATH = "v1" @@ -16,8 +16,8 @@ GRAPHER_CONFIG_R2_BUCKET_FALLBACK_PATH = "v1" MAILGUN_DOMAIN = "mg.ourworldindata.org" SLACK_ERROR_CHANNEL_ID = "C016H0BNNB1" ENV = "preview" -GRAPHER_CONFIG_R2_BUCKET_URL = "https://grapher-configs-staging.ourworldindata.org" -GRAPHER_CONFIG_R2_BUCKET_FALLBACK_URL = "https://grapher-configs.ourworldindata.org" +GRAPHER_CONFIG_R2_BUCKET_URL = "https://grapher-configs-staging.owid.io" +GRAPHER_CONFIG_R2_BUCKET_FALLBACK_URL = "https://grapher-configs.owid.io" GRAPHER_CONFIG_R2_BUCKET_FALLBACK_PATH = "v1" # Overrides for CF production deployment @@ -28,7 +28,7 @@ compatibility_date = "2024-04-29" ENV = "production" MAILGUN_DOMAIN = "mg.ourworldindata.org" SLACK_ERROR_CHANNEL_ID = "C5JJW19PS" -GRAPHER_CONFIG_R2_BUCKET_URL = "https://grapher-configs.ourworldindata.org" +GRAPHER_CONFIG_R2_BUCKET_URL = "https://grapher-configs.owid.io" GRAPHER_CONFIG_R2_BUCKET_FALLBACK_URL = "" GRAPHER_CONFIG_R2_BUCKET_FALLBACK_PATH = "" GRAPHER_CONFIG_R2_BUCKET_PATH = "v1"