convection 0.2.33 → 0.2.34.pre.beta.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34.pre.beta.1
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -81,6 +81,8 @@ files:
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
+- ".yardopts"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -88,24 +90,21 @@ files:
 - Thorfile
 - bin/convection
 - convection.gemspec
+- docs/adding-new-resource-coverage.md
+- docs/canceling-stack-updates.md
+- docs/deleting-stacks.md
+- docs/getting-started.md
+- docs/index.md
+- docs/pygment.css
+- docs/relationship-to-cloudformation.md
+- docs/stacks.md
+- docs/template.html
 - example/.ruby-version
-- example/Cloudfile
-- example/deprecated/elb.rb
-- example/deprecated/iam_access_key.rb
-- example/deprecated/iam_group.rb
-- example/deprecated/iam_role.rb
-- example/deprecated/iam_user.rb
-- example/deprecated/rds.rb
-- example/deprecated/s3.rb
-- example/deprecated/sqs.rb
-- example/deprecated/vpc.rb
-- example/instances.rb
-- example/output/vpc.json
-- example/security-groups.rb
-- example/sqs-queue/Cloudfile
-- example/sqs-queue/README.md
-- example/trust_cloudtrail.rb
-- example/vpc.rb
+- example/getting-started-guide/Cloudfile
+- example/getting-started-guide/vpc.rb
+- example/stacks/Cloudfile
+- example/stacks/tasks/lookup_vpc_task.rb
+- example/stacks/templates/vpc.rb
 - ext/resource_generator.sh
 - lib/convection.rb
 - lib/convection/control/cloud.rb
@@ -137,6 +136,7 @@ files:
 - lib/convection/model/template/resource/aws_cloudfront_distribution.rb
 - lib/convection/model/template/resource/aws_directory_service_simple_ad.rb
 - lib/convection/model/template/resource/aws_ec2_customer_gateway.rb
+- lib/convection/model/template/resource/aws_ec2_dhcp_options.rb
 - lib/convection/model/template/resource/aws_ec2_eip.rb
 - lib/convection/model/template/resource/aws_ec2_eip_association.rb
 - lib/convection/model/template/resource/aws_ec2_instance.rb
@@ -232,6 +232,7 @@ files:
 - spec/convection/dsl/intrinsic_functions_spec.rb
 - spec/convection/model/template/condition_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
 - spec/convection/model/template/resource/ec2_subnet_spec.rb
 - spec/convection/model/template/resource/elasticache_cache_cluster_spec.rb
@@ -255,6 +256,9 @@ files:
 - spec/convection/model/template/validate_resources_spec.rb
 - spec/ec2_client_context.rb
 - spec/spec_helper.rb
+- yard_extensions.rb
+- yard_extensions/properties_handler.rb
+- yard_extensions/type_handler.rb
 homepage: https://github.com/rapid7/convection
 licenses:
 - MIT
@@ -270,12 +274,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fully generic, modular DSL for AWS CloudFormation
@@ -291,6 +295,7 @@ test_files:
 - spec/convection/dsl/intrinsic_functions_spec.rb
 - spec/convection/model/template/condition_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
 - spec/convection/model/template/resource/ec2_subnet_spec.rb
 - spec/convection/model/template/resource/elasticache_cache_cluster_spec.rb
@@ -314,4 +319,3 @@ test_files:
 - spec/convection/model/template/validate_resources_spec.rb
 - spec/ec2_client_context.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/example/Cloudfile

@@ -1,13 +0,0 @@
-require_relative '../lib/convection'
-require_relative './vpc'
-require_relative './security-groups'
-require_relative './instances'
-
-name 'convection-test'
-region 'us-east-1'
-
-attribute 'vpc', 'subnet', '10.255.0.0/16'
-
-stack 'vpc', Convection::Demo::VPC
-stack 'security-groups', Convection::Demo::SECURITY_GROUPS
-stack 'instances', Convection::Demo::INSTANCES

data/example/deprecated/elb.rb

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-region = 'us-west-1'
-
-elb_template = Convection.template do
-  description 'Example ELB via Convection '
-
-  elb 'TestELB' do
-    availability_zones(
-      {
-        "Fn::GetAZs"=>""
-      }
-    )
-    load_balancer_name('ExampleELB')
-    listeners(
-      {
-         'InstancePort' => '80',
-         'LoadBalancerPort' => '80',
-         'Protocol' => 'HTTP'
-      }
-    )
-  end
-end
-
-puts elb_template.to_json
-#puts Convection.stack('ELBTestStack', elb_template, :region => region).apply

data/example/deprecated/iam_access_key.rb

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-test_iam_access_key_template = Convection.template do
-  description 'This example creates a user an access keys for that user.'
-
-  iam_user 'NewUser' do
-    path 'new_user'
-  end
-
-  iam_access_key 'NewUserKey' do
-    status 'Active'
-    user_name fn_ref(:NewUser)
-  end
-end
-
-puts test_iam_access_key_template.to_json
-# puts Convection.stack('IAMTestStack', test_iam_access_key_template, :region => 'us-west-1').apply

