convection 2.2.22 → 2.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7f9873b60c460b9fcbd36f676ddefe61ec5c22
-  data.tar.gz: 1c24ca31f9437016b6c27f1581f5da2355a939bb
+  metadata.gz: e662d6e48792dd9a7a0ea181e7df3434298aed5d
+  data.tar.gz: '029532de61278ee217887620c0a3c9ed36e1f17c'
 SHA512:
-  metadata.gz: 0d1cced8050c50e5c0e2d1ceb62514fa3f1ad1aa0218ce3af5ba81dc7dab4e83220bfc6f41f3d983e32587373e9250e2dfae85a25ce1c5fd31f9116ead351b71
-  data.tar.gz: f1a0b5a68ef6e0c2940f6fb53a923ab172a09fafde5cc3189e3b67f2f946c67d8c12b51a5e88802c9adcc1d54da8d3c2d7404b32ab508170cae0e8453bb34de8
+  metadata.gz: e93b1fb2eab063235a2265fc2bf624adbc8920a4c6bb0843ec9b99c8ec2fe3a942706ab128e12413270af44c11999c5adf886ad6930ef4245042282a83f001be
+  data.tar.gz: b0f378d0ec4cfc7974e2b304495e53d014f210da898f49bae3f5e3aa046fad307803a76182af541f63407326d9b4b2dd6cc9656ed96f8d1aedf2cdbd564b0c5d

data/.gitignore

@@ -24,4 +24,5 @@ attic
 *.swo
 *.gem
 *.iml
-.rakeTasks
+.rakeTasks
+.idea/

data/lib/convection/model/template/resource/aws_rds_db_cluster.rb

@@ -0,0 +1,70 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::RDS::DBCluster
+        #
+        # @example
+        #      rds_cluster 'TestCluster' do
+        #           availability_zone 'us-east-1','us-east-2'
+        #           backup_retention 10
+        #           database_name 'test_database'
+        #           identifier 'cluster1'
+        #           cluster_parameter_group_name 'default.aurora5.6'
+        #           subnet_group 'subnet_group'
+        #           engine 'aurora'
+        #           engine_version '5.6.10a'
+        #           kms_key_id 'kms_key'
+        #           master_username 'username'
+        #           master_password 'password'
+        #           port '3306'
+        #           preferred_backup_window '12:30-01:30'
+        #           preferred_maintenance_window 'mon:2:30-mon:3:30'
+        #           replication_source_identifier 'source_instance'
+        #           snapshot_identifier
+        #           storage_encrypted 'false'
+        #           tag 'Name', 'Test'
+        #           vpc_security_group 'test_security_group_1' ,'test_security_group_2'
+        #       end
+        ##
+        class RDSDBCluster < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::RDS::DBCluster', :rds_cluster
+
+          property :availability_zone, 'AvailabilityZones', :type => :list
+          property :backup_retention, 'BackupRetentionPeriod'
+          property :database_name, 'DatabaseName'
+          property :identifier, 'DBClusterIdentifier'
+          property :cluster_parameter_group_name, 'DBClusterParameterGroupName'
+          property :subnet_group, 'DBSubnetGroupName'
+          property :engine, 'Engine'
+          property :engine_version, 'EngineVersion'
+          property :kms_key_id, 'KmsKeyId'
+          # only specify username and password  if you do not specify SnapshotIdentifier
+          property :master_username, 'MasterUsername'
+          property :master_password, 'MasterUserPassword'
+          property :port, 'Port'
+          # backup window must be in the format hh24:mi-hh24:mi, atleast 30 mins long, UTC, cannot conflict with maintenance window.
+          property :preferred_backup_window, 'PreferredBackupWindow'
+          # backup window must be in the format ddd:hh24:mi-ddd:hh24:mi, atleast 30 mins long, UTC, cannot conflict with backup window.
+          property :preferred_maintenance_window, 'PreferredMaintenanceWindow'
+          property :replication_source_identifier, 'ReplicationSourceIdentifier'
+          property :snapshot_identifier, 'SnapshotIdentifier'
+          property :storage_encrypted, 'StorageEncrypted'
+
+          property :vpc_security_group, 'VPCSecurityGroupIds', :type => :list
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_sns_subscription.rb

