Add Postgres and MySQL aurora clusters to CFN

Author: igorborgest

testing/deploy-cloudformation.sh

@@ -3,6 +3,6 @@ set -e
 
 aws cloudformation deploy \
 --template-file template.yaml \
---stack-name aws-data-wrangler-test-arena \
+--stack-name aws-data-wrangler-test \
 --capabilities CAPABILITY_IAM \
 --parameter-overrides $(cat parameters.properties)

testing/template.yaml

@@ -10,6 +10,9 @@ Parameters:
   SubnetId:
     Type: String
     Description: Redshift Subnet ID
+  SubnetId2:
+    Type: String
+    Description: Redshift Subnet ID
   Password:
     Type: String
     Description: Redshift Password
@@ -108,7 +111,7 @@ Resources:
       SubnetIds:
         - Ref: SubnetId
 
-  RedshiftSecurityGroup:
+  DatabaseSecurityGroup:
     Type: AWS::EC2::SecurityGroup
     Properties:
       VpcId: !Ref VpcId
@@ -117,7 +120,7 @@ Resources:
   Redshift:
     Type: AWS::Redshift::Cluster
     DependsOn:
-      - RedshiftSecurityGroup
+      - DatabaseSecurityGroup
       - RedshiftSubnetGroup
       - RedshiftRole
     Properties:
@@ -127,7 +130,7 @@ Resources:
       NodeType: dc2.large
       ClusterType: single-node
       VpcSecurityGroupIds:
-        - !Ref RedshiftSecurityGroup
+        - !Ref DatabaseSecurityGroup
       ClusterSubnetGroupName: !Ref RedshiftSubnetGroup
       PubliclyAccessible: true
       Port: 5439
@@ -152,6 +155,75 @@ Resources:
     Properties:
       LogGroupName: !Ref LogGroup
 
+  RdsSubnetGroup:
+    Type: AWS::RDS::DBSubnetGroup
+    Properties:
+      DBSubnetGroupDescription: RDS Database Subnet Group
+      SubnetIds:
+        - Ref: SubnetId
+        - Ref: SubnetId2
+
+  PostgresParameterGroup:
+    Type: AWS::RDS::DBClusterParameterGroup
+    Properties:
+      Description: Postgres 10
+      Family: aurora-postgresql10
+      Parameters:
+        apg_plan_mgmt.capture_plan_baselines: "off"
+  AuroraClusterPostgres:
+    Type: AWS::RDS::DBCluster
+    Properties:
+      Engine: aurora-postgresql
+      DBClusterIdentifier : postgres-cluster-wrangler
+      MasterUsername: test
+      MasterUserPassword: !Ref Password
+      BackupRetentionPeriod: 1
+      DBSubnetGroupName: !Ref RdsSubnetGroup
+      VpcSecurityGroupIds:
+        - !Ref DatabaseSecurityGroup
+      DBClusterParameterGroupName: !Ref PostgresParameterGroup
+
+  AuroraInstancePostgres:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      Engine: aurora-postgresql
+      DBInstanceIdentifier: postgres-instance-wrangler
+      DBClusterIdentifier: !Ref AuroraClusterPostgres
+      DBInstanceClass: db.t3.medium
+      DBSubnetGroupName: !Ref RdsSubnetGroup
+      PubliclyAccessible: true
+
+  MysqlParameterGroup:
+    Type: AWS::RDS::DBClusterParameterGroup
+    Properties:
+      Description: Mysql 5.7
+      Family: aurora-mysql5.7
+      Parameters:
+        binlog_format: "MIXED"
+
+  AuroraClusterMysql:
+    Type: AWS::RDS::DBCluster
+    Properties:
+      Engine: aurora-mysql
+      DBClusterIdentifier: mysql-cluster-wrangler
+      MasterUsername: test
+      MasterUserPassword: !Ref Password
+      BackupRetentionPeriod: 1
+      DBSubnetGroupName: !Ref RdsSubnetGroup
+      VpcSecurityGroupIds:
+        - !Ref DatabaseSecurityGroup
+      DBClusterParameterGroupName: !Ref MysqlParameterGroup
+
+  AuroraInstanceMysql:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      Engine: aurora-mysql
+      DBInstanceIdentifier: mysql-instance-wrangler
+      DBClusterIdentifier: !Ref AuroraClusterMysql
+      DBInstanceClass: db.t3.medium
+      DBSubnetGroupName: !Ref RdsSubnetGroup
+      PubliclyAccessible: true
+
 Outputs:
   BucketName:
     Value: !Ref Bucket
@@ -183,3 +255,12 @@ Outputs:
   SubnetId:
     Value: !Ref SubnetId
     Description: Subnet ID
+  SubnetId2:
+    Value: !Ref SubnetId2
+    Description: Subnet ID 2
+  PostgresAddress:
+    Value: !GetAtt AuroraInstancePostgres.Endpoint.Address
+    Description: Postgres Address
+  MysqlAddress:
+    Value: !GetAtt AuroraInstanceMysql.Endpoint.Address
+    Description: Mysql Address