cloud_former 0.7.12 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4e0066415458e1b308b34881e13df101730477
-  data.tar.gz: 70dc364ad688eb1d51ecb86736c353886930accb
+  metadata.gz: 7572dd274fed161720cc0bf56518b9fdb0d4cfe2
+  data.tar.gz: 608558f4dd6f2fd242130b6a22dbda0cadf29a9e
 SHA512:
-  metadata.gz: 3e447a2b1ba44a4df5b9895ad595e5c39fad7cbdb3e786df3635bffea03420d76e72e927ccd41f5cab354e8fa747cfda9d3e6e3b732083945f8d60bb1ea5c988
-  data.tar.gz: 8ea81d86feca1a79f97fa2bfcd45716057c343ece50646a4e752b8ae302a8f54b173ee7c7662f0bc73d5a7247733fb54442b9f386c1b6041eca8eb98fb7dade3
+  metadata.gz: ee3881b6dea3cd6bfee8ec8ebc22fea001e19fdd5e2589a0e11c78b981f29550daa5ead304a6a8e5401afa6065ad49dfdecdb26506b0633e0bb6f20b21c00c0b
+  data.tar.gz: 336f51df5f003b6ca5e9fc7038f6975503e4afc5fba8795f6dc609ca1d0f452a743988dc15659b1f0797375b3808294f64b78b1b172d8671ac6d82f22735d7a2

data/lib/cloud_former.rb

@@ -3,6 +3,28 @@ require 'cloud_former/has_properties_and_attributes'
 require 'cloud_former/makes_json'
 
 module CloudFormer
+  def self.types
+    @types ||= {}
+  end
+
+  def self.type_to_class(type)
+    mod, name = types[type]
+    return nil if mod.nil?
+    value = mod.const_get(name)
+    value.is_a?(Class) && value < Resource ? value : nil
+  end
+
+  refine Module do
+    def autoload(constant_name, path)
+      super
+      namespace = self.name.to_s.sub(/\ACloudFormer::/, '').gsub(/([a-z])([A-Z])/, '\\1_\\2').gsub('::', '.').downcase
+      base_name = constant_name.to_s.gsub(/([a-z])([A-Z])/, '\\1_\\2').downcase
+      ::CloudFormer.types["#{namespace}.#{base_name}"] = [self, constant_name]
+    end
+  end
+
+  using self
+
   autoload :Boolean, 'cloud_former/boolean'
   autoload :Parameter, 'cloud_former/parameters/parameter'
   autoload :CommaDelimitedListParameter, 'cloud_former/parameters/comma_delimited_list_parameter'
@@ -132,6 +154,12 @@ module CloudFormer
     autoload :VPNGatewayRoutePropagation, 'cloud_former/resources/ec2/vpn_gateway_route_propagation'
   end
 
+  module EFS
+    autoload :FileSystem, 'cloud_former/resources/efs/file_system'
+    autoload :FileSystemTag, 'cloud_former/resource_properties/efs/file_system_tag'
+    autoload :MountTarget, 'cloud_former/resources/efs/mount_target'
+  end
+
   module ElastiCache
     autoload :CacheCluster, 'cloud_former/resources/elasti_cache/cache_cluster'
     autoload :ParameterGroup, 'cloud_former/resources/elasti_cache/parameter_group'

data/lib/cloud_former/resource_properties/efs/file_system_tag.rb

@@ -0,0 +1,9 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-filesystemtags.html
+module CloudFormer
+  module EFS
+    class FileSystemTag < ResourceProperty
+      aws_attribute :key, type: String
+      aws_attribute :value, type: String
+    end
+  end
+end

data/lib/cloud_former/resources/efs/file_system.rb

@@ -0,0 +1,8 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html
+module CloudFormer
+  module EFS
+    class FileSystem < Resource
+      aws_property :file_system_tags, list: true, embed: true, type: FileSystemTag
+    end
+  end
+end

data/lib/cloud_former/resources/efs/mount_target.rb

@@ -0,0 +1,11 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html
+module CloudFormer
+  module EFS
+    class MountTarget < Resource
+      aws_property :file_system_id, type: String
+      aws_property :ip_address, type: String
+      aws_property :security_groups, list: true, type: String
+      aws_property :subnet_id, type: String
+    end
+  end
+end

data/lib/cloud_former/template.rb

@@ -25,9 +25,19 @@ module CloudFormer
       param
     end
 
-    def add_resource(resource)
+    def add_resource(*args, &block)
+      if args.size == 1
+        resource = args.first
+      elsif args.size == 2
+        type, name = *args
+        klass = CloudFormer.type_to_class(type)
+        resource = klass.new(name, &block)
+      else
+        raise ArgumentErrror, "wrong number of args (#{args.size} for 1..2)"
+      end
       raise "Overwriting resource with name #{resource.get_name}" if @resources.any? { |r| r.get_name == resource.get_name }
       @resources << resource
+      resource
     end
 
     def resource(name)

data/lib/cloud_former/version.rb

@@ -1,3 +1,3 @@
 module CloudFormer
-  VERSION = '0.7.12'
+  VERSION = '0.8.0'
 end

data/spec/cloud_former_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe CloudFormer do
+  describe ".type_to_class" do
+    it "returns the class for the given resource type" do
+      klass = CloudFormer.type_to_class('ec2.security_group')
+      expect(klass).to be(CloudFormer::EC2::SecurityGroup)
+    end
+
+    it "is nil for non-Resource constants" do
+      expect(CloudFormer.type_to_class('ec2.mount_point')).to be_nil
+    end
+
+    it "is nil for rubbish" do
+      expect(CloudFormer.type_to_class('rubbish')).to be_nil
+    end
+  end
+end

data/spec/has_properties_and_attributes_spec.rb

@@ -24,45 +24,6 @@ describe CloudFormer::HasPropertiesAndAttributes do
     )
   end
 
-  it "supports builds nested resource lists via blocks" do
-    auto_scaling_group = CloudFormer::AutoScaling::LaunchConfiguration.new('myconfig') do
-      image_id 'ami-123456'
-      security_groups(2) do |i|
-        name "name #{i}"
-        group_description "security group #{i}"
-      end
-    end
-    template.add_resource(auto_scaling_group)
-
-    expect(template.dump_json).to eq(
-      "AWSTemplateFormatVersion" => "2010-09-09",
-      "Resources" => {
-        "myconfig" => {
-          "Type" => "AWS::AutoScaling::LaunchConfiguration",
-          "Properties" => {
-            "ImageId" => "ami-123456",
-            "SecurityGroups" => [
-              {"Ref" => "name 0"},
-              {"Ref" => "name 1"},
-            ],
-          },
-        },
-        "name 0" => {
-          "Type" => "AWS::EC2::SecurityGroup",
-          "Properties" => {
-            "GroupDescription" => "security group 0",
-          },
-        },
-        "name 1" => {
-          "Type" => "AWS::EC2::SecurityGroup",
-          "Properties" => {
-            "GroupDescription" => "security group 1",
-          },
-        },
-      },
-    )
-  end
-
   it "supports builds nested resource properties via blocks" do
     instance = CloudFormer::EC2::Instance.new('myinstance') do
       # list

data/spec/metadata_spec.rb

@@ -55,7 +55,7 @@ describe 'stupid metadata' do
         },
         'Metadata' => {
           'AWS::CloudFormation::Authentication' => {
-            authentication_item.name => {
+            authentication_item.get_name => {
               'accessKeyId' => 12,
               'password' => 'ack',
               'secretKey' => 'boom'
@@ -148,5 +148,3 @@ describe 'stupid metadata' do
   end
 
 end
-
-

data/spec/resources/efs/file_system_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe CloudFormer::EFS::FileSystem do
+  it "should generate correct json" do
+    fs = CloudFormer::EFS::FileSystem.new('file_system') do
+      file_system_tags :list do
+        entry do
+          key 'Name'
+          value 'TestFileSystem'
+        end
+      end
+    end
+
+    expect(fs.dump_json).to eq({
+      "Type" => "AWS::EFS::FileSystem",
+      "Properties" => {
+        "FileSystemTags" => [
+          {
+            "Key" => "Name",
+            "Value" => "TestFileSystem",
+          },
+        ]
+      }
+    })
+  end
+end

data/spec/resources/efs/mount_target_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe CloudFormer::EFS::MountTarget do
+  it "should generate correct json" do
+    fs = CloudFormer::EFS::MountTarget.new('mount_target') do
+      file_system_id 'fs-123'
+      subnet_id 'subnet-123'
+      security_groups ['sg-123', 'sg-456']
+    end
+
+    expect(fs.dump_json).to eq({
+      "Type" => "AWS::EFS::MountTarget",
+      "Properties" => {
+        "FileSystemId"=> "fs-123",
+        "SubnetId" => "subnet-123",
+        "SecurityGroups" => ["sg-123", "sg-456"],
+      }
+    })
+  end
+end

data/spec/template_spec.rb

@@ -37,7 +37,7 @@ describe CloudFormer::Template do
     expect(template.dump_json).to eq(
       'AWSTemplateFormatVersion' => '2010-09-09',
       'Resources' => {
-        resource.name => {
+        resource.get_name => {
           'Type' => resource.aws_type,
           'Properties' => {
             'Status' => 'Active',
@@ -47,4 +47,22 @@ describe CloudFormer::Template do
       },
     )
   end
+
+  it "can add resources inline" do
+    resource = template.add_resource 'ec2.instance', 'MyInstance' do
+      availability_zone 'us-east-1a'
+    end
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      'Resources' => {
+        'MyInstance' => {
+          'Type' => 'AWS::EC2::Instance',
+          'Properties' => {
+            'AvailabilityZone' => 'us-east-1a',
+          },
+        },
+      },
+    )
+    expect(resource).to be_a(CloudFormer::EC2::Instance)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_former
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.8.0
 platform: ruby
 authors:
 - Aubrey Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -167,6 +167,7 @@ files:
 - lib/cloud_former/resource_properties/ec2/private_ip_address_specification.rb
 - lib/cloud_former/resource_properties/ec2/security_group_rule.rb
 - lib/cloud_former/resource_properties/ec2/tag.rb
+- lib/cloud_former/resource_properties/efs/file_system_tag.rb
 - lib/cloud_former/resource_properties/elastic_beanstalk/environment_tier.rb
 - lib/cloud_former/resource_properties/elastic_beanstalk/option_setting.rb
 - lib/cloud_former/resource_properties/elastic_beanstalk/source_bundle.rb
@@ -249,6 +250,8 @@ files:
 - lib/cloud_former/resources/ec2/vpn_connection_route.rb
 - lib/cloud_former/resources/ec2/vpn_gateway.rb
 - lib/cloud_former/resources/ec2/vpn_gateway_route_propagation.rb
+- lib/cloud_former/resources/efs/file_system.rb
+- lib/cloud_former/resources/efs/mount_target.rb
 - lib/cloud_former/resources/elasti_cache/cache_cluster.rb
 - lib/cloud_former/resources/elasti_cache/parameter_group.rb
 - lib/cloud_former/resources/elasti_cache/security_group.rb
@@ -290,6 +293,7 @@ files:
 - lib/cloud_former/resources/sqs/queue_policy.rb
 - lib/cloud_former/template.rb
 - lib/cloud_former/version.rb
+- spec/cloud_former_spec.rb
 - spec/conditions_spec.rb
 - spec/has_properties_and_attributes_spec.rb
 - spec/metadata_spec.rb
@@ -298,6 +302,8 @@ files:
 - spec/resources/auto_scaling/auto_scaling_group_spec.rb
 - spec/resources/auto_scaling/launch_configuration_spec.rb
 - spec/resources/auto_scaling/notification_configuration_spec.rb
+- spec/resources/efs/file_system_spec.rb
+- spec/resources/efs/mount_target_spec.rb
 - spec/resources/iam/access_key_spec.rb
 - spec/resources/iam/user_spec.rb
 - spec/resources/list_spec.rb
@@ -326,11 +332,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Ruby DSL for creating CloudFormation templates
 test_files:
+- spec/cloud_former_spec.rb
 - spec/conditions_spec.rb
 - spec/has_properties_and_attributes_spec.rb
 - spec/metadata_spec.rb
@@ -339,6 +346,8 @@ test_files:
 - spec/resources/auto_scaling/auto_scaling_group_spec.rb
 - spec/resources/auto_scaling/launch_configuration_spec.rb
 - spec/resources/auto_scaling/notification_configuration_spec.rb
+- spec/resources/efs/file_system_spec.rb
+- spec/resources/efs/mount_target_spec.rb
 - spec/resources/iam/access_key_spec.rb
 - spec/resources/iam/user_spec.rb
 - spec/resources/list_spec.rb