convection 1.0.0.pre.beta.1 → 1.0.0.pre.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad55266b8d4a5fd1a16d8b8c396a3c2ecc22b27
-  data.tar.gz: 4c5ae734856b196c13f39fc42fd85fc69745a6bb
+  metadata.gz: 2907e41b969e077bc2ac2cee703ff8bef61d730b
+  data.tar.gz: 2909f0be3908981a8828c72ddee7b840471bc9f0
 SHA512:
-  metadata.gz: 018341e258e456483c9f5ebde1116cd8a71196fb972b865c62f08f0f3b87dca8a0f010e6b9e9d995c36b39240b9cdc54b0dbb7abd9f58dd252951eed766c9447
-  data.tar.gz: 8a9a17d9ee215c6b6c1c26340e99bae7a13518f7a24d62362d02aa3302916a7f8cea93b07840c003cfa8f4859c65ffdf4af4b6496b256fb1101a2de42943cf96
+  metadata.gz: fc91f97a7303f5c3bb7bca558568b933a8a2f514a6efe5d3a29a6e20d59eed3b27d14139ee574587aae3cc31ae95f30c068d31cd67d263323992a061493e49f2
+  data.tar.gz: fd7b48f9acc7b0be07f8fc3f2205d3dd42709d0bc40be0d310b4258174a69fe32bcdac404a61a92e6c985e18826c16d3c905580dd8c792f56c9755f1a07dd315

data/.gitignore

@@ -17,3 +17,9 @@ mkmf.log
 keys
 VERSION
 attic
+
+.ruby-gemset
+
+*.swp
+*.swo
+*.gem

data/README.md

@@ -45,5 +45,7 @@ Or install it yourself as:
 ## Documentation
 We highly recommend consulting the [getting started guide](./docs/getting-started.md) for a in depth walk through on how to to set up your project and create and deploy a stack. Example stacks and resources are available in the [convection/example](https://github.com/rapid7/convection/tree/master/example) folder
 
+Additionally you can generate the Ruby API documentation by executing `bundle exec rake yard`.
+
 ## License
 Convection is distributed under the MIT license - please refer to the [LICENSE](LICENSE.md) for more information.

data/bin/convection

@@ -73,19 +73,19 @@ module Convection
     end
 
     desc 'describe-tasks [--stacks STACKS]', 'Describe tasks for a given stack'
+    option :cloudfile, :type => :string, :default => 'Cloudfile'
     option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to diff', default: []
     def describe_tasks
-      @cloud = Control::Cloud.new
-      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
+      init_cloud
 
       describe_stack_tasks(options[:stacks])
     end
 
     desc 'run-tasks [--stack STACK]', 'Run tasks for a given stack'
+    option :cloudfile, :type => :string, :default => 'Cloudfile'
     option :stack, :desc => 'The stack to run tasks for', :required => true
     def run_tasks
-      @cloud = Control::Cloud.new
-      @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
+      init_cloud
 
       run_stack_tasks(options[:stack])
     end
@@ -219,6 +219,11 @@ module Convection
       end
 
       def init_cloud
+        if options['cloudfile'].nil?
+          warn 'ERROR: The you must specify the --cloudfile option.'
+          exit 1
+        end
+
         @cloud = Control::Cloud.new
         @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
       end

data/docs/getting-started.md

@@ -591,8 +591,11 @@ update_complete  convection-demo-vpc: (AWS::CloudFormation::Stack)
 Now that we've got our security group, we need to set up an EC2 instance that
 will function as a NAT router. We'll be using one of [Amazon's pre-built NAT
 images][nat-instance] since we don't need anything custom. Open up the Amazon
-web console and search for AMIs with the string "amzn-ami-vpc-nat-pv" in their
-name. The most recent one, from March 2015, has ID ami-c02b04a8.
+web console and search for AMIs with the string "amzn-ami-vpc-nat-hvm" in their
+name. The most recent one, from September 2016, has ID ami-d2ee95c5.
+Note that the default instance type is m1.small, which doesn't work with
+hvm AMIs, so you'll need to choose a different instance type, such as
+t2.small.
 
 The [AWS::EC2::Instance][cf-ec2] resource handles creating our
 router instance from the given AMI. Since our router provides internet access,
@@ -648,6 +651,7 @@ module Templates
     ec2_instance 'NATInstance' do
       tag 'Name', "#{stack.cloud}-#{stack.name}-nat"
       image_id 'ami-c02b04a8'
+      instance_type 't2.small'
       subnet fn_ref('PublicSubnet')
       security_group fn_ref('NATSecurityGroup')
       src_dst_checks false

data/docs/index.md

@@ -45,5 +45,7 @@ Or install it yourself as:
 ## Documentation
 We highly recommend consulting the [getting started guide](./docs/getting-started.md) for a in depth walk through on how to to set up your project and create and deploy a stack. Example stacks and resources are available in the [convection/example](https://github.com/rapid7/convection/tree/master/example) folder
 
+Additionally you can generate the Ruby API documentation by executing `bundle exec rake yard`.
+
 ## License
 Convection is distributed under the MIT license - please refer to the [LICENSE](LICENSE.md) for more information.

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

@@ -0,0 +1,34 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::CertificateManager::Certificate
+        ##
+        class CertificateManagerCertificate < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::CertificateManager::Certificate', :certificate_manager_certificate
+          property :domain_name, 'DomainName'
+          property :domain_validation_options, 'DomainValidationOptions', :type => :list
+          property :subject_alternative_names, 'SubjectAlternativeNames', :type => :list
+
+          # Append a domain_validation_option to domain_validation_options
+          def domain_validation_option(&block)
+            option = ResourceProperty::CertificateManagerCertificateDomainValidationOption.new(self)
+            option.instance_exec(&block) if block
+            domain_validation_options << option
+          end
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,6 +25,7 @@ module Convection
           property :policy, 'Policies', :type => :list
           property :scheme, 'Scheme'
           property :security_group, 'SecurityGroups', :type => :list
+          alias security_groups security_group
           property :subnet, 'Subnets', :type => :list
 
           def render(*args)

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

@@ -0,0 +1,35 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElasticLoadBalancingV2::Listener
+        ##
+        class ELBV2Listener < Resource
+          type 'AWS::ElasticLoadBalancingV2::Listener', :elbv2_listener
+          property :certificates, 'Certificates', :type => :list
+          property :default_actions, 'DefaultActions', :type => :list
+          property :load_balancer_arn, 'LoadBalancerArn'
+          property :port, 'Port'
+          property :protocol, 'Protocol'
+          property :ssl_policy, 'SslPolicy'
+
+          def certificate(&block)
+            cert = ResourceProperty::ELBV2ListenerCertificates.new(self)
+            cert.instance_exec(&block) if block
+            certificates << cert
+          end
+
+          # Append an action to default_actions
+          def default_action(&block)
+            action = ResourceProperty::ELBV2ListenerDefaultAction.new(self)
+            action.instance_exec(&block) if block
+            default_actions << action
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElasticLoadBalancingV2::ListenerRule
+        ##
+        class ELBV2ListenerRule < Resource
+          type 'AWS::ElasticLoadBalancingV2::ListenerRule', :elbv2_listener_rule
+          property :actions, 'Actions', :type => :list
+          # @note This name is used because "conditions" is a function already defined
+          #   in {#Convection::Model::Template} and should not be overridden.
+          property :rule_conditions, 'Conditions', :type => :list
+          property :listener_arn, 'ListenerArn'
+          property :priority, 'Priority'
+
+          # Append an action
+          def action(&block)
+            action = ResourceProperty::ELBV2ListenerRuleAction.new(self)
+            action.instance_exec(&block) if block
+            actions << action
+          end
+
+          # Append a condition
+          #
+          # @note This name is used because "condition" is a function already defined
+          #   in {#Convection::Model::Template} and should not be overridden.
+          def rule_condition(&block)
+            cond = ResourceProperty::ELBV2ListenerRuleCondition.new(self)
+            cond.instance_exec(&block) if block
+            rule_conditions << cond
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElasticLoadBalancingV2::LoadBalancer
+        ##
+        class ELBV2LoadBalancer < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::ElasticLoadBalancingV2::LoadBalancer', :elbv2_load_balancer
+          property :load_balancer_attributes, 'LoadBalancerAttributes', :type => :list
+          property :name, 'Name'
+          property :scheme, 'Scheme'
+          property :security_group, 'SecurityGroups', :type => :list
+          alias security_groups security_group
+          property :subnet, 'Subnets', :type => :list
+          alias subnets subnet
+
+          # Append a load_balancer_attribute to load_balancer_attributes
+          def load_balancer_attribute(&block)
+            attribute = ResourceProperty::ELBV2LoadBalancerAttribute.new(self)
+            attribute.instance_exec(&block) if block
+            load_balancer_attributes << attribute
+          end
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElasticLoadBalancingV2::TargetGroup
+        ##
+        class ELBV2TargetGroup < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::ElasticLoadBalancingV2::TargetGroup', :elbv2_target_group
+          property :health_check_interval_seconds, 'HealthCheckIntervalSeconds'
+          property :health_check_path, 'HealthCheckPath'
+          property :health_check_port, 'HealthCheckPort'
+          property :health_check_protocol, 'HealthCheckProtocol'
+          property :health_check_timeout_seconds, 'HealthCheckTimeoutSeconds'
+          property :healthy_threshold_count, 'HealthyThresholdCount'
+          property :match, 'Matcher'
+          property :name, 'Name'
+          property :port, 'Port'
+          property :protocol, 'Protocol'
+          property :target_group_attributes, 'TargetGroupAttributes', :type => :list
+          property :targets, 'Targets', :type => :list
+          alias target_descriptions targets
+          property :unhealthy_threshold_count, 'UnhealthyThresholdCount'
+          property :vpc_id, 'VpcId'
+
+          # Append an attribute to target_group_attributes
+          def target_group_attribute(&block)
+            attribute = ResourceProperty::ELBV2TargetGroupAttribute.new(self)
+            attribute.instance_exec(&block) if block
+            target_group_attributes << attribute
+          end
+
+          # Append a target_description to targets
+          def target(&block)
+            target = ResourceProperty::ELBV2TargetGroupTargetDescription.new(self)
+            target.instance_exec(&block) if block
+            targets << target
+          end
+          alias target_description target
+
+          def matcher(&block)
+            m = ResourceProperty::ELBV2TargetGroupMatcher.new(self)
+            m.instance_exec(&block) if block
+            properties['Matcher'].set(m)
+          end
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,13 +9,15 @@ module Convection
         ##
         class Route53RecordSet < Resource
           type 'AWS::Route53::RecordSet', :route53_recordset
-          property :alias_target, 'AliasTarget'
+          property :alias_tgt, 'AliasTarget'
           property :comment, 'Comment'
           property :failover, 'Failover'
-          property :geo_location, 'GeoLocation', :array
+          property :geo_loc, 'GeoLocation'
           property :health_check_id, 'HealthCheckId'
-          property :zone, 'HostedZoneId'
-          property :zone_name, 'HostedZoneName'
+          property :hosted_zone_id, 'HostedZoneId'
+          alias zone hosted_zone_id # for backward compatability
+          property :hosted_zone_name, 'HostedZoneName'
+          alias zone_name hosted_zone_name # for backward compatability
           property :record_name, 'Name'
           property :region, 'Region'
           property :record, 'ResourceRecords', :array
@@ -23,6 +25,18 @@ module Convection
           property :ttl, 'TTL'
           property :record_type, 'Type'
           property :weight, 'Weight'
+
+          def alias_target(&block)
+            a = ResourceProperty::Route53AliasTarget.new(self)
+            a.instance_exec(&block) if block
+            properties['AliasTarget'].set(a)
+          end
+
+          def geo_location(&block)
+            g = ResourceProperty::Route53GeoLocation.new(self)
+            g.instance_exec(&block) if block
+            properties['GeoLocation'].set(g)
+          end
         end
       end
     end

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

@@ -25,6 +25,7 @@ module Convection
           property :notification_configuration, 'NotificationConfiguration'
           property :replication_configuration, 'ReplicationConfiguration'
           property :versioning_configuration, 'VersioningConfiguration'
+          property :website_configuration, 'WebsiteConfiguration'
 
           def cors_configuration(&block)
             config = ResourceProperty::S3CorsConfiguration.new(self)
@@ -43,6 +44,12 @@ module Convection
             properties['ReplicationConfiguration'].set(config)
           end
 
+          def website_configuration(&block)
+            config = ResourceProperty::S3WebsiteConfiguration.new(self)
+            config.instance_exec(&block) if block
+            properties['WebsiteConfiguration'].set(config)
+          end
+
           def render(*args)
             super.tap do |resource|
               render_tags(resource)

data/lib/convection/model/template/resource_property/aws_certificate_manager_certificate_domain_validation_option.rb

@@ -0,0 +1,16 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents a {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html
+        # Certificate Manager Certificate DomainValidationOption Type}
+        class CertificateManagerCertificateDomainValidationOption < ResourceProperty
+          property :domain_name, 'DomainName'
+          property :validation_domain, 'ValidationDomain'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_cloudfront_defaultcachebehavior.rb

@@ -12,6 +12,7 @@ module Convection
           property :compress, 'Compress'
           property :default_ttl, 'DefaultTTL'
           property :forwarded_values, 'ForwardedValues'
+          property :max_ttl, 'MaxTTL'
           property :min_ttl, 'MinTTL'
           property :smooth_streaming, 'SmoothStreaming'
           property :target_origin, 'TargetOriginId'

data/lib/convection/model/template/resource_property/aws_elbv2_listener_certificates.rb

@@ -0,0 +1,15 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents a {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html
+        # Elastic Load Balancing Listener Certificates}
+        class ELBV2ListenerCertificates < ResourceProperty
+          property :certificate_arn, 'CertificateArn'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_listener_default_action.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-defaultactions.html
+        # ELBV2 Listener DefaultAction type}
+        class ELBV2ListenerDefaultAction < ResourceProperty
+          # http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Action.html
+          property :target_group_arn, 'TargetGroupArn'
+          property :type, 'Type'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_listener_rule_action.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-actions.html
+        # ELBV2 ListenerRule Action Type}
+        class ELBV2ListenerRuleAction < ResourceProperty
+          # http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Action.html
+          property :target_group_arn, 'TargetGroupArn'
+          property :type, 'Type'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_listener_rule_condition.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-conditions.html
+        # ELBV2 ListenerRule Condition Type
+        class ELBV2ListenerRuleCondition < ResourceProperty
+          # http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_RuleCondition.html
+          property :field, 'Field'
+          property :values, 'Values', :type => :list
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_load_balancer_attribute.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html
+        # Elastic Load Balancing LoadBalancer LoadBalancerAttributes Type}
+        class ELBV2LoadBalancerAttribute < ResourceProperty
+          # http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancerAttribute.html
+          property :key, 'Key'
+          property :value, 'Value'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_target_group_attribute.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattributes.html
+        # ELBV2 TargetGroup TargetGroupAttribute Type}
+        class ELBV2TargetGroupAttribute < ResourceProperty
+          # http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetGroupAttribute.html
+          property :key, 'Key'
+          property :value, 'Value'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_target_group_matcher.rb

@@ -0,0 +1,15 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-matcher.html
+        # ELBV2 TargetGroup Matcher Type}
+        class ELBV2TargetGroupMatcher < ResourceProperty
+          property :http_code, 'HttpCode'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_elbv2_target_group_target_description.rb

@@ -0,0 +1,16 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html
+        # ELBV2 TargetGroup TargetDescription Type}
+        class ELBV2TargetGroupTargetDescription < ResourceProperty
+          property :id, 'Id'
+          property :port, 'Port'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_route53_alias_target.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
+        # Route53 AliasTarget Property Type}
+        class Route53AliasTarget < ResourceProperty
+          property :dns_name, 'DNSName'
+          property :evaluate_target_health, 'EvaluateTargetHealth'
+          property :hosted_zone_id, 'HostedZoneId'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_route53_geolocation.rb

@@ -0,0 +1,17 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html
+        # Route53 GeoLocation Property Type}
+        class Route53GeoLocation < ResourceProperty
+          property :continent_code, 'ContinentCode'
+          property :country_code, 'CountryCode'
+          property :subdivision_code, 'SubdivisionCode'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_s3_website_configuration.rb

@@ -0,0 +1,30 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html
+        # Amazon S3 Website Configuration}
+        class S3WebsiteConfiguration < ResourceProperty
+          property :error_document, 'ErrorDocument'
+          property :index_document, 'IndexDocument'
+          property :redirect_all_reqs_to, 'RedirectAllRequestsTo'
+          property :routing_rules, 'RoutingRules', :type => :list
+
+          def redirect_all_requests_to(&block)
+            redirect_to = ResourceProperty::S3WebsiteConfigurationRedirectAllRequestsTo.new(self)
+            redirect_to.instance_exec(&block) if block
+            properties['RedirectAllRequestsTo'].set(redirect_to)
+          end
+
+          def routing_rule(&block)
+            routing_rule = ResourceProperty::S3WebsiteConfigurationRoutingRule.new(self)
+            routing_rule.instance_exec(&block) if block
+            routing_rules << routing_rule
+          end
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_s3_website_configuration_redirect_all_requests_to.rb

@@ -0,0 +1,16 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html
+        # Amazon S3 Website Configuration Redirect All Requests To}
+        class S3WebsiteConfigurationRedirectAllRequestsTo < ResourceProperty
+          property :host_name, 'HostName'
+          property :protocol, 'Protocol'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_s3_website_configuration_routing_rule.rb

@@ -0,0 +1,28 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html
+        # Amazon S3 Website Configuration Routing Rule}
+        class S3WebsiteConfigurationRoutingRule < ResourceProperty
+          property :redirect_rul, 'RedirectRule'
+          property :routing_rule_cond, 'RoutingRuleCondition'
+
+          def redirect_rule(&block)
+            redr = ResourceProperty::S3WebsiteConfigurationRoutingRuleRedirectRule.new(self)
+            redr.instance_exec(&block) if block
+            properties['RedirectRule'].set(redr)
+          end
+
+          def routing_rule_condition(&block)
+            cond = ResourceProperty::S3WebsiteConfigurationRoutingRuleRoutingRuleCondition.new(self)
+            cond.instance_exec(&block) if block
+            properties['RoutingRuleCondition'].set(cond)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_s3_website_configuration_routing_rule_redirect_rule.rb

@@ -0,0 +1,19 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html
+        # Amazon S3 Website Configuration Routing Rule Redirect Rule}
+        class S3WebsiteConfigurationRoutingRuleRedirectRule < ResourceProperty
+          property :host_name, 'HostName'
+          property :http_redirect_code, 'HttpRedirectCode'
+          property :protocol, 'Protocol'
+          property :replace_key_prefix_with, 'ReplaceKeyPrefixWith'
+          property :replace_key_with, 'ReplaceKeyWith'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_s3_website_configuration_routing_rule_routing_rule_condition.rb

@@ -0,0 +1,16 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html
+        # Amazon S3 Website Configuration Routing Rule Routing Rule Condition}
+        class S3WebsiteConfigurationRoutingRule < ResourceProperty
+          property :http_error_code_returned_equals, 'HttpErrorCodeReturnedEquals'
+          property :key_prefix_equals, 'KeyPrefixEquals'
+        end
+      end
+    end
+  end
+end

data/yard_extensions/type_handler.rb

@@ -37,6 +37,7 @@ class TypeDslHandler < YARD::Handlers::Ruby::Base
     'AWS::AutoScaling::LifecycleHook' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html',
     'AWS::AutoScaling::ScalingPolicy' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html',
     'AWS::AutoScaling::ScheduledAction' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html',
+    'AWS::CertificateManager::Certificate' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html',
     'AWS::CloudFormation::Authentication' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-authentication.html',
     'AWS::CloudFormation::CustomResource' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html',
     'AWS::CloudFormation::Init' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-init.html',
@@ -110,6 +111,10 @@ class TypeDslHandler < YARD::Handlers::Ruby::Base
     'AWS::ElasticBeanstalk::ConfigurationTemplate' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html',
     'AWS::ElasticBeanstalk::Environment' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html',
     'AWS::ElasticLoadBalancing::LoadBalancer' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html',
+    'AWS::ElasticLoadBalancingV2::Listener' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html',
+    'AWS::ElasticLoadBalancingV2::ListenerRule' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html',
+    'AWS::ElasticLoadBalancingV2::LoadBalancer' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html',
+    'AWS::ElasticLoadBalancingV2::TargetGroup' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html',
     'AWS::Elasticsearch::Domain' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html',
     'AWS::EMR::Cluster' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-cluster.html',
     'AWS::EMR::InstanceGroupConfig' => 'http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.1
+  version: 1.0.0.pre.beta.4
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -139,6 +139,7 @@ files:
 - lib/convection/model/template/resource/aws_auto_scaling_auto_scaling_group.rb
 - lib/convection/model/template/resource/aws_auto_scaling_launch_configuration.rb
 - lib/convection/model/template/resource/aws_auto_scaling_scaling_policy.rb
+- lib/convection/model/template/resource/aws_certificate_manager_certificate.rb
 - lib/convection/model/template/resource/aws_cloud_watch_alarm.rb
 - lib/convection/model/template/resource/aws_cloudfront_distribution.rb
 - lib/convection/model/template/resource/aws_directory_service_simple_ad.rb
@@ -178,6 +179,10 @@ files:
 - lib/convection/model/template/resource/aws_elasticbeanstalk_configurationtemplate.rb
 - lib/convection/model/template/resource/aws_elasticbeanstalk_environment.rb
 - lib/convection/model/template/resource/aws_elb.rb
+- lib/convection/model/template/resource/aws_elbv2_listener.rb
+- lib/convection/model/template/resource/aws_elbv2_listener_rule.rb
+- lib/convection/model/template/resource/aws_elbv2_load_balancer.rb
+- lib/convection/model/template/resource/aws_elbv2_target_group.rb
 - lib/convection/model/template/resource/aws_events_rule.rb
 - lib/convection/model/template/resource/aws_iam_access_key.rb
 - lib/convection/model/template/resource/aws_iam_group.rb
@@ -210,6 +215,7 @@ files:
 - lib/convection/model/template/resource_attribute/update_policy.rb
 - lib/convection/model/template/resource_collection.rb
 - lib/convection/model/template/resource_property.rb
+- lib/convection/model/template/resource_property/aws_certificate_manager_certificate_domain_validation_option.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_cachebehavior.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_customerrorresponse.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_customorigin.rb
@@ -226,14 +232,29 @@ files:
 - lib/convection/model/template/resource_property/aws_ec2_block_store_block_device.rb
 - lib/convection/model/template/resource_property/aws_ec2_mount_point.rb
 - lib/convection/model/template/resource_property/aws_ec2_network_interface.rb
+- lib/convection/model/template/resource_property/aws_elbv2_listener_certificates.rb
+- lib/convection/model/template/resource_property/aws_elbv2_listener_default_action.rb
+- lib/convection/model/template/resource_property/aws_elbv2_listener_rule_action.rb
+- lib/convection/model/template/resource_property/aws_elbv2_listener_rule_condition.rb
+- lib/convection/model/template/resource_property/aws_elbv2_load_balancer_attribute.rb
+- lib/convection/model/template/resource_property/aws_elbv2_target_group_attribute.rb
+- lib/convection/model/template/resource_property/aws_elbv2_target_group_matcher.rb
+- lib/convection/model/template/resource_property/aws_elbv2_target_group_target_description.rb
 - lib/convection/model/template/resource_property/aws_events_rule_target.rb
 - lib/convection/model/template/resource_property/aws_lambda_function_code.rb
 - lib/convection/model/template/resource_property/aws_lambda_vpc_config.rb
+- lib/convection/model/template/resource_property/aws_route53_alias_target.rb
+- lib/convection/model/template/resource_property/aws_route53_geolocation.rb
 - lib/convection/model/template/resource_property/aws_s3_cors_configuration.rb
 - lib/convection/model/template/resource_property/aws_s3_cors_configuration_rule.rb
 - lib/convection/model/template/resource_property/aws_s3_replication_configuration.rb
 - lib/convection/model/template/resource_property/aws_s3_replication_configuration_rule.rb
 - lib/convection/model/template/resource_property/aws_s3_replication_configuration_rule_destination.rb
+- lib/convection/model/template/resource_property/aws_s3_website_configuration.rb
+- lib/convection/model/template/resource_property/aws_s3_website_configuration_redirect_all_requests_to.rb
+- lib/convection/model/template/resource_property/aws_s3_website_configuration_routing_rule.rb
+- lib/convection/model/template/resource_property/aws_s3_website_configuration_routing_rule_redirect_rule.rb
+- lib/convection/model/template/resource_property/aws_s3_website_configuration_routing_rule_routing_rule_condition.rb
 - lib/convection/version.rb
 - spec/cf_client_context.rb
 - spec/collect_availability_zones_task_context.rb