From bf06cd4c134a1edde1213632ca0334302f12dd2b Mon Sep 17 00:00:00 2001 From: Hammad Jutt Date: Wed, 9 Jun 2021 12:11:08 -0600 Subject: [PATCH] Use environment variable for SourceCred ledger branch This prevents people from accidentally mesing up the master ledger in local / staging environments. --- packages/backend/src/config.ts | 7 +++++-- packages/backend/src/lib/sourcecredLedger.ts | 2 +- packages/discord-bot/src/config.ts | 5 +++++ packages/discord-bot/src/sourcecred.ts | 2 +- render.yaml | 4 ++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 0781ae66..7691590a 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -12,7 +12,7 @@ interface IConfig { infuraId: string; pSEEDAddress: string; brightIdAppUrl: string; - discordBotToken: string; + sourceCredLedgerBranch: string; } function parseEnv( @@ -73,5 +73,8 @@ export const CONFIG: IConfig = { process.env.NEXT_BRIGHTID_APP_URL, 'https://app.brightid.org', ), - discordBotToken: parseEnv(process.env.DISCORD_BOT_TOKEN, ''), + sourceCredLedgerBranch: parseEnv( + process.env.SOURCECRED_LEDGER_BRANCH, + 'staging', // Just so we dont mess up the master ledger in case people are testing locally + ), }; diff --git a/packages/backend/src/lib/sourcecredLedger.ts b/packages/backend/src/lib/sourcecredLedger.ts index cb6e7329..8847cf52 100644 --- a/packages/backend/src/lib/sourcecredLedger.ts +++ b/packages/backend/src/lib/sourcecredLedger.ts @@ -6,7 +6,7 @@ import { CONFIG } from '../config'; const storage = new sourcecred.ledger.storage.GithubStorage({ apiToken: CONFIG.githubApiToken, repo: 'MetaFam/XP', - branch: 'master', + branch: CONFIG.sourceCredLedgerBranch, }); export const ledgerManager: LedgerManager = new sourcecred.ledger.manager.LedgerManager( diff --git a/packages/discord-bot/src/config.ts b/packages/discord-bot/src/config.ts index 0eca0167..e92acf41 100644 --- a/packages/discord-bot/src/config.ts +++ b/packages/discord-bot/src/config.ts @@ -9,6 +9,7 @@ interface IConfig { githubApiToken: string; discordBotToken: string; discordBotClientSecret: string; + sourceCredLedgerBranch: string; } function parseEnv( @@ -42,4 +43,8 @@ export const CONFIG: IConfig = { githubApiToken: parseEnv(process.env.GITHUB_API_TOKEN, ''), discordBotToken: parseEnv(process.env.DISCORD_BOT_TOKEN, ''), discordBotClientSecret: parseEnv(process.env.DISCORD_BOT_CLIENT_SECRET, ''), + sourceCredLedgerBranch: parseEnv( + process.env.SOURCECRED_LEDGER_BRANCH, + 'staging', // Just so we dont mess up the master ledger in case people are testing locally + ), }; diff --git a/packages/discord-bot/src/sourcecred.ts b/packages/discord-bot/src/sourcecred.ts index 877a80f8..9c11804f 100644 --- a/packages/discord-bot/src/sourcecred.ts +++ b/packages/discord-bot/src/sourcecred.ts @@ -5,7 +5,7 @@ import { CONFIG } from './config'; const storage = new sourcecred.ledger.storage.GithubStorage({ apiToken: CONFIG.githubApiToken, repo: 'MetaFam/XP', - branch: 'master', + branch: CONFIG.sourceCredLedgerBranch, }); export const manager: LedgerManager = new sourcecred.ledger.manager.LedgerManager( diff --git a/render.yaml b/render.yaml index 2c76ada8..235eb0b1 100644 --- a/render.yaml +++ b/render.yaml @@ -15,6 +15,8 @@ services: - fromGroup: discord-secrets - fromGroup: github-secrets - fromGroup: backend-secrets + - key: SOURCECRED_LEDGER_BRANCH + value: master - key: GRAPHQL_HOST fromService: name: hasura @@ -108,6 +110,8 @@ services: value: 5000 - key: FRONTEND_URL value: https://my.metagame.wtf + - key: SOURCECRED_LEDGER_BRANCH + value: master - key: GRAPHQL_HOST fromService: name: hasura