diff --git a/src/constructs/rds/instance.test.ts b/src/constructs/rds/instance.test.ts index 04ff94291c..c63f8226c1 100644 --- a/src/constructs/rds/instance.test.ts +++ b/src/constructs/rds/instance.test.ts @@ -75,7 +75,7 @@ describe("The GuDatabaseInstance class", () => { expect(stack).toHaveResource("AWS::RDS::DBInstance", { DBParameterGroupName: { - Ref: "DatabaseInstanceRDSParameterGroup307734CB", + Ref: "DatabaseInstanceTestingParameterGroup0F38B815", }, }); diff --git a/src/constructs/rds/instance.ts b/src/constructs/rds/instance.ts index 581b81bcb0..49ee5be8d9 100644 --- a/src/constructs/rds/instance.ts +++ b/src/constructs/rds/instance.ts @@ -1,11 +1,11 @@ import { InstanceType } from "@aws-cdk/aws-ec2"; -import { DatabaseInstance, ParameterGroup } from "@aws-cdk/aws-rds"; -import type { DatabaseInstanceProps, IParameterGroup } from "@aws-cdk/aws-rds"; +import { DatabaseInstance } from "@aws-cdk/aws-rds"; +import type { DatabaseInstanceProps } from "@aws-cdk/aws-rds"; import { Fn } from "@aws-cdk/core"; import { GuStatefulMigratableConstruct } from "../../utils/mixin"; import { GuAppAwareConstruct } from "../../utils/mixin/app-aware-construct"; import type { GuStack } from "../core"; -import { AppIdentity } from "../core/identity"; +import type { AppIdentity } from "../core/identity"; import type { GuMigratingResource } from "../core/migrating"; export interface GuDatabaseInstanceProps @@ -13,7 +13,6 @@ export interface GuDatabaseInstanceProps AppIdentity, GuMigratingResource { instanceType: string; - parameters?: Record; } export class GuDatabaseInstance extends GuStatefulMigratableConstruct(GuAppAwareConstruct(DatabaseInstance)) { @@ -23,23 +22,10 @@ export class GuDatabaseInstance extends GuStatefulMigratableConstruct(GuAppAware // This logic ensures the "db." prefix is removed before applying the CFN const instanceType = new InstanceType(Fn.join("", Fn.split("db.", props.instanceType))); - let parameterGroup: IParameterGroup | undefined; - if (props.parameterGroup) { - parameterGroup = props.parameterGroup; - } else if (props.parameters) { - parameterGroup = new ParameterGroup(scope, `${id}-RDSParameterGroup`, { - engine: props.engine, - parameters: props.parameters, - }); - } - super(scope, id, { deletionProtection: true, ...props, instanceType, - ...(parameterGroup && { parameterGroup }), }); - - parameterGroup && AppIdentity.taggedConstruct(props, parameterGroup); } }