Merge pull request #7 from Samseppiol/master

Convert component to use new cfndsl yaml constant syntax

Author: Guslington

.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
-  - 2.3
+  - 2.5
+install:
+  - gem install cfhighlander cfn-nag
+before_script:
+  - cfndsl -u 9.0.0
 script:
-  - gem install cfhighlander --prerelease
-  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then cfhighlander cfcompile ; else cfhighlander cfcompile --validate; fi
+  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then cfhighlander cftest --no-validate; else cfhighlander cftest; fi
+  - cfn_nag_scan -i out/tests

rds-mysql.cfndsl.rb

@@ -1,55 +1,58 @@
 CloudFormation do
 
-  Description "#{component_name} - #{component_version}"
+  Description "#{external_parameters[:component_name]} - #{external_parameters[:component_version]}"
 
   tags = []
   tags << { Key: 'Environment', Value: Ref(:EnvironmentName) }
   tags << { Key: 'EnvironmentType', Value: Ref(:EnvironmentType) }
 
-  extra_tags.each { |key,value| tags << { Key: key, Value: value } } if defined? extra_tags
+  extra_tags = external_parameters.fetch(:extra_tags, {})
+  extra_tags.each { |key,value| tags << { Key: key, Value: value } }
 
   EC2_SecurityGroup "SecurityGroupRDS" do
     VpcId Ref('VPCId')
-    GroupDescription FnJoin(' ', [ Ref(:EnvironmentName), component_name, 'security group' ])
-    SecurityGroupIngress sg_create_rules(security_group, ip_blocks)
-    Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), component_name, 'security-group' ])}]
+    GroupDescription FnJoin(' ', [ Ref(:EnvironmentName), external_parameters[:component_name], 'security group' ])
+    SecurityGroupIngress sg_create_rules(external_parameters[:security_group], external_parameters[:ip_blocks])
+    Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), external_parameters[:component_name], 'security-group' ])}]
   end
 
   RDS_DBSubnetGroup 'SubnetGroupRDS' do
-    DBSubnetGroupDescription FnJoin(' ', [ Ref(:EnvironmentName), component_name, 'subnet group' ])
+    DBSubnetGroupDescription FnJoin(' ', [ Ref(:EnvironmentName), external_parameters[:component_name], 'subnet group' ])
     SubnetIds Ref(:SubnetIds)
-    Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), component_name, 'subnet-group' ])}]
+    Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), external_parameters[:component_name], 'subnet-group' ])}]
   end
 
+  parameters = external_parameters.fetch(:parameters, {})
   RDS_DBParameterGroup 'ParametersRDS' do
-    Description FnJoin(' ', [ Ref(:EnvironmentName), component_name, 'parameter group' ])
-    Family family
-    Parameters parameters if defined? parameters
-    Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), component_name, 'parameter-group' ])}]
+    Description FnJoin(' ', [ Ref(:EnvironmentName), external_parameters[:component_name], 'parameter group' ])
+    Family external_parameters[:family]
+    Parameters parameters unless parameters.empty?
+    Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), external_parameters[:component_name], 'parameter-group' ])}]
   end
 
+  master_login = external_parameters.fetch(:master_login, {})
   RDS_DBInstance 'RDS' do
-    DeletionPolicy deletion_policy if defined? deletion_policy
+    DeletionPolicy external_parameters[:deletion_policy]
     DBInstanceClass Ref('RDSInstanceType')
     AllocatedStorage Ref('RDSAllocatedStorage')
     StorageType 'gp2'
     Engine 'mysql'
-    EngineVersion engine_version
+    EngineVersion external_parameters[:engine_version]
     DBParameterGroupName Ref('ParametersRDS')
-    MasterUsername  FnJoin('', [ '{{resolve:ssm:', FnSub(master_login['username_ssm_param']), ':1}}' ]) if defined? master_login
-    MasterUserPassword FnJoin('', [ '{{resolve:ssm-secure:', FnSub(master_login['password_ssm_param']), ':1}}' ]) if defined? master_login
+    MasterUsername  FnJoin('', [ '{{resolve:ssm:', FnSub(master_login['username_ssm_param']), ':1}}' ]) unless master_login.empty?
+    MasterUserPassword FnJoin('', [ '{{resolve:ssm-secure:', FnSub(master_login['password_ssm_param']), ':1}}' ]) unless master_login.empty?
     DBSnapshotIdentifier  Ref('RDSSnapshotID')
     DBSubnetGroupName  Ref('SubnetGroupRDS')
     VPCSecurityGroups [Ref('SecurityGroupRDS')]
     MultiAZ Ref('MultiAZ')
     Tags  tags + [
-      { Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), component_name, 'instance' ])},
+      { Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), external_parameters[:component_name], 'instance' ])},
       { Key: 'SnapshotID', Value: Ref('RDSSnapshotID')},
-      { Key: 'Version', Value: family}
+      { Key: 'Version', Value: external_parameters[:family]}
     ]
   end
 
-  record = defined?(dns_record) ? dns_record : 'mysql'
+  record = external_parameters.fetch(:dns_record, 'mysql')
 
   Route53_RecordSet('DatabaseIntHostRecord') do
     HostedZoneName FnJoin('', [ Ref('EnvironmentName'), '.', Ref('DnsDomain'), '.'])