data/example/deprecated/iam_group.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-test_iam_group_template = Convection.template do
-  description 'This is an example of a stack representing IAM Groups and Policies.'
-
-  parameter 'Path' do
-    type 'String'
-    default '/'
-  end
-
-  iam_policy 'GroupPolicy' do
-    policy_name 'NewPolicy'
-    group fn_ref(:NewGroup)
-
-    policy(
-      :Statement => [{
-        :Effect => 'Allow',
-        :Action => ['s3:GetObject'],
-        :Resource => ['arn:aws:s3:::some.bucket.name.here/*']
-      }]
-    )
-  end
-
-  iam_group 'NewGroup' do
-    path fn_ref(:Path)
-  end
-end
-
-puts test_iam_group_template.to_json
-# puts Convection.stack('IAMTestStack', test_iam_group_template, :region => 'us-west-1').apply

data/example/deprecated/iam_role.rb

@@ -1,52 +0,0 @@
-#!/usr/bin/env ruby
-# $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-require 'convection'
-
-##
-# This is a quick example of building out a cloudformation template without
-# extending the underlying DSL.
-#
-# The reason could be anything from the inability to extend the dsl to a feature
-# in AWS has been made availalble but the DSL will be complex - so this is a
-# quick way to get access to those features.
-##
-
-test_iam_role_template = Convection.template do
-  description 'This is an example of a stack representing IAM Roles and Policies.'
-
-  parameter 'Path' do
-    type 'String'
-    default '/'
-  end
-
-  iam_policy 'RolePolicy' do
-    policy_name 'NewPolicy'
-    role fn_ref(:NewRole)
-
-    policy(
-      :Statement => [{
-        :Effect => 'Allow',
-        :Action => ['s3:GetObject'],
-        :Resource => ['arn:aws:s3:::some.bucket.name.here/*']
-      }]
-    )
-  end
-
-  iam_role 'NewRole' do
-    path fn_ref(:Path)
-
-    # EC2 Instance Role
-    trust_relationship(
-      :Statement => [{
-        :Effect => 'Allow',
-        :Principal => {
-          :Service => 'ec2.amazonaws.com'
-        },
-        :Action => 'sts:AssumeRole'
-      }]
-    )
-  end
-end
-
-puts test_iam_role_template.to_json
-# puts Convection.stack('IAMTestStack', test_iam_role_template, :region => 'us-west-1').apply

data/example/deprecated/iam_user.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-test_iam_user_template = Convection.template do
-  description 'This is an example of a stack representing IAM Users and Policies.'
-
-  parameter 'Path' do
-    type 'String'
-    default '/'
-  end
-
-  iam_policy 'UserPolicy' do
-    policy_name 'NewPolicy'
-    user fn_ref(:NewUser)
-
-    policy(
-      :Statement => [{
-        :Effect => 'Allow',
-        :Action => ['s3:GetObject'],
-        :Resource => ['arn:aws:s3:::some.bucket.name.here/*']
-      }]
-    )
-  end
-
-  iam_user 'NewUser' do
-    path fn_ref(:Path)
-  end
-end
-
-puts test_iam_user_template.to_json
-# puts Convection.stack('IAMTestStack', test_iam_user_template, :region => 'us-west-1').apply

data/example/deprecated/rds.rb

@@ -1,70 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-rds_template = Convection.template do
-  description 'Testing RDS DB Instance definition'
-
-  param_group = parameter_group 'TestingParamGroup' do
-    description 'My Parameter Group for test the app' # Required
-    family 'MySQL5.6' # Required
-    parameters({
-      character_set_database: 'utf8',
-      slow_query_log: 1,
-      max_allowed_packet: 10485760,
-      lower_case_table_names: 1,
-      innodb_flush_method: 'O_DIRECT',
-      log_warnings: 2,
-      collation_connection: 'utf8_unicode_ci',
-      collation_server: 'utf8_unicode_ci',
-      long_query_time: 5,
-      character_set_server: 'utf8',
-      log_output: 'FILE'
-    })
-    tag 'ui-test-db-param-group', 'yep'
-  end
-
-  #sec_group = db_security_group 'TestingSecurityGroup' do
-  #  ec2_vpc_id 'vpc-98248' #Required
-  #  db_security_group_ingress # Required
-  #  group_description # Required
-  #  tag 'ui-test-db-sec-group', 'yep'
-  #end
-
-  subnet_group = db_subnet_group 'TestingSubnetGroup' do
-    db_subnet_group_description 'SubnetGroup for Testing ENV'
-    subnet_id 's-1345345'
-    subnet_id 's-23566'
-  end
-
-  db_master = db_instance 'TestDBMasterInstance' do
-    allocated_storage '250' # Required
-    backup_retention_period '7'
-    db_instance_class 'db.m3.2xlarge' # Required
-    db_instance_identifier 'ui-test-db'
-    db_parameter_group_name param_group.name
-    db_subnet_group_name subnet_group.name
-    engine 'MySQL'
-    iops '1000'
-    master_username 'ui-test-db-user'
-    master_user_password 'ui-test-db-password'
-    multi_az true
-#    vpc_security_groups fn_ref(sec_group.name)
-    tag 'ui-test-db', 'yep'
-  end
-
-  db_instance 'TestDBReplicaInstance' do
-    source_db_instance_identifier db_master.properties['DBInstanceIdentifier']
-    allocated_storage '250' # Required
-    db_instance_class 'db.m3.2xlarge' # Required
-    db_instance_identifier "#{db_master.properties['DBInstanceIdentifier']}-replica"
-    db_parameter_group_name param_group.name
-    db_subnet_group_name subnet_group.name
-    engine 'MySQL'
-    iops '1000'
-#    vpc_security_groups fn_ref(sec_group.name)
-    tag 'ui-test-db-replica', 'yep'
-  end
-end
-
-puts rds_template.to_json
-# puts Convection.stack('S3TestStack', s3_template, :region => 'us-west-1').apply

