Skip to content

Commit 7695e70

Browse files
authored
feat(scheduled-publishing): add SCHEDULED_PUBLISHING_HEARTBEAT_URL and remove unused env variables (#1746)
* feat: add SCHEDULED_PUBLISHING_HEARTBEAT_URL * fix: remove redis env vars
1 parent 60d4cd3 commit 7695e70

File tree

11 files changed

+5
-41
lines changed

11 files changed

+5
-41
lines changed

.aws/deploy/task-definition.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
"volumesFrom": [],
2929
"secrets": [
3030
{ "name": "DATABASE_URL", "valueFrom": "/rds/url" },
31-
{ "name": "REDIS_HOST", "valueFrom": "/redis/host" },
32-
{ "name": "REDIS_PORT", "valueFrom": "/redis/port" },
3331
{
3432
"name": "STUDIO_SSM_WEBHOOK_API_KEY",
3533
"valueFrom": "/webhook/api-key"
3634
},
35+
{
36+
"name": "SCHEDULED_PUBLISHING_HEARTBEAT_URL",
37+
"valueFrom": "/cron/scheduled-publishing-heartbeat-url"
38+
},
3739
{ "name": "POSTMAN_API_KEY", "valueFrom": "/postman/api-key" },
3840
{ "name": "SESSION_SECRET", "valueFrom": "/session/secret" },
3941
{

.env.example

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,3 @@ NEXT_PUBLIC_APP_ENV='development'
4848

4949
# Growthbook
5050
GROWTHBOOK_CLIENT_KEY=xyz
51-
52-
# redis settings
53-
REDIS_HOST=localhost
54-
REDIS_PORT=6379

apps/studio/.devcontainer/docker-compose.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ services:
1919
# (Adding the "ports" property to this file will not forward from a Codespace.)
2020
depends_on:
2121
- postgres
22-
- redis
23-
redis:
24-
image: redis
25-
container_name: redis
26-
ports:
27-
- 6379:6379
2822
postgres:
2923
extends:
3024
file: ../docker-compose.yml

apps/studio/.env.example

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ DEBUG=false
1313
AWS_PROFILE=
1414
SSM_INSTANCE_TARGET=
1515

16-
# redis settings
17-
REDIS_HOST=localhost
18-
REDIS_PORT=6379
19-
2016
# Searchsg-related
2117
SEARCHSG_API_KEY="some nonsense string"
2218
# Notification webhook settings

apps/studio/.env.test

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,4 @@ SINGPASS_SIGNING_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\nMIHuAgEAMBAGByqGSM49A
2424
GROWTHBOOK_CLIENT_KEY=sdk-lnL5Et90CD9sC13e
2525
NEXT_PUBLIC_GROWTHBOOK_CLIENT_KEY=sdk-lnL5Et90CD9sC13e
2626

27-
# redis settings
28-
REDIS_HOST=localhost
29-
REDIS_PORT=6379
30-
3127
SEARCHSG_API_KEY=test-searchsg-api-key

apps/studio/docker-compose.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ services:
1111
- POSTGRES_PASSWORD=root
1212
volumes:
1313
- postgres-volume:/var/lib/postgresql/data
14-
redis:
15-
image: redis:latest
16-
container_name: redis
17-
ports:
18-
- 6379:6379
1914
mockpass:
2015
image: opengovsg/mockpass:4.5.1
2116
ports:

apps/studio/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
"@uidotdev/usehooks": "^2.4.1",
123123
"ajv": "^8.17.1",
124124
"ajv-errors": "^3.0.0",
125-
"bullmq": "^5.58.5",
126125
"chakra-react-select": "^5.0.5",
127126
"date-fns": "^4.1.0",
128127
"date-fns-tz": "^3.1.3",

apps/studio/src/env.mjs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ const server = z
6767
SESSION_SECRET: z.string().min(32),
6868
GROWTHBOOK_CLIENT_KEY: z.string().optional(),
6969
STUDIO_SSM_WEBHOOK_API_KEY: z.string().optional(),
70-
REDIS_HOST: z.string(),
71-
REDIS_PORT: z.coerce.number().default(6379),
7270
SEARCHSG_API_KEY: z.string(),
7371
})
7472
.merge(s3Schema)
@@ -103,8 +101,6 @@ const processEnv = {
103101
SINGPASS_ENCRYPTION_KEY_ALG: process.env.SINGPASS_ENCRYPTION_KEY_ALG,
104102
SINGPASS_SIGNING_PRIVATE_KEY: process.env.SINGPASS_SIGNING_PRIVATE_KEY,
105103
SINGPASS_SIGNING_KEY_ALG: process.env.SINGPASS_SIGNING_KEY_ALG,
106-
REDIS_HOST: process.env.REDIS_HOST,
107-
REDIS_PORT: process.env.REDIS_PORT,
108104
STUDIO_SSM_WEBHOOK_API_KEY: process.env.STUDIO_SSM_WEBHOOK_API_KEY,
109105
// Client-side env vars
110106
NEXT_PUBLIC_APP_ENV: process.env.NEXT_PUBLIC_APP_ENV,

apps/studio/tests/common.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { StartedNetwork, StartedTestContainer } from "testcontainers"
44
import { GenericContainer, Wait } from "testcontainers"
55
import { z } from "zod"
66

7-
type ContainerType = "database" | "mockpass" | "redis"
7+
type ContainerType = "database" | "mockpass"
88
export const CONTAINER_CONFIGURATIONS: Record<
99
ContainerType,
1010
ContainerConfiguration
@@ -37,13 +37,6 @@ export const CONTAINER_CONFIGURATIONS: Record<
3737
wait: { type: "PORT" },
3838
type: "image",
3939
},
40-
redis: {
41-
name: "redis",
42-
image: "redis:latest",
43-
ports: [{ container: 6379, host: 6379 }],
44-
wait: { type: "PORT" },
45-
type: "image",
46-
},
4740
}
4841

4942
const baseContainerConfiguration = z.object({

apps/studio/tests/global-setup.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export default async () => {
77
const containers = await setup([
88
CONTAINER_CONFIGURATIONS.database,
99
CONTAINER_CONFIGURATIONS.mockpass,
10-
CONTAINER_CONFIGURATIONS.redis,
1110
])
1211

1312
// eslint-disable-next-line no-restricted-properties

0 commit comments

Comments
 (0)