Merge pull request #3 from aaronwalker/master

changes to support aurora config

Author: Guslington

aurora-postgres.cfhighlander.rb

@@ -1,9 +1,14 @@
 CfhighlanderTemplate do
+
+  Name 'aurora-postgres'
+  Description "Highlander Aurora Postgres component #{component_version}"
   DependsOn '[email protected]'
+
   Parameters do
     ComponentParam 'EnvironmentName', 'dev', isGlobal: true
     ComponentParam 'EnvironmentType', 'development', isGlobal: true, allowedValues: ['development', 'production']
     ComponentParam 'StackOctet', isGlobal: true
+
     MappingParam('WriterInstanceType') do
       map 'EnvironmentType'
       attribute 'WriterInstanceType'
@@ -19,6 +24,7 @@
     maximum_availability_zones.times do |az|
       ComponentParam "SubnetPersistence#{az}"
     end
+
     ComponentParam 'SnapshotID'
     ComponentParam 'EnableReader', 'false'
     ComponentParam 'VPCId', type: 'AWS::EC2::VPC::Id'

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', FnJoin('', [ '{{resolve:ssm:', FnSub(master_login['username_ssm_param']), ':1}}' ]), Ref('AWS::NoValue'))
+    MasterUserPassword FnIf('UseUsernameAndPassword', FnJoin('', [ '{{resolve:ssm-secure:', FnSub(master_login['password_ssm_param']), ':1}}' ]), 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,12 @@
 maximum_availability_zones: 5
 hostname: aurora2pg
 
+cluster_port: 5432
+
+master_login:
+  username_ssm_param: /rds/AURORA_POSTGRES_MASTER_USERNAME
+  password_ssm_param: /rds/AURORA_POSTGRES_MASTER_PASSWORD
+
 # cluster_parameters:
 
 # instance_parameters: