Skip to content

refactor: changed connections to db for deployment-service #11629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bashleigh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: changed connections to db for deployment-service #11629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ed589c
refactor: changed connections to db for deployment-service
bashleigh Oct 2, 2025
7c8f98c
Merge branch 'master' into fix/rplt-1029-limit-database-connections
bashleigh Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/deployment-service/cdk/lib/cdk-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
createFunction,
} from '@reapit/ts-scripts/src/cdk'
import fs from 'fs/promises'
import { aws_sqs as sqs, aws_lambda } from 'aws-cdk-lib'
import { aws_sqs as sqs, aws_lambda, aws_ec2 } from 'aws-cdk-lib'

import { createLambda } from './create-lambda'
import { createS3Buckets } from './create-S3-bucket'
Expand Down Expand Up @@ -77,7 +77,7 @@ export const createStack = async () => {
const vpc = createVpc(stack, 'vpc')
const buckets = createS3Buckets(usercodeStack, envStage)
const queues = createSqsQueues(stack)
const database = createDatabase(stack, 'database', databaseName, vpc, undefined, true)
const database = createDatabase(stack, 'database', databaseName, vpc, undefined, true, false)

const secretManager = database.secret

Expand Down Expand Up @@ -255,6 +255,12 @@ export const createStack = async () => {
})
options.policies.forEach((policy) => lambda.addToRolePolicy(policy))

const requiresDbConnection = options.policies.some((policy) => policy.resources.includes(secretManager.secretArn))

if (requiresDbConnection) {
database.connections.allowFrom(lambda, aws_ec2.Port.MYSQL_AURORA)
}

if (options.queues) {
options.queues.forEach((queue) => addLambdaSQSTrigger(lambda, queue as Queue))
} else if (options.api) {
Expand Down
3 changes: 2 additions & 1 deletion packages/ts-scripts/src/cdk/components/rds-database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const createDatabase = (
vpc: ec2.Vpc,
secret?: cdk.aws_secretsmanager.ISecret,
bastion: boolean = false,
createConnections: boolean = true,
): rds.DatabaseCluster => {
const db = new rds.DatabaseCluster(stack, name, {
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_08_2 }),
Expand All @@ -28,7 +29,7 @@ export const createDatabase = (
credentials: secret ? rds.Credentials.fromSecret(secret) : undefined,
})

db.connections.allowFromAnyIpv4(ec2.Port.MYSQL_AURORA)
if (createConnections) db.connections.allowFromAnyIpv4(ec2.Port.MYSQL_AURORA)

if (bastion) {
new ec2.BastionHostLinux(stack, 'bastion', {
Expand Down