data/example/deprecated/s3.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-s3_template = Convection.template do
-  description 'Testing S3 bucket definition'
-
-  s3_bucket 'TestBucket' do
-    bucket_name 'convectiontestbucket'
-  end
-end
-
-puts s3_template.to_json
-# puts Convection.stack('S3TestStack', s3_template, :region => 'us-west-1').apply

data/example/deprecated/sqs.rb

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-sqs_template = Convection.template do
-  description 'Testing SQS bucket definition'
-
-  sqs_queue 'TestQueue' do
-    message_retention_period '345600'
-    queue_name 'testQueueName'
-    visibility_timeout '120'
-  end
-  
-  sqs_queue_policy 'TestQueuePolicy' do
-    queue fn_ref(:TestQueue)
-    policy_document :Statement =>[{
-                                    :Effect => "Allow",
-                                    :Action => [ "SQS:SendMessage" ],
-                                    :Resource => "ResourceARN",
-                                    :Principal => {
-                                      "AWS" => "*"
-                                    },
-                                    :Condition => {
-                                      "ArnLike" => {
-                                        "aws:SourceArn" => "arn:aws:s3:*:*:bucket-name"
-                                      }
-                                    }
-                                  }]
-  end
-end
-
-puts sqs_template.to_json
-# puts Convection.stack('SQSTestQueue', sqs_template, :region => 'us-west-1').apply

data/example/deprecated/vpc.rb

@@ -1,85 +0,0 @@
-#!/usr/bin/env ruby
-require 'convection'
-
-test_template = Convection.template do
-  description 'This is a test stack generated with Convection'
-
-  parameter 'InstanceSize' do
-    type 'String'
-    description 'Instance Size'
-    default 'm3.medium'
-
-    allow 'm3.medium'
-    allow 'm3.large'
-    allow 'm3.xlarge'
-  end
-
-  mapping 'RegionalAMIs' do
-    item 'us-east-1', 'hvm', 'ami-76e27e1e'
-    item 'us-west-1', 'hvm', 'ami-d5180890'
-    item 'us-east-1', 'pv', 'ami-64e27e0c'
-    item 'us-west-1', 'pv', 'ami-c5180880'
-  end
-
-  mapping 'RegionalKeys' do
-    item 'us-east-1', 'test', 'cf-test-keys'
-    item 'us-west-1', 'test', 'cf-test-keys'
-  end
-
-  ## Define the VPC
-  ec2_vpc 'TargetVPC' do
-    network '100.65.0.0/18'
-    subnet_length 25
-
-    ## Add an InternetGateway
-    add_internet_gateway
-
-    ## Add a default routing table
-    public_table = add_route_table('Public', :gateway_route => true)
-
-    ## Define Subnets and Insatnces in each availability zone
-    stack.availability_zones do |zone, i|
-      add_subnet "Test#{ i }" do
-        availability_zone zone
-        route_table public_table
-
-        tag 'Service', 'Foo'
-      end
-    end
-
-    tag 'Name', join('-', 'cf-test-vpc', fn_ref('AWS::StackName'))
-  end
-
-  ec2_security_group 'BetterSecurityGroup' do
-    ingress_rule do
-      cidr_ip '0.0.0.0/0'
-      from 22
-      to 22
-      protocol 'TCP'
-    end
-    egress_rule do
-      cidr_ip '0.0.0.0/0'
-      from 0
-      to 65_535
-      protocol(-1)
-    end
-
-    description 'Allow SSH traffic from all of the places'
-    vpc fn_ref(:TargetVPC)
-
-    tag 'Name', join('-', fn_ref('AWS::StackName'), 'BetterSecurityGroup')
-  end
-end
-
-# puts test_template.render
-# puts test_template.to_json
-
-# stack_e1 = Convection.stack('TestStackE1B1', test_template, :region => 'us-east-1')
-stack_w1 = Convection.stack('TestStackW1B2', test_template, :region => 'us-west-1')
-
-# puts stack_e1.status
-# puts stack_e1.apply
-puts stack_w1.to_json
-
-puts "Status #{ stack_w1.status }"
-# puts stack_w1.apply