@@ -0,0 +1,22 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        # @example
+        #   sns_subscription 'MySubscription' do
+        #     endpoint 'failures@example.com'
+        #     protocol 'email'
+        #     topic_arn 'arn:aws:sns:us-west-2:123456789012:example-topic'
+        #   end
+        class SNSSubscription < Resource
+          type 'AWS::SNS::Subscription'
+          property :endpoint, 'Endpoint'
+          property :protocol, 'Protocol'
+          property :topic_arn, 'TopicArn'
+        end
+      end
+    end
+  end
+end

data/spec/convection/model/template/resource/aws_rds_db_cluster_spec.rb

@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+class Convection::Model::Template::Resource
+  describe RDSDBCluster do
+    let(:template) do
+      Convection.template do
+        rds_cluster 'TestCluster' do
+          availability_zone 'us-east-1', 'us-east-2'
+          backup_retention 10
+          database_name 'test_database'
+          identifier 'cluster1'
+          cluster_parameter_group_name 'default.aurora5.6'
+          subnet_group 'subnet_group'
+          engine 'aurora'
+          engine_version '5.6.10a'
+          kms_key_id 'kms_key'
+          master_username 'username'
+          master_password 'password'
+          port '3306'
+          preferred_backup_window '12:30-01:30'
+          preferred_maintenance_window 'mon:2:30-mon:3:30'
+          replication_source_identifier 'source_instance'
+          snapshot_identifier
+          storage_encrypted 'false'
+          tag 'Name', 'Test'
+          vpc_security_group 'test-security-group-1', 'test-security-group-2'
+        end
+      end
+    end
+
+    subject do
+      template_json
+        .fetch('Resources')
+        .fetch('TestCluster')
+        .fetch('Properties')
+    end
+
+    it 'sets the DBClusterIdentifier' do
+      expect(subject['DBClusterIdentifier']).to eq('cluster1')
+    end
+
+    it 'sets the Engine' do
+      expect(subject['Engine']).to eq('aurora')
+    end
+
+    it 'sets the EngineVersion' do
+      expect(subject['EngineVersion']).to eq('5.6.10a')
+    end
+
+    it 'sets the StorageEncrypted' do
+      expect(subject['StorageEncrypted']).to eq('false')
+    end
+
+    it 'sets the Port' do
+      expect(subject['Port']).to eq('3306')
+    end
+
+    it 'sets the BackupRetentionPeriod' do
+      expect(subject['BackupRetentionPeriod']).to eq(10)
+    end
+
+    it 'sets the DatabaseName' do
+      expect(subject['DatabaseName']).to eq('test_database')
+    end
+
+    it 'sets the MasterUsername' do
+      expect(subject['MasterUsername']).to eq('username')
+    end
+
+    it 'sets the MasterUserPassword' do
+      expect(subject['MasterUserPassword']).to eq('password')
+    end
+
+    it 'sets the KmsKeyId' do
+      expect(subject['KmsKeyId']).to eq('kms_key')
+    end
+
+    it 'sets the PreferredBackupWindow' do
+      expect(subject['PreferredBackupWindow']).to eq('12:30-01:30')
+    end
+
+    it 'sets the PreferredMaintenanceWindow' do
+      expect(subject['PreferredMaintenanceWindow']).to eq('mon:2:30-mon:3:30')
+    end
+
+    it 'sets the AvailabilityZones' do
+      expect(subject['AvailabilityZones']).to match_array(['us-east-1', 'us-east-2'])
+    end
+
+    it 'sets the DBSubnetGroupName' do
+      expect(subject['DBSubnetGroupName']).to eq('subnet_group')
+    end
+
+    it 'sets the DBSubnetGroupName' do
+      expect(subject['DBSubnetGroupName']).to eq('subnet_group')
+    end
+
+    it 'sets the VPCSecurityGroupIds' do
+      expect(subject['VPCSecurityGroupIds']).to match_array(['test-security-group-1', 'test-security-group-2'])
+    end
+
+    it 'sets the ReplicationSourceIdentifier' do
+      expect(subject['ReplicationSourceIdentifier']).to eq('source_instance')
+    end
+
+    it 'sets the DBClusterParameterGroupName' do
+      expect(subject['DBClusterParameterGroupName']).to eq('default.aurora5.6')
+    end
+
+    it 'sets tags' do
+      expect(subject['Tags']).to include(hash_including('Key' => 'Name', 'Value' => 'Test'))
+    end
+
+    private
+
+    def template_json
+      JSON.parse(template.to_json)
+    end
+  end
+end

