Skip to content

Commit 6a91c1c

Browse files
authored
feat: add fernie slack app token to fai (#4705)
1 parent 2284d70 commit 6a91c1c

File tree

12 files changed

+29
-4
lines changed

12 files changed

+29
-4
lines changed

.github/workflows/ci-fai.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ jobs:
145145
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
146146
POSTGRES_DATABASE_URL: postgresql+asyncpg://postgres:postgres@db:5432/mydatabase
147147
ASK_FERN_SLACK_BOT_TOKEN: ${{ secrets.ASK_FERN_SLACK_BOT_TOKEN }}
148+
FERNIE_SLACK_BOT_TOKEN: ${{ secrets.FERNIE_SLACK_APP_TOKEN }}
148149
KV_REST_API_TOKEN: ${{ secrets.KV_REST_API_TOKEN }}
149150
KV_REST_API_READ_ONLY_TOKEN: ${{ secrets.KV_REST_API_READ_ONLY_TOKEN }}
150151
KV_REST_API_URL: ${{ secrets.KV_REST_API_URL }}
@@ -171,6 +172,7 @@ jobs:
171172
echo "POSTGRES_DATABASE_URL=${{ env.POSTGRES_DATABASE_URL }}" >> .env
172173
echo "FERN_TOKEN=${{ env.FERN_TOKEN }}" >> .env
173174
echo "ASK_FERN_SLACK_BOT_TOKEN=${{ env.ASK_FERN_SLACK_BOT_TOKEN }}" >> .env
175+
echo "FERNIE_SLACK_BOT_TOKEN=${{ env.FERNIE_SLACK_BOT_TOKEN }}" >> .env
174176
echo "FAI_LAMBDA_FUNCTION_NAME=${{ env.FAI_LAMBDA_FUNCTION_NAME }}" >> .env
175177
echo "DISCORD_BOT_TOKEN=${{ env.DISCORD_BOT_TOKEN }}" >> .env
176178
echo "DISCORD_OAUTH_URL=${{ env.DISCORD_OAUTH_URL }}" >> .env

.github/workflows/deploy-fai-dev.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
SLACK_CLIENT_SECRET: ${{ secrets.SLACK_CLIENT_SECRET }}
2727
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
2828
ASK_FERN_SLACK_BOT_TOKEN: ${{ secrets.ASK_FERN_SLACK_BOT_TOKEN }}
29+
FERNIE_SLACK_BOT_TOKEN: ${{ secrets.FERNIE_SLACK_APP_TOKEN }}
2930
FAI_LAMBDA_FUNCTION_NAME: ${{ secrets.FAI_LAMBDA_FUNCTION_NAME }}
3031
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
3132
DISCORD_OAUTH_URL: ${{ secrets.DISCORD_OAUTH_URL }}
@@ -56,6 +57,7 @@ jobs:
5657
echo "SLACK_CLIENT_SECRET=${{ env.SLACK_CLIENT_SECRET }}" >> .env
5758
echo "SLACK_SIGNING_SECRET=${{ env.SLACK_SIGNING_SECRET }}" >> .env
5859
echo "ASK_FERN_SLACK_BOT_TOKEN=${{ env.ASK_FERN_SLACK_BOT_TOKEN }}" >> .env
60+
echo "FERNIE_SLACK_BOT_TOKEN=${{ env.FERNIE_SLACK_BOT_TOKEN }}" >> .env
5961
echo "DISCORD_BOT_TOKEN=${{ env.DISCORD_BOT_TOKEN }}" >> .env
6062
echo "DISCORD_OAUTH_URL=${{ env.DISCORD_OAUTH_URL }}" >> .env
6163
echo "KV_REST_API_TOKEN=${{ env.KV_REST_API_TOKEN }}" >> .env

.github/workflows/deploy-fai-discord-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
SLACK_CLIENT_SECRET: ${{ secrets.SLACK_CLIENT_SECRET }}
2626
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
2727
ASK_FERN_SLACK_BOT_TOKEN: ${{ secrets.ASK_FERN_SLACK_BOT_TOKEN }}
28+
FERNIE_SLACK_BOT_TOKEN: ${{ secrets.FERNIE_SLACK_APP_TOKEN }}
2829
FAI_LAMBDA_FUNCTION_NAME: ${{ secrets.FAI_LAMBDA_FUNCTION_NAME }}
2930
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
3031
DISCORD_OAUTH_URL: ${{ secrets.DISCORD_OAUTH_URL }}

.github/workflows/deploy-fai-discord.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
SLACK_CLIENT_SECRET: ${{ secrets.SLACK_CLIENT_SECRET }}
2525
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
2626
ASK_FERN_SLACK_BOT_TOKEN: ${{ secrets.ASK_FERN_SLACK_BOT_TOKEN }}
27+
FERNIE_SLACK_BOT_TOKEN: ${{ secrets.FERNIE_SLACK_APP_TOKEN }}
2728
FAI_LAMBDA_FUNCTION_NAME: ${{ secrets.FAI_LAMBDA_FUNCTION_NAME }}
2829
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
2930
DISCORD_OAUTH_URL: ${{ secrets.DISCORD_OAUTH_URL }}
@@ -55,6 +56,7 @@ jobs:
5556
echo "SLACK_CLIENT_SECRET=${{ env.SLACK_CLIENT_SECRET }}" >> .env
5657
echo "SLACK_SIGNING_SECRET=${{ env.SLACK_SIGNING_SECRET }}" >> .env
5758
echo "ASK_FERN_SLACK_BOT_TOKEN=${{ env.ASK_FERN_SLACK_BOT_TOKEN }}" >> .env
59+
echo "FERNIE_SLACK_BOT_TOKEN=${{ env.FERNIE_SLACK_BOT_TOKEN }}" >> .env
5860
echo "FAI_LAMBDA_FUNCTION_NAME=${{ secrets.FAI_LAMBDA_FUNCTION_NAME }}" >> .env
5961
echo "DISCORD_BOT_TOKEN=${{ env.DISCORD_BOT_TOKEN }}" >> .env
6062
echo "DISCORD_OAUTH_URL=${{ env.DISCORD_OAUTH_URL }}" >> .env

.github/workflows/deploy-fai.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
SLACK_CLIENT_SECRET: ${{ secrets.SLACK_CLIENT_SECRET }}
2626
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
2727
ASK_FERN_SLACK_BOT_TOKEN: ${{ secrets.ASK_FERN_SLACK_BOT_TOKEN }}
28+
FERNIE_SLACK_BOT_TOKEN: ${{ secrets.FERNIE_SLACK_APP_TOKEN }}
2829
FAI_LAMBDA_FUNCTION_NAME: ${{ secrets.FAI_LAMBDA_FUNCTION_NAME }}
2930
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
3031
DISCORD_OAUTH_URL: ${{ secrets.DISCORD_OAUTH_URL }}
@@ -55,6 +56,7 @@ jobs:
5556
echo "SLACK_CLIENT_SECRET=${{ env.SLACK_CLIENT_SECRET }}" >> .env
5657
echo "SLACK_SIGNING_SECRET=${{ env.SLACK_SIGNING_SECRET }}" >> .env
5758
echo "ASK_FERN_SLACK_BOT_TOKEN=${{ env.ASK_FERN_SLACK_BOT_TOKEN }}" >> .env
59+
echo "FERNIE_SLACK_BOT_TOKEN=${{ env.FERNIE_SLACK_BOT_TOKEN }}" >> .env
5860
echo "DISCORD_BOT_TOKEN=${{ env.DISCORD_BOT_TOKEN }}" >> .env
5961
echo "DISCORD_OAUTH_URL=${{ env.DISCORD_OAUTH_URL }}" >> .env
6062
echo "KV_REST_API_TOKEN=${{ env.KV_REST_API_TOKEN }}" >> .env

servers/fai-discord/deploy/bin/deploy.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@ async function main() {
3737
SLACK_CLIENT_SECRET: getEnvVarOrThrow("SLACK_CLIENT_SECRET"),
3838
SLACK_SIGNING_SECRET: getEnvVarOrThrow("SLACK_SIGNING_SECRET"),
3939
ASK_FERN_SLACK_BOT_TOKEN: getEnvVarOrThrow("ASK_FERN_SLACK_BOT_TOKEN"),
40+
FERNIE_SLACK_BOT_TOKEN: getEnvVarOrThrow("FERNIE_SLACK_BOT_TOKEN"),
4041
FAI_LAMBDA_FUNCTION_NAME: getEnvVarOrThrow("FAI_LAMBDA_FUNCTION_NAME"),
4142
DISCORD_BOT_TOKEN: getEnvVarOrThrow("DISCORD_BOT_TOKEN"),
4243
DISCORD_OAUTH_URL: getEnvVarOrThrow("DISCORD_OAUTH_URL"),
4344
KV_REST_API_TOKEN: getEnvVarOrThrow("KV_REST_API_TOKEN"),
4445
KV_REST_API_READ_ONLY_TOKEN: getEnvVarOrThrow("KV_REST_API_READ_ONLY_TOKEN"),
4546
KV_REST_API_URL: getEnvVarOrThrow("KV_REST_API_URL"),
46-
FERN_TOKEN: getEnvVarOrThrow("FERN_TOKEN")
47+
FERN_TOKEN: getEnvVarOrThrow("FERN_TOKEN"),
48+
VENUS_URL: getEnvVarOrThrow("VENUS_URL")
4749
},
4850
{
4951
env: { account: "985111089818", region: "us-east-1" }
@@ -71,13 +73,15 @@ async function main() {
7173
SLACK_CLIENT_SECRET: getEnvVarOrThrow("SLACK_CLIENT_SECRET"),
7274
SLACK_SIGNING_SECRET: getEnvVarOrThrow("SLACK_SIGNING_SECRET"),
7375
ASK_FERN_SLACK_BOT_TOKEN: getEnvVarOrThrow("ASK_FERN_SLACK_BOT_TOKEN"),
76+
FERNIE_SLACK_BOT_TOKEN: getEnvVarOrThrow("FERNIE_SLACK_BOT_TOKEN"),
7477
FAI_LAMBDA_FUNCTION_NAME: getEnvVarOrThrow("FAI_LAMBDA_FUNCTION_NAME"),
7578
DISCORD_BOT_TOKEN: getEnvVarOrThrow("DISCORD_BOT_TOKEN"),
7679
DISCORD_OAUTH_URL: getEnvVarOrThrow("DISCORD_OAUTH_URL"),
7780
KV_REST_API_TOKEN: getEnvVarOrThrow("KV_REST_API_TOKEN"),
7881
KV_REST_API_READ_ONLY_TOKEN: getEnvVarOrThrow("KV_REST_API_READ_ONLY_TOKEN"),
7982
KV_REST_API_URL: getEnvVarOrThrow("KV_REST_API_URL"),
80-
FERN_TOKEN: getEnvVarOrThrow("FERN_TOKEN")
83+
FERN_TOKEN: getEnvVarOrThrow("FERN_TOKEN"),
84+
VENUS_URL: getEnvVarOrThrow("VENUS_URL")
8185
},
8286
{
8387
env: { account: "985111089818", region: "us-east-1" }
@@ -105,13 +109,15 @@ async function main() {
105109
SLACK_CLIENT_SECRET: getEnvVarOrThrow("SLACK_CLIENT_SECRET"),
106110
SLACK_SIGNING_SECRET: getEnvVarOrThrow("SLACK_SIGNING_SECRET"),
107111
ASK_FERN_SLACK_BOT_TOKEN: getEnvVarOrThrow("ASK_FERN_SLACK_BOT_TOKEN"),
112+
FERNIE_SLACK_BOT_TOKEN: getEnvVarOrThrow("FERNIE_SLACK_BOT_TOKEN"),
108113
FAI_LAMBDA_FUNCTION_NAME: getEnvVarOrThrow("FAI_LAMBDA_FUNCTION_NAME"),
109114
DISCORD_BOT_TOKEN: getEnvVarOrThrow("DISCORD_BOT_TOKEN"),
110115
DISCORD_OAUTH_URL: getEnvVarOrThrow("DISCORD_OAUTH_URL"),
111116
KV_REST_API_TOKEN: getEnvVarOrThrow("KV_REST_API_TOKEN"),
112117
KV_REST_API_READ_ONLY_TOKEN: getEnvVarOrThrow("KV_REST_API_READ_ONLY_TOKEN"),
113118
KV_REST_API_URL: getEnvVarOrThrow("KV_REST_API_URL"),
114-
FERN_TOKEN: getEnvVarOrThrow("FERN_TOKEN")
119+
FERN_TOKEN: getEnvVarOrThrow("FERN_TOKEN"),
120+
VENUS_URL: getEnvVarOrThrow("VENUS_URL")
115121
},
116122
{
117123
env: { account: "985111089818", region: "us-east-1" }

servers/fai-discord/deploy/src/deploy-stack.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ export interface FaiDiscordEnvVariables {
2222
SLACK_CLIENT_SECRET: string;
2323
SLACK_SIGNING_SECRET: string;
2424
ASK_FERN_SLACK_BOT_TOKEN: string;
25+
FERNIE_SLACK_BOT_TOKEN: string;
2526
FAI_LAMBDA_FUNCTION_NAME: string;
2627
DISCORD_BOT_TOKEN: string;
2728
DISCORD_OAUTH_URL: string;
2829
KV_REST_API_TOKEN: string;
2930
KV_REST_API_READ_ONLY_TOKEN: string;
3031
KV_REST_API_URL: string;
3132
FERN_TOKEN: string;
33+
VENUS_URL: string;
3234
[key: string]: string;
3335
}
3436

servers/fai/deploy/bin/deploy.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ async function main() {
3737
SLACK_CLIENT_SECRET: getEnvVarOrThrow("SLACK_CLIENT_SECRET"),
3838
SLACK_SIGNING_SECRET: getEnvVarOrThrow("SLACK_SIGNING_SECRET"),
3939
ASK_FERN_SLACK_BOT_TOKEN: getEnvVarOrThrow("ASK_FERN_SLACK_BOT_TOKEN"),
40+
FERNIE_SLACK_BOT_TOKEN: getEnvVarOrThrow("FERNIE_SLACK_BOT_TOKEN"),
4041
FAI_LAMBDA_FUNCTION_NAME: getEnvVarOrThrow("FAI_LAMBDA_FUNCTION_NAME"),
4142
DISCORD_BOT_TOKEN: getEnvVarOrThrow("DISCORD_BOT_TOKEN"),
4243
DISCORD_OAUTH_URL: getEnvVarOrThrow("DISCORD_OAUTH_URL"),
@@ -72,6 +73,7 @@ async function main() {
7273
SLACK_CLIENT_SECRET: getEnvVarOrThrow("SLACK_CLIENT_SECRET"),
7374
SLACK_SIGNING_SECRET: getEnvVarOrThrow("SLACK_SIGNING_SECRET"),
7475
ASK_FERN_SLACK_BOT_TOKEN: getEnvVarOrThrow("ASK_FERN_SLACK_BOT_TOKEN"),
76+
FERNIE_SLACK_BOT_TOKEN: getEnvVarOrThrow("FERNIE_SLACK_BOT_TOKEN"),
7577
FAI_LAMBDA_FUNCTION_NAME: getEnvVarOrThrow("FAI_LAMBDA_FUNCTION_NAME"),
7678
DISCORD_BOT_TOKEN: getEnvVarOrThrow("DISCORD_BOT_TOKEN"),
7779
DISCORD_OAUTH_URL: getEnvVarOrThrow("DISCORD_OAUTH_URL"),
@@ -107,6 +109,7 @@ async function main() {
107109
SLACK_CLIENT_SECRET: getEnvVarOrThrow("SLACK_CLIENT_SECRET"),
108110
SLACK_SIGNING_SECRET: getEnvVarOrThrow("SLACK_SIGNING_SECRET"),
109111
ASK_FERN_SLACK_BOT_TOKEN: getEnvVarOrThrow("ASK_FERN_SLACK_BOT_TOKEN"),
112+
FERNIE_SLACK_BOT_TOKEN: getEnvVarOrThrow("FERNIE_SLACK_BOT_TOKEN"),
110113
FAI_LAMBDA_FUNCTION_NAME: getEnvVarOrThrow("FAI_LAMBDA_FUNCTION_NAME"),
111114
DISCORD_BOT_TOKEN: getEnvVarOrThrow("DISCORD_BOT_TOKEN"),
112115
DISCORD_OAUTH_URL: getEnvVarOrThrow("DISCORD_OAUTH_URL"),

servers/fai/deploy/src/deploy-stack.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export interface FernAiEnvVariables {
2727
SLACK_CLIENT_SECRET: string;
2828
SLACK_SIGNING_SECRET: string;
2929
ASK_FERN_SLACK_BOT_TOKEN: string;
30+
FERNIE_SLACK_BOT_TOKEN: string;
3031
FAI_LAMBDA_FUNCTION_NAME: string;
3132
DISCORD_BOT_TOKEN: string;
3233
DISCORD_OAUTH_URL: string;

servers/fai/src/fai/routes/upstash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ async def qstash_failure_callback(body: QStashFailureCallback) -> QStashFailureC
4444
success = await send_slack_message(
4545
channel="search-notifs",
4646
text=slack_message,
47-
bot_token=VARIABLES.ASK_FERN_SLACK_BOT_TOKEN,
47+
bot_token=VARIABLES.FERNIE_SLACK_BOT_TOKEN,
4848
)
4949

5050
return JSONResponse(

0 commit comments

Comments
 (0)