From f2c69b403e1617835246a0675fc0ec981107949c Mon Sep 17 00:00:00 2001 From: Matthieu Bergel Date: Fri, 10 Jan 2025 15:01:15 +0100 Subject: [PATCH] Remove unused env vars (#4360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✨ This improves the parity with admin-env.secret, so setting up a new dev environment requires less guesswork. Removed unused env vars from server settings: - GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER - GDOCS_SHARED_DRIVE_ID Move GDOCS_DONATE_FAQS_DOCUMENT_ID to admin-env.secret (see https://github.com/owid/ops/pull/252) --- .env.devcontainer | 1 - .env.example-full | 5 +++-- settings/serverSettings.ts | 8 +------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.env.devcontainer b/.env.devcontainer index dc8a8bd8d54..d21429eee6a 100644 --- a/.env.devcontainer +++ b/.env.devcontainer @@ -14,7 +14,6 @@ GDOCS_PRIVATE_KEY='' GDOCS_CLIENT_EMAIL='' GDOCS_CLIENT_ID='' GDOCS_BASIC_ARTICLE_TEMPLATE_URL='' -GDOCS_SHARED_DRIVE_ID='' R2_ENDPOINT='' IMAGE_HOSTING_R2_CDN_URL='' diff --git a/.env.example-full b/.env.example-full index 735d4a3f99e..acfd30949d6 100644 --- a/.env.example-full +++ b/.env.example-full @@ -19,8 +19,9 @@ GDOCS_PRIVATE_KEY= GDOCS_CLIENT_EMAIL= GDOCS_CLIENT_ID= GDOCS_BASIC_ARTICLE_TEMPLATE_URL= -GDOCS_SHARED_DRIVE_ID= -GDOCS_DONATE_FAQS_DOCUMENT_ID= # optional +GDOCS_DETAILS_ON_DEMAND_ID= +GDOCS_DONATE_FAQS_DOCUMENT_ID= +GDOCS_BACKPORTING_TARGET_FOLDER= # optional R2_ENDPOINT= # optional IMAGE_HOSTING_R2_CDN_URL= diff --git a/settings/serverSettings.ts b/settings/serverSettings.ts index 51959210ada..1b84d363d2e 100644 --- a/settings/serverSettings.ts +++ b/settings/serverSettings.ts @@ -123,14 +123,8 @@ export const GDOCS_CLIENT_ID: string = serverSettings.GDOCS_CLIENT_ID ?? "" export const GDOCS_BACKPORTING_TARGET_FOLDER: string = serverSettings.GDOCS_BACKPORTING_TARGET_FOLDER ?? "" -export const GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER: string = - serverSettings.GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER ?? "" - export const GDOCS_DONATE_FAQS_DOCUMENT_ID: string = - serverSettings.GDOCS_DONATE_FAQS_DOCUMENT_ID ?? - "194PNSFjgSlt9Zm5xYuDOF0l_GLKZbVxH2co3zCok_cE" - -export const GDOCS_SHARED_DRIVE_ID = serverSettings.GDOCS_SHARED_DRIVE_ID ?? "" + serverSettings.GDOCS_DONATE_FAQS_DOCUMENT_ID ?? "" export const GDOCS_DETAILS_ON_DEMAND_ID = serverSettings.GDOCS_DETAILS_ON_DEMAND_ID ?? ""