data/spec/convection/model/template/resource/aws_sns_subscription_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+class Convection::Model::Template::Resource
+  describe SNSSubscription do
+    let(:template) do
+      Convection.template do
+        sns_subscription 'MySubscription' do
+          endpoint 'failures@example.com'
+          protocol 'email'
+          topic_arn 'arn:aws:sns:us-west-2:123456789012:example-topic'
+        end
+      end
+    end
+
+    subject do
+      template_json
+        .fetch('Resources')
+        .fetch('MySubscription')
+        .fetch('Properties')
+    end
+
+    it 'sets the Endpoint' do
+      expect(subject['Endpoint']).to eq('failures@example.com')
+    end
+
+    it 'sets the Protocol' do
+      expect(subject['Protocol']).to eq('email')
+    end
+
+    it 'sets the TopicArn' do
+      expect(subject['TopicArn']).to eq('arn:aws:sns:us-west-2:123456789012:example-topic')
+    end
+
+    private
+
+    def template_json
+      JSON.parse(template.to_json)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.2.22
+  version: 2.2.23
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -233,6 +233,7 @@ files:
 - lib/convection/model/template/resource/aws_lambda_version.rb
 - lib/convection/model/template/resource/aws_logs_loggroup.rb
 - lib/convection/model/template/resource/aws_logs_subscription_filter.rb
+- lib/convection/model/template/resource/aws_rds_db_cluster.rb
 - lib/convection/model/template/resource/aws_rds_db_instance.rb
 - lib/convection/model/template/resource/aws_rds_db_parameter_group.rb
 - lib/convection/model/template/resource/aws_rds_db_security_group.rb
@@ -243,6 +244,7 @@ files:
 - lib/convection/model/template/resource/aws_route53_recordset.rb
 - lib/convection/model/template/resource/aws_s3_bucket.rb
 - lib/convection/model/template/resource/aws_s3_bucket_policy.rb
+- lib/convection/model/template/resource/aws_sns_subscription.rb
 - lib/convection/model/template/resource/aws_sns_topic.rb
 - lib/convection/model/template/resource/aws_sns_topic_policy.rb
 - lib/convection/model/template/resource/aws_sqs_queue.rb
@@ -335,6 +337,8 @@ files:
 - spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb
 - spec/convection/model/template/resource/aws_efs_file_system_spec.rb
 - spec/convection/model/template/resource/aws_efs_mount_target_spec.rb
+- spec/convection/model/template/resource/aws_rds_db_cluster_spec.rb
+- spec/convection/model/template/resource/aws_sns_subscription_spec.rb
 - spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
 - spec/convection/model/template/resource/ec2_dhcp_options_spec.rb
 - spec/convection/model/template/resource/ec2_security_group_spec.rb
@@ -407,6 +411,8 @@ test_files:
 - spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb
 - spec/convection/model/template/resource/aws_efs_file_system_spec.rb
 - spec/convection/model/template/resource/aws_efs_mount_target_spec.rb
+- spec/convection/model/template/resource/aws_rds_db_cluster_spec.rb
+- spec/convection/model/template/resource/aws_sns_subscription_spec.rb
 - spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
 - spec/convection/model/template/resource/ec2_dhcp_options_spec.rb
 - spec/convection/model/template/resource/ec2_security_group_spec.rb