changes to support aurora config

Author: aaronwalker

aurora-postgres.cfhighlander.rb

@@ -20,6 +20,9 @@
       ComponentParam "SubnetPersistence#{az}"
     end
     ComponentParam 'SnapshotID'
+    ComponentParam 'MasterUsername', 'master'
+    ComponentParam 'MasterUserPassword', 'pa33w0rd'
+    
     ComponentParam 'EnableReader', 'false'
     ComponentParam 'VPCId', type: 'AWS::EC2::VPC::Id'
   end

aurora-postgres.cfndsl.rb

@@ -3,6 +3,9 @@
   Description "#{component_name} - #{component_version}"
 
   Condition("EnableReader", FnEquals(Ref("EnableReader"), 'true'))
+  Condition("UseUsernameAndPassword", FnEquals(Ref(:SnapshotID), ''))
+  Condition("UseSnapshotID", FnNot(FnEquals(Ref(:SnapshotID), '')))
+
   az_conditions_resources('SubnetPersistence', maximum_availability_zones)
 
   tags = []
@@ -26,7 +29,7 @@
 
   RDS_DBClusterParameterGroup(:DBClusterParameterGroup) {
     Description FnJoin(' ', [ Ref(:EnvironmentName), component_name, 'cluster parameter group' ])
-    Family 'aurora-postgresql'
+    Family 'aurora-postgresql9.6'
     Parameters cluster_parameters if defined? cluster_parameters
     Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), component_name, 'cluster-parameter-group' ])}]
   }
@@ -35,8 +38,12 @@
     Engine 'aurora-postgresql'
     DBClusterParameterGroupName Ref(:DBClusterParameterGroup)
     SnapshotIdentifier Ref(:SnapshotID)
+    SnapshotIdentifier FnIf('UseSnapshotID',Ref(:SnapshotID), Ref('AWS::NoValue'))
+    MasterUsername FnIf('UseUsernameAndPassword',Ref(:MasterUsername), Ref('AWS::NoValue'))
+    MasterUserPassword FnIf('UseUsernameAndPassword',Ref(:MasterUserPassword), Ref('AWS::NoValue'))
     DBSubnetGroupName Ref(:DBClusterSubnetGroup)
     VpcSecurityGroupIds [ Ref(:SecurityGroup) ]
+    Port cluster_port
     Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), component_name, 'cluster' ])}]
   }
 

aurora-postgres.config.yaml

@@ -1,6 +1,8 @@
 maximum_availability_zones: 5
 hostname: aurora2pg
 
+cluster_port: 5432
+
 # cluster_parameters:
 
 # instance_parameters: