cloud_former 0.4.12 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83818f47a0de6309ac20c014f0ed089b926ff31
-  data.tar.gz: 6ce74b6ba8767fd3383664c64c1ba9cdde9764ff
+  metadata.gz: df57f4eb0602f3095f6a30d112a6e403f4f44191
+  data.tar.gz: 8814c1be794511cb9e3b112f08856c0d719fb655
 SHA512:
-  metadata.gz: c4fa66a4fda36099f4cb9c0629b9e61bdbdf6c9a22cdbf3ed7ea83474d7de2460343891fd71a857f8519e6bafef7a667e083b1dc6cebc19944bbf7f727d3d0d4
-  data.tar.gz: fbc669c4fbe29e006938f9a241542c0bdb1cb21d777e01bd555d54fdba20b1dcdf5ee6e698bbb4cde08bc4414c6c1914f79d636bbc32f26b99351fdf3e50d5b3
+  metadata.gz: 10e270789e6da892b451f45d7d66bf04c9c2c75cb437f7212a09890513f514ad83e0507c9f00b5bb6439f025dc9607f517c672e10b73f4cbdf23750f6739e9a8
+  data.tar.gz: 40cf87c4c345782589a13d2307b4b6131c788c74b500d2e07a711f1e2bc5b4a4509d9e9801120d79c0117044bb847db8f68c81b2c75e3200d62970d9e5f15442

data/lib/cloud_former.rb

@@ -22,6 +22,7 @@ module CloudFormer
   autoload :MetadataResource, 'cloud_former/metadata_resources/metadata_resource'
   autoload :Resource, 'cloud_former/resources/resource'
   autoload :ResourceProperty, 'cloud_former/resource_properties/resource_property'
+  autoload :List, 'cloud_former/resources/list'
 
   module AutoScaling
     autoload :AutoScalingGroup, 'cloud_former/resources/auto_scaling/auto_scaling_group'
@@ -193,6 +194,17 @@ module CloudFormer
     autoload :Parameter, 'cloud_former/resource_properties/redshift/parameter'
   end
 
+  module Route53
+    autoload :AliasTarget, 'cloud_former/resource_properties/route53/alias_target'
+    autoload :GeoLocation, 'cloud_former/resource_properties/route53/geo_location'
+    autoload :HostedZone, 'cloud_former/resources/route53/hosted_zone'
+    autoload :HostedZoneConfig, 'cloud_former/resource_properties/route53/hosted_zone_config'
+    autoload :HostedZoneTag, 'cloud_former/resource_properties/route53/hosted_zone_tag'
+    autoload :HostedZoneVPC, 'cloud_former/resource_properties/route53/hosted_zone_vpc'
+    autoload :RecordSet, 'cloud_former/resources/route53/record_set'
+    autoload :RecordSetGroup, 'cloud_former/resources/route53/record_set_group'
+  end
+
   module S3
     autoload :Bucket, 'cloud_former/resources/s3/bucket'
     autoload :CorsConfiguration, 'cloud_former/resource_properties/s3/cors_configuration'

data/lib/cloud_former/has_properties_and_attributes.rb

@@ -66,10 +66,16 @@ module CloudFormer
             if options[:type] < CloudFormer::ResourceProperty || options[:type] < CloudFormer::Resource
               value = if options[:list]
                 count = args.shift
-                count.times.map do |i|
-                  instance = options[:type].new(*args) { instance_exec(i, &block) }
-                  self.nested_resources << instance if instance.is_a?(CloudFormer::Resource)
-                  instance
+                if count == :list
+                  instances = List.new(options, *args, &block).entries
+                  self.nested_resources.concat(instances) if options[:type] < CloudFormer::Resource
+                  instances
+                else
+                  count.times.map do |i|
+                    instance = options[:type].new(*args) { instance_exec(i, &block) }
+                    self.nested_resources << instance if options[:type] < CloudFormer::Resource
+                    instance
+                  end
                 end
               else
                 instance = options[:type].new(*args, &block)

data/lib/cloud_former/resource_properties/route53/alias_target.rb

@@ -0,0 +1,10 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
+module CloudFormer
+  module Route53
+    class AliasTarget < ResourceProperty
+      aws_attribute :dns_name, name: 'DNSName', type: String
+      aws_attribute :evaluate_target_health, type: Boolean
+      aws_attribute :hosted_zone_id, type: String
+    end
+  end
+end

data/lib/cloud_former/resource_properties/route53/geo_location.rb

@@ -0,0 +1,10 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html
+module CloudFormer
+  module Route53
+    class GeoLocation < ResourceProperty
+      aws_attribute :continent_code, type: String
+      aws_attribute :country_code, type: String
+      aws_attribute :subdivision_code, type: String
+    end
+  end
+end

data/lib/cloud_former/resource_properties/route53/hosted_zone_config.rb

@@ -0,0 +1,8 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzoneconfig.html
+module CloudFormer
+  module Route53
+    class HostedZoneConfig < ResourceProperty
+      aws_attribute :comment, type: String
+    end
+  end
+end

data/lib/cloud_former/resource_properties/route53/hosted_zone_tag.rb

@@ -0,0 +1,9 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetags.html
+module CloudFormer
+  module Route53
+    class HostedZoneTag < ResourceProperty
+      aws_attribute :key, type: String
+      aws_attribute :value, type: String
+    end
+  end
+end

data/lib/cloud_former/resource_properties/route53/hosted_zone_vpc.rb

@@ -0,0 +1,9 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone-hostedzonevpcs.html
+module CloudFormer
+  module Route53
+    class HostedZoneVPC < ResourceProperty
+      aws_attribute :vpc_id, name: 'VPCId', type: String
+      aws_attribute :vpc_region, name: 'VPCRegion', type: String
+    end
+  end
+end

data/lib/cloud_former/resources/list.rb

@@ -0,0 +1,25 @@
+module CloudFormer
+  class List
+    def initialize(resource_options, &block)
+      @resource_options = resource_options
+      @entries = []
+      if block.arity == 0
+        instance_eval(&block)
+      else
+        block.call(self)
+      end
+    end
+
+    def entry(*args, &block)
+      @entries << @resource_options[:type].new(*args) do
+        if block.arity == 0
+          instance_eval(&block)
+        else
+          block.call(self)
+        end
+      end
+    end
+
+    attr_reader :entries
+  end
+end

data/lib/cloud_former/resources/route53/hosted_zone.rb

@@ -0,0 +1,11 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html
+module CloudFormer
+  module Route53
+    class HostedZone < Resource
+      aws_property :hosted_zone_config, type: HostedZoneConfig, embed: true
+      aws_property :hosted_zone_tags, type: HostedZoneTag, list: true, embed: true
+      aws_property :_name, type: String
+      aws_property :vpcs, name: 'VPCs', type: HostedZoneVPC, list: true, embed: true
+    end
+  end
+end

data/lib/cloud_former/resources/route53/record_set.rb

@@ -0,0 +1,21 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html
+module CloudFormer
+  module Route53
+    class RecordSet < Resource
+      aws_property :alias_target, type: AliasTarget, embed: true
+      aws_property :comment, type: String
+      aws_property :failover, type: String
+      aws_property :geo_location, type: GeoLocation, embed: true
+      aws_property :health_check_id, type: String
+      aws_property :hosted_zone_id, type: String
+      aws_property :hosted_zone_name, type: String
+      aws_property :_name, type: String
+      aws_property :region, type: String
+      aws_property :resource_records, type: String, list: true
+      aws_property :set_identifier, type: String
+      aws_property :ttl, name: 'TTL', type: String
+      aws_property :type, type: String
+      aws_property :weight, type: Integer
+    end
+  end
+end

data/lib/cloud_former/resources/route53/record_set_group.rb

@@ -0,0 +1,11 @@
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordsetgroup.html
+module CloudFormer
+  module Route53
+    class RecordSetGroup < Resource
+      aws_property :hosted_zone_id, type: String
+      aws_property :hosted_zone_name, type: String
+      aws_property :record_sets, type: RecordSet, list: true
+      aws_property :comment, type: String
+    end
+  end
+end

data/lib/cloud_former/version.rb

@@ -1,3 +1,3 @@
 module CloudFormer
-  VERSION = '0.4.12'
+  VERSION = '0.5.0'
 end

data/spec/resources/list_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe CloudFormer::List do
+  let(:template) { CloudFormer::Template.new }
+
+  it "can build a list of resource properties" do
+    instance = CloudFormer::EC2::Instance.new('instance') do
+      tags :list do
+        entry do
+          key 'A'
+          value '1'
+        end
+
+        entry do
+          key 'B'
+          value '2'
+        end
+      end
+    end
+
+    template.add_resource(instance)
+
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      'Resources' => {
+        'instance' => {
+          'Type' => 'AWS::EC2::Instance',
+          'Properties' => {
+            'Tags' => [
+              {
+                'Key' => 'A',
+                'Value' => '1',
+              },
+              {
+                'Key' => 'B',
+                'Value' => '2',
+              },
+            ],
+          },
+        },
+      },
+    )
+  end
+
+  it "can build a list of resources" do
+    instance = CloudFormer::EC2::Instance.new('instance') do
+      network_interfaces :list do
+        entry do
+          description 'one'
+        end
+
+        entry do
+          description 'two'
+        end
+      end
+    end
+
+    template.add_resource(instance)
+
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      'Resources' => {
+        'instance' => {
+          'Type' => 'AWS::EC2::Instance',
+          'Properties' => {
+            'NetworkInterfaces' => [
+              {
+                'Description' => 'one',
+              },
+              {
+                'Description' => 'two',
+              },
+            ],
+          },
+        },
+      },
+    )
+  end
+end

data/spec/resources/route53_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper'
+
+describe CloudFormer::Route53 do
+  let(:template) { CloudFormer::Template.new }
+
+  it "supports hosted zones" do
+    hosted_zone = CloudFormer::Route53::HostedZone.new('hosted_zone') do
+      hosted_zone_config do
+        comment 'COMMENT'
+      end
+      hosted_zone_tags(1) do
+        key 'KEY'
+        value 'VALUE'
+      end
+      _name 'NAME'
+      vpcs(1) do
+        vpc_id 'VPC ID'
+        vpc_region 'VPC REGION'
+      end
+    end
+    template.add_resource(hosted_zone)
+
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      'Resources' => {
+        'hosted_zone' => {
+          'Type' => 'AWS::Route53::HostedZone',
+          'Properties' => {
+            'HostedZoneConfig' => {
+              'Comment' => 'COMMENT',
+            },
+            'HostedZoneTags' => [
+              {
+                'Key' => 'KEY',
+                'Value' => 'VALUE',
+              },
+            ],
+            'Name' => 'NAME',
+            'VPCs' => [
+              {
+                'VPCId' => 'VPC ID',
+                'VPCRegion' => 'VPC REGION',
+              },
+            ],
+          },
+        }
+      }
+    )
+  end
+
+  it "supports record set groups" do
+    record_set = CloudFormer::Route53::RecordSet.new('record_set') do
+      alias_target do
+        dns_name 'DNS NAME'
+        evaluate_target_health true
+        hosted_zone_id 'HOSTED ZONE ID'
+      end
+      comment 'COMMENT'
+      failover 'FAILOVER'
+      geo_location do
+        continent_code 'CONTINENT CODE'
+        country_code 'COUNTRY CODE'
+        subdivision_code 'SUBDIVISION CODE'
+      end
+      health_check_id 'HEALTH CHECK ID'
+      hosted_zone_id 'HOSTED ZONE ID'
+      hosted_zone_name 'HOSTED ZONE NAME'
+      _name 'NAME'
+      region 'REGION'
+      resource_records ['RESOURCE RECORD']
+      set_identifier 'SET IDENTIFIER'
+      ttl 'TTL'
+      type 'TYPE'
+      weight 2
+    end
+    template.add_resource(record_set)
+
+    record_set_group = CloudFormer::Route53::RecordSetGroup.new('record_set_group') do
+      hosted_zone_id 'HOSTED ZONE ID'
+      hosted_zone_name 'HOSTED ZONE NAME'
+      record_sets [record_set]
+      comment 'COMMENT'
+    end
+    template.add_resource(record_set_group)
+
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      'Resources' => {
+        'record_set' => {
+          'Type' => 'AWS::Route53::RecordSet',
+          'Properties' => {
+            'AliasTarget' => {
+              'DNSName' => 'DNS NAME',
+              'EvaluateTargetHealth' => true,
+              'HostedZoneId' => 'HOSTED ZONE ID',
+            },
+            'Comment' => 'COMMENT',
+            'Failover' => 'FAILOVER',
+            'GeoLocation' => {
+              'ContinentCode' => 'CONTINENT CODE',
+              'CountryCode' => 'COUNTRY CODE',
+              'SubdivisionCode' => 'SUBDIVISION CODE',
+            },
+            'HealthCheckId' => 'HEALTH CHECK ID',
+            'HostedZoneId' => 'HOSTED ZONE ID',
+            'HostedZoneName' => 'HOSTED ZONE NAME',
+            'Name' => 'NAME',
+            'Region' => 'REGION',
+            'ResourceRecords' => ['RESOURCE RECORD'],
+            'SetIdentifier' => 'SET IDENTIFIER',
+            'TTL' => 'TTL',
+            'Type' => 'TYPE',
+            'Weight' => 2,
+          },
+        },
+        'record_set_group' => {
+          'Type' => 'AWS::Route53::RecordSetGroup',
+          'Properties' => {
+            'HostedZoneId' => 'HOSTED ZONE ID',
+            'HostedZoneName' => 'HOSTED ZONE NAME',
+            'RecordSets' => [{'Ref' => 'record_set'}],
+            'Comment' => 'COMMENT',
+          },
+        },
+      },
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_former
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.5.0
 platform: ruby
 authors:
 - Aubrey Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,6 +160,11 @@ files:
 - lib/cloud_former/resource_properties/rds/security_group_rule.rb
 - lib/cloud_former/resource_properties/redshift/parameter.rb
 - lib/cloud_former/resource_properties/resource_property.rb
+- lib/cloud_former/resource_properties/route53/alias_target.rb
+- lib/cloud_former/resource_properties/route53/geo_location.rb
+- lib/cloud_former/resource_properties/route53/hosted_zone_config.rb
+- lib/cloud_former/resource_properties/route53/hosted_zone_tag.rb
+- lib/cloud_former/resource_properties/route53/hosted_zone_vpc.rb
 - lib/cloud_former/resource_properties/s3/cors_configuration.rb
 - lib/cloud_former/resource_properties/s3/cors_rule.rb
 - lib/cloud_former/resource_properties/s3/lifecycle_configuration.rb
@@ -233,6 +238,7 @@ files:
 - lib/cloud_former/resources/iam/user.rb
 - lib/cloud_former/resources/iam/user_to_group_addition.rb
 - lib/cloud_former/resources/kinesis/stream.rb
+- lib/cloud_former/resources/list.rb
 - lib/cloud_former/resources/rds/db_instance.rb
 - lib/cloud_former/resources/rds/db_parameter_group.rb
 - lib/cloud_former/resources/rds/db_security_group.rb
@@ -243,6 +249,9 @@ files:
 - lib/cloud_former/resources/redshift/cluster_security_group_ingress.rb
 - lib/cloud_former/resources/redshift/cluster_subnet_group.rb
 - lib/cloud_former/resources/resource.rb
+- lib/cloud_former/resources/route53/hosted_zone.rb
+- lib/cloud_former/resources/route53/record_set.rb
+- lib/cloud_former/resources/route53/record_set_group.rb
 - lib/cloud_former/resources/s3/bucket.rb
 - lib/cloud_former/resources/sns/topic.rb
 - lib/cloud_former/resources/sqs/queue.rb
@@ -258,6 +267,8 @@ files:
 - spec/resources/auto_scaling/notification_configuration_spec.rb
 - spec/resources/iam/access_key_spec.rb
 - spec/resources/iam/user_spec.rb
+- spec/resources/list_spec.rb
+- spec/resources/route53_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/type_enforcement.rb
@@ -282,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby DSL for creating CloudFormation templates
@@ -296,6 +307,8 @@ test_files:
 - spec/resources/auto_scaling/notification_configuration_spec.rb
 - spec/resources/iam/access_key_spec.rb
 - spec/resources/iam/user_spec.rb
+- spec/resources/list_spec.rb
+- spec/resources/route53_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/type_enforcement.rb