convection 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8835c1ffa38c162454a2b0ccd3d0e7b6c449e5d4
-  data.tar.gz: d5b208cd2633e490c318f71e1fe6267e43f69f92
+  metadata.gz: cb2010f68c26e062f363f9f6cd23d81116289bcc
+  data.tar.gz: fa8a0b5abd46850ea5039a2a66455bc3a737dc88
 SHA512:
-  metadata.gz: 792cb42b688ccd93f1682f514e015a4d2c6ebd680eb72aba0bc2027d8a59a97af739d611bfa2d04dfb527d871a7fa9837ba91771fa6f1a9507787c11617e55f8
-  data.tar.gz: bd5f229ccc8e897466ee302920d8953d576f71fc68ae794fa80bdd2da228a44a26e62ec10bc7b20afc5457e7e0fdb57126f562e8d7b0c519e62a67a980aac68f
+  metadata.gz: 47c4470be626ca85d8f01fc36bd37cdfecfb7d61ac06f75ef84e28d85ca134338822078ac5db164951ea3a023cdcabe8dcff9c2a4524894b517055f1e157187b
+  data.tar.gz: bcc187ba6881d9037a1f56f5afebfbbc982a2573a14f7142a4170ac689048870def3d8ccd7aee6e1ed09bd80344580c94dbbc46cc94bde1ea671562baa5eef0c

data/lib/convection/model/event.rb

@@ -14,7 +14,8 @@ module Convection
       attr_accessor :level
       attr_accessor :timestamp
       colorize :level,
-               :green => [:info, :success, Control::Stack::CREATE_COMPLETE, Control::Stack::UPDATE_COMPLETE, Control::Stack::UPDATE_ROLLBACK_COMPLETE,
+               :cyan => [:info],
+               :green => [:success, Control::Stack::CREATE_COMPLETE, Control::Stack::UPDATE_COMPLETE, Control::Stack::UPDATE_ROLLBACK_COMPLETE,
                           Control::Stack::TASK_COMPLETE],
                :red => [:error, :fail, Control::Stack::CREATE_FAILED, Control::Stack::ROLLBACK_FAILED,
                         Control::Stack::DELETE_FAILED, Control::Stack::UPDATE_FAILED,

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

@@ -0,0 +1,25 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        # Represents an {https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html
+        # Amazon EFS File System}
+        class EFSFileSystem < Resource
+          include Model::Mixin::Taggable
+          alias file_system_tag tag
+
+          type 'AWS::EFS::FileSystem'
+          property :performance_mode, 'PerformanceMode'
+
+          def render(*args)
+            super.tap do |resource|
+              resource['Properties']['FileSystemTags'] = tags.render unless tags.empty?
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        # Represents an {https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html
+        # Amazon EFS Mount Target}
+        class EFSMountTarget < Resource
+          type 'AWS::EFS::MountTarget'
+          property :file_system_id, 'FileSystemId'
+          property :ip_address, 'IpAddress'
+          property :security_groups, 'SecurityGroups', :type => :list
+          property :subnet_id, 'SubnetId'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+class Convection::Model::Template::Resource
+  describe EFSFileSystem do
+    subject do
+      parent = double(:template)
+      allow(parent).to receive(:template).and_return(parent)
+
+      described_class.new('MyEFSFileSystem', parent)
+    end
+
+    it 'allows FileSystemTags to be set' do
+      expected_tags = []
+      expected_tags << { 'Key' => 'key-1', 'Value' => 'value-1' }
+      expected_tags << { 'Key' => 'key-2', 'Value' => 'value-2' }
+
+      expect(subject.render['Properties']['FileSystemTags']).to be_nil
+      subject.tag 'key-1', 'value-1'
+      subject.file_system_tag 'key-2', 'value-2'
+      expect(subject.render['Properties']['FileSystemTags']).to eq(expected_tags)
+    end
+
+    it 'allows PerformanceMode to be set' do
+      expect(subject.render['Properties']['PerformanceMode']).to be_nil
+      subject.performance_mode 'maxIO'
+      expect(subject.render['Properties']['PerformanceMode']).to eq('maxIO')
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+class Convection::Model::Template::Resource
+  describe EFSMountTarget do
+    subject do
+      parent = double(:template)
+      allow(parent).to receive(:template).and_return(parent)
+
+      described_class.new('MyEFSMountTarget', parent)
+    end
+
+    it 'allows FileSystemId to be set' do
+      expect(subject.render['Properties']['FileSystemId']).to be_nil
+      subject.file_system_id 'fs-1'
+      expect(subject.render['Properties']['FileSystemId']).to eq('fs-1')
+    end
+
+    it 'allows IpAddress to be set' do
+      expect(subject.render['Properties']['IpAddress']).to be_nil
+      subject.ip_address '127.0.0.1'
+      expect(subject.render['Properties']['IpAddress']).to eq('127.0.0.1')
+    end
+
+    it 'allows SecurityGroups to be set' do
+      expect(subject.render['Properties']['SecurityGroups']).to be_nil
+      subject.security_groups ['sg-1', 'sg-2']
+      expect(subject.render['Properties']['SecurityGroups']).to eq(['sg-1', 'sg-2'])
+    end
+
+    it 'allows SubnetId to be set' do
+      expect(subject.render['Properties']['SubnetId']).to be_nil
+      subject.subnet_id 's-1'
+      expect(subject.render['Properties']['SubnetId']).to eq('s-1')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -185,6 +185,8 @@ files:
 - lib/convection/model/template/resource/aws_ec2_vpn_gateway.rb
 - lib/convection/model/template/resource/aws_ec2_vpn_gateway_route_propagation.rb
 - lib/convection/model/template/resource/aws_ecr_repository.rb
+- lib/convection/model/template/resource/aws_efs_file_system.rb
+- lib/convection/model/template/resource/aws_efs_mount_target.rb
 - lib/convection/model/template/resource/aws_elasticache_cluster.rb
 - lib/convection/model/template/resource/aws_elasticache_parameter_group.rb
 - lib/convection/model/template/resource/aws_elasticache_replication_group.rb
@@ -308,6 +310,8 @@ files:
 - spec/convection/model/cloudfile_spec.rb
 - spec/convection/model/template/condition_spec.rb
 - 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/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
@@ -378,6 +382,8 @@ test_files:
 - spec/convection/model/cloudfile_spec.rb
 - spec/convection/model/template/condition_spec.rb
 - 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/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