From bc488731f1c3f9b088b07d8fdf49ca5503f67e9e Mon Sep 17 00:00:00 2001
From: Cory Hall <43035978+corymhall@users.noreply.github.com>
Date: Fri, 1 Apr 2022 12:24:40 -0400
Subject: [PATCH] chore(aws-docdb): fix broken integration tests (#19687)

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*
---
 .../aws-docdb/test/integ.cluster.expected.json      | 13 +++++++------
 packages/@aws-cdk/aws-docdb/test/integ.cluster.ts   |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/@aws-cdk/aws-docdb/test/integ.cluster.expected.json b/packages/@aws-cdk/aws-docdb/test/integ.cluster.expected.json
index 1b661827dd1ec..f6a4f710d71a1 100644
--- a/packages/@aws-cdk/aws-docdb/test/integ.cluster.expected.json
+++ b/packages/@aws-cdk/aws-docdb/test/integ.cluster.expected.json
@@ -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": [
           {
@@ -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": [
           {
@@ -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": [
           {
@@ -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": [
           {
@@ -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": [
           {
diff --git a/packages/@aws-cdk/aws-docdb/test/integ.cluster.ts b/packages/@aws-cdk/aws-docdb/test/integ.cluster.ts
index 084502d0dae65..f3d988e51c601 100644
--- a/packages/@aws-cdk/aws-docdb/test/integ.cluster.ts
+++ b/packages/@aws-cdk/aws-docdb/test/integ.cluster.ts
@@ -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'),