Skip to content

Commit

Permalink
chore(aws-docdb): fix broken integration tests (aws#19687)
Browse files Browse the repository at this point in the history
Need to specify the engine version, otherwise the latest is used (4.0.0)
which is not compatible with the parameter group version


----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [x] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [x] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
corymhall authored and Stephen Potter committed Apr 27, 2022
1 parent 26294c1 commit 8e00337
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
13 changes: 7 additions & 6 deletions packages/@aws-cdk/aws-docdb/test/integ.cluster.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"VPCPublicSubnet1SubnetB4246D30": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.0.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1a",
"CidrBlock": "10.0.0.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
Expand Down Expand Up @@ -115,11 +115,11 @@
"VPCPublicSubnet2Subnet74179F39": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.64.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1b",
"CidrBlock": "10.0.64.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
Expand Down Expand Up @@ -212,11 +212,11 @@
"VPCPrivateSubnet1Subnet8BCA10E0": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.128.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1a",
"CidrBlock": "10.0.128.0/18",
"MapPublicIpOnLaunch": false,
"Tags": [
{
Expand Down Expand Up @@ -274,11 +274,11 @@
"VPCPrivateSubnet2SubnetCFCDAA7A": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.192.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1b",
"CidrBlock": "10.0.192.0/18",
"MapPublicIpOnLaunch": false,
"Tags": [
{
Expand Down Expand Up @@ -463,20 +463,21 @@
"DatabaseB269D8BB": {
"Type": "AWS::DocDB::DBCluster",
"Properties": {
"MasterUsername": "docdb",
"MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6",
"DBClusterParameterGroupName": {
"Ref": "ParamsA8366201"
},
"DBSubnetGroupName": {
"Ref": "DatabaseSubnets56F17B9A"
},
"EngineVersion": "3.6.0",
"KmsKeyId": {
"Fn::GetAtt": [
"DbSecurity381C2C15",
"Arn"
]
},
"MasterUsername": "docdb",
"MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6",
"StorageEncrypted": true,
"VpcSecurityGroupIds": [
{
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-docdb/test/integ.cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class TestStack extends cdk.Stack {
});

const cluster = new DatabaseCluster(this, 'Database', {
engineVersion: '3.6.0',
masterUser: {
username: 'docdb',
password: cdk.SecretValue.plainText('7959866cacc02c2d243ecfe177464fe6'),
Expand Down

0 comments on commit 8e00337

Please sign in to comment.