Skip to content
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

Jump to bottom

fix(rds): prevent rendering deprecated credentials when creating a database cluster from a snapshot (under feature flag) #27174

Merged
merged 10 commits into from
Sep 25, 2023
Merged

fix(rds): prevent rendering deprecated credentials when creating a database cluster from a snapshot (under feature flag) #27174

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a3a257e
feature flag
colifran Sep 17, 2023
db19bc6
feature flag doc update
colifran Sep 17, 2023
6783d6c
renderSnapshotCredentials
colifran Sep 17, 2023
37a74ef
update DatabaseClusterFromSnapshot to use renderSnapshotCredentials a…
colifran Sep 17, 2023
1ee503d
unit tests
colifran Sep 17, 2023
faadae8
integ test and snapshots
colifran Sep 18, 2023
1519cca
Merge branch 'main' into colifran/extra-cluster-secret
colifran Sep 25, 2023
b1ade6f
removed trailing space
colifran Sep 25, 2023
1c09dc6
Merge branch 'main' into colifran/extra-cluster-secret
colifran Sep 25, 2023
b834f0d
Merge branch 'main' into colifran/extra-cluster-secret
mergify[bot] Sep 25, 2023
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
4 changes: 2 additions & 2 deletions ...st/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 8 additions & 44 deletions .../aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,12 +426,12 @@
"Type": "AWS::RDS::DBCluster",
"Properties": {
"CopyTagsToSnapshot": true,
"DBClusterParameterGroupName": "default.aurora-mysql5.7",
"DBClusterParameterGroupName": "default.aurora-mysql8.0",
"DBSubnetGroupName": {
"Ref": "ClusterSubnetsDCFA5CB7"
},
"Engine": "aurora-mysql",
"EngineVersion": "5.7.mysql_aurora.2.10.2",
"EngineVersion": "8.0.mysql_aurora.3.04.0",
"MasterUserPassword": {
"Fn::Join": [
"",
Expand Down Expand Up @@ -474,7 +474,7 @@
"DBClusterIdentifier": {
"Ref": "ClusterEB0386A7"
},
"DBInstanceClass": "db.t3.small",
"DBInstanceClass": "db.t3.medium",
"DBSubnetGroupName": {
"Ref": "ClusterSubnetsDCFA5CB7"
},
Expand All @@ -495,7 +495,7 @@
"DBClusterIdentifier": {
"Ref": "ClusterEB0386A7"
},
"DBInstanceClass": "db.t3.small",
"DBInstanceClass": "db.t3.medium",
"DBSubnetGroupName": {
"Ref": "ClusterSubnetsDCFA5CB7"
},
Expand Down Expand Up @@ -1357,42 +1357,6 @@
}
}
},
"FromSnapshotSecret9100F61C": {
"Type": "AWS::SecretsManager::Secret",
"Properties": {
"Description": {
"Fn::Join": [
"",
[
"Generated by the CDK for stack: ",
{
"Ref": "AWS::StackName"
}
]
]
},
"GenerateSecretString": {
"ExcludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\",
"GenerateStringKey": "password",
"PasswordLength": 30,
"SecretStringTemplate": "{\"username\":\"admin\"}"
}
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"FromSnapshotSecretAttachmentB62DA1C6": {
"Type": "AWS::SecretsManager::SecretTargetAttachment",
"Properties": {
"SecretId": {
"Ref": "FromSnapshotSecret9100F61C"
},
"TargetId": {
"Ref": "FromSnapshotEE0682C5"
},
"TargetType": "AWS::RDS::DBCluster"
}
},
"cdkintegclustersnapshotFromSnapshotSnapshotSecretD93327943fdaad7efa858a3daf9490cf0a702aeb": {
"Type": "AWS::SecretsManager::Secret",
"Properties": {
Expand Down Expand Up @@ -1486,12 +1450,12 @@
"Type": "AWS::RDS::DBCluster",
"Properties": {
"CopyTagsToSnapshot": true,
"DBClusterParameterGroupName": "default.aurora-mysql5.7",
"DBClusterParameterGroupName": "default.aurora-mysql8.0",
"DBSubnetGroupName": {
"Ref": "FromSnapshotSubnets9ED4B8EE"
},
"Engine": "aurora-mysql",
"EngineVersion": "5.7.mysql_aurora.2.10.2",
"EngineVersion": "8.0.mysql_aurora.3.04.0",
"MasterUserPassword": {
"Fn::Join": [
"",
Expand Down Expand Up @@ -1528,7 +1492,7 @@
"DBClusterIdentifier": {
"Ref": "FromSnapshotEE0682C5"
},
"DBInstanceClass": "db.t3.small",
"DBInstanceClass": "db.t3.medium",
"DBSubnetGroupName": {
"Ref": "FromSnapshotSubnets9ED4B8EE"
},
Expand All @@ -1549,7 +1513,7 @@
"DBClusterIdentifier": {
"Ref": "FromSnapshotEE0682C5"
},
"DBInstanceClass": "db.t3.small",
"DBInstanceClass": "db.t3.medium",
"DBSubnetGroupName": {
"Ref": "FromSnapshotSubnets9ED4B8EE"
},
Expand Down
32 changes: 19 additions & 13 deletions ...esting/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 8 additions & 78 deletions ...dk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ class TestStack extends Stack {
const vpc = new ec2.Vpc(this, 'Vpc', { maxAzs: 2, natGateways: 1, restrictDefaultSecurityGroup: false });

const instanceProps = {
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.MEDIUM),
isFromLegacyInstanceProps: true,
};
const cluster = new rds.DatabaseCluster(this, 'Cluster', {
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_2_10_2 }),
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_04_0 }),
writer: ClusterInstance.provisioned('Instance1', {
...instanceProps,
}),
Expand All @@ -42,7 +42,7 @@ class TestStack extends Stack {
const fromSnapshot = new rds.DatabaseClusterFromSnapshot(this, 'FromSnapshot', {
snapshotIdentifier: snapshoter.snapshotArn,
snapshotCredentials: rds.SnapshotCredentials.fromGeneratedSecret('admin'),
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_2_10_2 }),
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_04_0 }),
writer: ClusterInstance.provisioned('Instance1', {
...instanceProps,
}),
Expand Down
Loading
Loading