Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(infra): dd db agent security group (#5744)
teo4c4d9d934362
diff --git a/infra/stacks/macrodb/Pulumi.prod.yaml b/infra/stacks/macrodb/Pulumi.prod.yamlindex 72a0c956ad..6648a5b023 100644--- a/infra/stacks/macrodb/Pulumi.prod.yaml+++ b/infra/stacks/macrodb/Pulumi.prod.yaml@@ -16,6 +16,7 @@ config:macrodb:performance_insights_kms_key_id: arn:aws:kms:us-east-1:569036502058:key/6a0ba9c2-b8ab-4a65-b0f2-6f8f39ccda72macrodb:subnet_group_name: macro-db-prod-stack-macrodbinstancesubnetgroup483984b1-ny9ca5kliq6zmacrodb:security_group_ids: sg-0997207417c39f5b3+ macrodb:datadog_dbm_enabled: truemacrodb:monitoring_interval: 60macrodb:rds_monitoring_role_arn: arn:aws:iam::569036502058:role/rds-monitoring-rolemacrodb:backup_retention_days: 6diff --git a/infra/stacks/macrodb/index.ts b/infra/stacks/macrodb/index.tsindex 591d8f2e47..0a9bc98116 100644--- a/infra/stacks/macrodb/index.ts+++ b/infra/stacks/macrodb/index.ts@@ -1,6 +1,7 @@import * as aws from '@pulumi/aws';import * as pulumi from '@pulumi/pulumi';-import { config, stack } from '../../packages/shared';+import { config, RDS_PORT, stack } from '../../packages/shared';+import { get_coparse_api_vpc } from '../../packages/vpc';const tags = {environment: stack,@@ -8,6 +9,80 @@ const tags = {project: 'macrodb',};+const databaseSecurityGroupIds = config+ .require('security_group_ids')+ .split(',')+ .map((securityGroupId) => securityGroupId.trim())+ .filter(Boolean);++const datadogDbmEnabled = config.getBoolean('datadog_dbm_enabled') ?? false;++const datadogDbmAgentSecurityGroup = datadogDbmEnabled+ ? new aws.ec2.SecurityGroup('datadog-dbm-agent-security-group', {+ name: `datadog-dbm-agent-${stack}`,+ description: `Datadog DBM agent security group for macro-db-${stack}`,+ vpcId: get_coparse_api_vpc().vpcId,+ tags: {+ ...tags,+ component: 'datadog-dbm-agent',+ },+ })+ : undefined;++if (datadogDbmAgentSecurityGroup) {+ new aws.vpc.SecurityGroupEgressRule('datadog-dbm-agent-all-out', {+ securityGroupId: datadogDbmAgentSecurityGroup.id,+ description: 'Allow outbound traffic for the Datadog DBM agent',+ cidrIpv4: '0.0.0.0/0',+ ipProtocol: '-1',+ tags,+ });++ new aws.vpc.SecurityGroupIngressRule('datadog-dbm-agent-postgres-in', {+ securityGroupId: datadogDbmAgentSecurityGroup.id,+ description: 'Allow Postgres between resources using the Datadog DBM group',+ referencedSecurityGroupId: datadogDbmAgentSecurityGroup.id,+ fromPort: RDS_PORT,+ toPort: RDS_PORT,+ ipProtocol: 'tcp',+ tags,+ });++ databaseSecurityGroupIds.forEach((databaseSecurityGroupId, index) => {+ new aws.vpc.SecurityGroupEgressRule(+ `datadog-dbm-agent-postgres-out-${index}`,+ {+ securityGroupId: datadogDbmAgentSecurityGroup.id,+ description: 'Allow the Datadog DBM agent to connect to Postgres',+ referencedSecurityGroupId: databaseSecurityGroupId,+ fromPort: RDS_PORT,+ toPort: RDS_PORT,+ ipProtocol: 'tcp',+ tags,+ }+ );++ new aws.vpc.SecurityGroupIngressRule(+ `database-datadog-dbm-agent-in-${index}`,+ {+ securityGroupId: databaseSecurityGroupId,+ description: 'Allow the Datadog DBM agent to connect to Postgres',+ referencedSecurityGroupId: datadogDbmAgentSecurityGroup.id,+ fromPort: RDS_PORT,+ toPort: RDS_PORT,+ ipProtocol: 'tcp',+ tags,+ }+ );+ });+}++export const datadogDbmAgentSecurityGroupId = datadogDbmAgentSecurityGroup?.id;++const databaseVpcSecurityGroupIds = datadogDbmAgentSecurityGroup+ ? [...databaseSecurityGroupIds, datadogDbmAgentSecurityGroup.id]+ : databaseSecurityGroupIds;+// db passwordconst password = aws.secretsmanager.getSecretVersionOutput({@@ -141,7 +216,7 @@ const database = new aws.rds.Instance(),dbName: 'macrodb',dbSubnetGroupName: config.require('subnet_group_name'),- vpcSecurityGroupIds: [...config.require('security_group_ids').split(',')],+ vpcSecurityGroupIds: databaseVpcSecurityGroupIds,publiclyAccessible: true,skipFinalSnapshot: stack !== 'prod', // we only want to skip final snapshot for non-prodfinalSnapshotIdentifier:@@ -186,7 +261,7 @@ const readReplica = new aws.rds.Instance('performance_insights_kms_key_id'),publiclyAccessible: true,- vpcSecurityGroupIds: [...config.require('security_group_ids').split(',')],+ vpcSecurityGroupIds: databaseVpcSecurityGroupIds,parameterGroupName: pulumi.interpolate`${originalParameterGroup.name}`,enabledCloudwatchLogsExports:stack === 'prod' ? ['postgresql', 'upgrade'] : undefined,