kumogata-template 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8579ef67a536e816f1044e3f6d61d55c2d22b2
-  data.tar.gz: a615fd47c3ffc560524002bb655501a0a2fdb6be
+  metadata.gz: 4614c777d40479422e7f81c0c24dfbe53a47c2e0
+  data.tar.gz: cdb0a588add13fb92a75e3e1c2ca78ef5e9a7706
 SHA512:
-  metadata.gz: 15358466f358d1dd05be9d4f72134a5e9bb31cd9f186dd0b817fa3794ecac885c915f16f5f4a85a36e075a8f38c69d5e39e432dc28b9db086aa2bb460a457aca
-  data.tar.gz: 70cd674c8a2ed82bfef4300f264cfd5486ba4d887bd0095a0975d579c3a77a17fad34e98eebef86fab7105892ae32c700afe084b49d43b55d4f32c37fc17e0b7
+  metadata.gz: 43838f52cc049725b0f73250853f17ddce36ff41658db661622935dde7dc2f6cb119448c84926d97507fface0c4d60367f19ef50c55569993646e8720b36269c
+  data.tar.gz: 923adaaa2fe9d84de9d225ce129f440423f1bb22443bbc7b57391d01fc8f06b8db1274ee85b16bb41594af3f20d94a6b6375e0f54ac4aa784e9217d3f710a6ee

data/.gitignore

@@ -1,5 +1,6 @@
 ### https://raw.github.com/github/gitignore/b27b46b656d026ac295b3a47cf43e8af192472e2/ruby.gitignore
 
+Gemfile.lock
 *.gem
 *.rbc
 /.config

data/README.md

@@ -3,10 +3,12 @@
 [![Gem Version](https://badge.fury.io/rb/kumogata-template.svg)](http://badge.fury.io/rb/kumogata-template)
 [![Build Status](https://travis-ci.org/n0ts/kumogata-template.svg?branch=master)](https://travis-ci.org/n0ts/kumogata-template)
 
+
 ## About
 
 - `kumogate-template` is a template sets for [kumogata2](https://github.com/winebarrel/kumogata2).
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -17,11 +19,15 @@ gem 'kumogata-template'
 
 And then execute:
 
-  $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-  $ gem install kumogata-template
+```
+$ gem install kumogata-template
+```
 
 
 ## Usage
@@ -31,10 +37,10 @@ Usage: kumogate-template <command> [args] [options]
 
 Commands:
   init           STACK_NAME                 Initialize template
-  * Other command same as kumogata's commands
+  * Other command same as kumogata2 commands
 
 Options:
-  * Options is same as the kumogata's options
+  * Options is same as the kumogata2 options
 ```
 
 - Initialize a sample template
@@ -60,28 +66,28 @@ Parameters do
                         description: "sample version"
 end
 
-Mappings do
-end
-
 Resources do
-  _s3_bucket "sample"
+  # And more kumogata-template examples at examples/
+
+  # Create a S3 Bucket
+  #_s3_bucket "sample"
 end
 
 Outputs do
-  _output_s3 "sample"
+  # Output S3 Bucket Information
+  #_output_s3 "sample"
 end
 ```
 
-  - Below sample template is create a s3 bucket.
 
-
-## What is difference `kumogata-template` and `kumogata`
+## What is **THE** difference `kumogata-template` and `kumogata2`
 
 - For example launch EC2 instance.
 
-### kumogata
+### kumogata2
 
 ```
+Resources do
   myEC2Instance do
     Type "AWS::EC2::Instance"
     Properties do
@@ -98,6 +104,8 @@ end
       end
     end
   end
+  ...
+end
 ```
 
 
@@ -106,6 +114,7 @@ end
 - More simply write cloudformation stack.
 
 ```
+Resources do
   user_data =<<EOS
 yum install -y httpd
 service httpd start
@@ -116,41 +125,13 @@ EOS
                 ref_instance_type: "my",
                 key_name: "your_key_name",
                 user_data: user_data
+  ...
+end
 ```
 
-- more example see [test code](test/template)
-
-
-## AWS CloudFormation
-
-- [Relese notes](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/ReleaseHistory.html)
-  - Almost support release date is `January 17, 2017`
-
-- [Support Resource Types](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html)
-  - AWS::AutoScaling::*
-  - AWS::CertificateManager::*
-  - AWS::CloudFront::**
-  - AWS::CloudTrail::*
-  - AWS::CloudWatch::*
-  - AWS::CodeBuild::*
-  - AWS::CodeCommit::*
-  - AWS::CodeDeploy::*
-  - AWS::DataPipeline::*
-  - AWS::DynamoDB::*
-  - AWS::EC2::*
-  - AWS::ECS::*
-  - AWS::ElastiCache::*
-  - AWS::ElasticBeanstalk::*
-  - AWS::ElasticLoadBalancing::*
-  - AWS::ElasticLoadBalancingV2::*
-  - AWS::EMR::*
-  - AWS::Events::*
-  - AMS::KMS::*
-  - AWS::IAM::*
-  - AWS::Lambda::*
-  - AWS::Logs::*
-  - AWS::RDS::*
-  - AWS::Redshift::*
-  - AWS::S3::*
-  - AWS::SNS::*
-  - AWS::SQS::*
+- And more example see [test code](test/template/)
+
+
+## Support AWS CloudFormation Relase
+
+**January 17, 2017** [Relese notes](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/ReleaseHistory.html)

data/kumogata-template.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk', '~> 2.3'
-  spec.add_dependency 'kumogata2-plugin-ruby', '0.1.3'
+  spec.add_dependency 'kumogata2-plugin-ruby', '>= 0.1.6'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'

data/lib/kumogata/template/ec2.rb

@@ -19,38 +19,38 @@ def _ec2_tags(args)
   _tags(args)
 end
 
-def _ec2_security_group_egresses(name, args)
+def _ec2_security_group_egress_rules(name, args)
   return [] unless args.key? name.to_sym
 
   rules = []
   _array(args[name.to_sym]).each do |arg|
-    rules << _ec2_security_group_egress(arg)
+    rules << _ec2_security_group_egress_rule(arg)
   end
   rules
 end
 
-def _ec2_security_group_egress(args)
+def _ec2_security_group_egress_rule(args)
   cidr = args[:cidr] || "0.0.0.0/0"
   cidr_ipv6 = args[:cidr_ipv6] || ""
-  destination = _ref_string("destination", args, "security group")
+  dest_security = _ref_string("dest_security", args, "security group")
   from = _ref_string("from", args)
-  group = _ref_string("group", args, "security group")
   ip = args[:ip] || "tcp"
+  dest_prefix = _ref_string("dest_prefix", args, "vpc endpoint")
   to = _ref_string("to", args)
   from = to if from.empty?
 
   _{
-    CidrIp cidr if destination.empty?
+    CidrIp cidr if dest_security.empty?
     CidrIpv6 cidr_ipv6 unless cidr_ipv6.empty?
-    DestinationSecurityGroupId destination unless destination.empty?
+    DestinationPrefixListId dest_prefix unless dest_prefix.empty?
     FromPort from unless ip == "icmp"
-    GroupId group unless group.empty?
     IpProtocol ip
+    DestinationSecurityGroupId dest_security unless dest_security.empty?
     ToPort to unless ip == "icmp"
   }
 end
 
-def _ec2_security_group_ingresses(name, args)
+def _ec2_security_group_ingress_rules(name, args)
   return [] unless args.key? name.to_sym
 
   rules = []
@@ -61,17 +61,15 @@ def _ec2_security_group_ingresses(name, args)
         to: arg,
       }
     end
-    rules << _ec2_security_group_ingress(arg)
+    rules << _ec2_security_group_ingress_rule(arg)
   end
   rules
 end
 
-def _ec2_security_group_ingress(args)
+def _ec2_security_group_ingress_rule(args)
   cidr = args[:cidr] || "0.0.0.0/0"
   cidr_ipv6 = args[:cidr_ipv6] || ""
   from = _ref_string("from", args)
-  group_id = _ref_string("group", args, "security group")
-  group_name = args[:group_name] || ""
   ip = args[:ip] || "tcp"
   source_group_name = _ref_string("source_group_name", args, "security group")
   source_group_id = _ref_string("source_group_id", args, "security group")
@@ -84,8 +82,6 @@ def _ec2_security_group_ingress(args)
     CidrIp cidr if source_group_name.empty? and source_group_id.empty?
     CidrIpv6 cidr_ipv6 unless cidr_ipv6.empty?
     FromPort from unless ip == "icmp"
-    GroupId group_id unless group_id.empty?
-    GroupName group_name unless group_name.empty?
     IpProtocol ip
     SourceSecurityGroupName source_group_name unless source_group_name.empty?
     SourceSecurityGroupId source_group_id unless source_group_id.empty?
@@ -120,7 +116,7 @@ def _ec2_block_device(args)
   }
 end
 
-def _ec2_network_interface(args, is_spot = false)
+def _ec2_network_interface_embedded(args, is_spot = false)
   associate_public = _bool("associate_public", args, true)
   delete = _bool("delete", args, true)
   description = args[:description] || ""
@@ -196,7 +192,9 @@ end
 def _ec2_spot_fleet_request(args)
   allocation = _valid_values(args[:allocation], %w( lowestPrice diversified), "lowestPrice")
   express = _valid_values(args[:express], %w( noTermination default), "")
-  iam = args[:iam]   # IAM Role "aws-ec2-spot-fleet-role" auto generated
+  iam = _ref_attr_string("iam", "Arn", args, "role")
+  # TODO move to role.rb
+  iam = "aws-ec2-spot-fleet-role" if iam.empty?
   launches = args[:launches].collect{|v| _ec2_spot_fleet_launches(v) }
   price = args[:price] || 0.00
   target = _ref_string("target", args, "")
@@ -235,7 +233,7 @@ def _ec2_spot_fleet_launches(args)
   kernel = args[:kernel] || ""
   key_name = _ref_string("key_name", args, "key name")
   monitoring = _bool("monitoring", args, false)
-  network_interfaces = (args[:network_interfaces] || []).collect{|v| _ec2_network_interface(v, true) }
+  network_interfaces = (args[:network_interfaces] || []).collect{|v| _ec2_network_interface_embedded(v, true) }
   placement = _ref_string("placement", args)
   ram_disk = args[:ram_disk] || ""
   security_groups = _ref_array("security_groups", args, "security group")

data/lib/kumogata/template/helper.rb

@@ -59,8 +59,11 @@ def _valid_numbers(value, min = 0, max = 0, default = nil)
   (min <= number and number <= max) ? number : default
 end
 
-def _real_name(name)
-  name.to_s.gsub(" ", "-")
+def _real_name(name, args)
+  key = _ref_key?(name, args) ? name : "name"
+  real_name = _ref_string(key, args)
+  real_name = real_name.gsub(" ", "-") if real_name.is_a? String
+  real_name =~ /^false/i ? false : real_name
 end
 
 def _ref_key?(name, args, ref_name = '')
@@ -70,6 +73,13 @@ def _ref_key?(name, args, ref_name = '')
   false
 end
 
+def _ref_number(name, args, ref_name = '')
+  return _import(args["import_#{name}".to_sym]) if args.key? "import_#{name}".to_sym
+  return args[name.to_sym].to_i || 0 unless args.key? "ref_#{name}".to_sym
+
+  _ref(_resource_name(args["ref_#{name}".to_sym].to_s, ref_name))
+end
+
 def _ref_string(name, args, ref_name = '')
   return _import(args["import_#{name}".to_sym]) if args.key? "import_#{name}".to_sym
   return args[name.to_sym].to_s || '' unless args.key? "ref_#{name}".to_sym
@@ -197,7 +207,7 @@ def _base64(data)
 end
 
 def _base64_shell(data, shell = "/bin/bash")
-  _base64("#!#{shell}\n#{data}")
+  _base64("#!#{shell}\n#{data}\n")
 end
 
 def _find_in_map(name, top_level, secondary_level)
@@ -220,7 +230,7 @@ end
 
 def _export_string(args, prefix)
   if args.key? :export and args[:export] == true
-    "#{args[:name]}-#{prefix}"
+    "#{args[:name]}-#{prefix.gsub(' ', '-')}"
   else
     ""
   end
@@ -380,35 +390,3 @@ def _window_time(service, start_time)
   end
   "#{start_time.strftime(format)}-#{end_time.strftime(format)}"
 end
-
-def _ref_arn(service, name)
-  # FIXME
-  _{
-    Fn__Join [
-              ",",
-              [
-               "arn:aws:#{service}:::",
-               _{ Ref _resource_name(name) },
-              ]
-             ]
-  }
-end
-
-def _ref_pseudo(type)
-  pseudo =
-    case type
-    when "account"
-      "AccountId"
-    when "notification arns"
-      "NotificationARNs"
-    when "no value"
-      "NoValue"
-    when "region"
-      "Region"
-    when "stack id"
-      "StackId"
-    when "stack name"
-      "StackName"
-    end
-  _{ Ref "AWS::#{pseudo}" }
-end

data/lib/kumogata/template/iam.rb

@@ -251,6 +251,8 @@ def _iam_arn(service, resource)
         "arn:aws:sts::#{v[:account_id]}:#{v[:type]}/#{v[:user]}"
       elsif v.key? :policy
         "arn:aws:iam::aws:policy/#{_iam_to_policy(v[:policy])}"
+      elsif v.key? :role
+        "#{arn_prefix}::#{v[:account_id]}:role/#{v[:role]}"
       elsif v.key? :root
         "#{arn_prefix}::#{v[:account_id]}:root"
       else

data/lib/kumogata/template/s3.rb

@@ -3,6 +3,21 @@
 #
 require 'kumogata/template/helper'
 
+def _s3_to_deletion_policy(value)
+  return "Retain" if value.nil?
+
+  case "value"
+  when "delete"
+    "Delete"
+  when "retain"
+    "Retain"
+  when "shapshot"
+    "Snapshot"
+  else
+    _valid_values(value, %w( Delete Retain Snapshot ), "Retain")
+  end
+end
+
 def _s3_to_access(value)
   return "Private" if value.nil?
 

data/lib/kumogata/template/sns.rb

@@ -23,8 +23,13 @@ def _sns_subscription_list(args)
 
   array = []
   subscription.each do |v|
-    protocol = _sns_to_protocol(v[:protocol])
-    endpoint = _sns_to_endpoint(protocol, v[:endpoint])
+    if v.is_a? String
+      protocol = "email"
+      endpoint = v
+    else
+      protocol = _sns_to_protocol(v[:protocol])
+      endpoint = _sns_to_endpoint(protocol, v[:endpoint])
+    end
     array << _{
       Endpoint endpoint
       Protocol protocol

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.33'
+KUMOGATA_TEMPLATE_VERSION = '0.0.34'

data/template/ec2-customer-gateway.rb

@@ -0,0 +1,21 @@
+#
+# EC2 Customer Gateway resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "customer gateway")
+bgp = _ref_string("bgp", args, "bgp")
+ip = _ref_string("ip", args, "ip")
+tags = _tags(args)
+type = _ref_string("type", args)
+
+_(name) do
+  Type "AWS::EC2::CustomerGateway"
+  Properties do
+    BgpAsn bgp
+    IpAddress ip
+    Tags tags
+    Type type
+  end
+end

data/template/ec2-dhcp-options.rb

@@ -0,0 +1,25 @@
+#
+# EC2 DHCP Options resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "dhcp options")
+domain_name = _ref_string("domain_name", args, "domain name")
+domain_servers = _ref_array("domain_servers", args, "domain servers")
+netbios_servers = _ref_array("netbios_servers", args, "netbios servers")
+netbios_type = args[:netbios_type] || 2
+ntp_serves = _ref_array("ntp_serves", args, "ntp servers")
+tags = _tags(args)
+
+_(name) do
+  Type "AWS::EC2::DHCPOptions"
+  Properties do
+    DomainName domain_name unless domain_name.empty?
+    DomainNameServers domain_servers unless domain_servers.empty?
+    NetbiosNameServers netbios_servers unless netbios_servers.empty?
+    NetbiosNodeType netbios_type unless netbios_servers.empty?
+    NtpServers unless ntp_serves.empty?
+    Tags tags
+  end
+end

data/template/ec2-egress-only-internet-gateway.rb

@@ -0,0 +1,15 @@
+#
+# EC2 Egress Only Internet Gateway resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "egress only internet gateway")
+vpc = _ref_string("vpc", args, "vpc")
+
+_(name) do
+  Type "AWS::EC2::EgressOnlyInternetGateway"
+  Properties do
+    VpcId vpc
+  end
+end

data/template/ec2-instance.rb

@@ -19,7 +19,7 @@ ipv6_addresses = args[:ipv6_addresses] || []
 kernel = args[:kernel] || ""
 key_name = _ref_string("key_name", args, "key name")
 monitoring = _bool("monitoring", args, true)
-network_interfaces = (args[:network_interfaces] || []).collect{|v| _ec2_network_interface(v) }
+network_interfaces = (args[:network_interfaces] || []).collect{|v| _ec2_network_interface_embedded(v) }
 placement = _ref_string("placement", args)
 private_ip = args[:private_ip] || ""
 ram_disk = args[:ram_disk] || ""
@@ -29,7 +29,7 @@ ssm = args[:ssm] || []
 subnet = _ref_string("subnet", args, "subnet")
 tags = _ec2_tags(args)
 tenancy = args[:tenancy] || "default"
-user_data = _ec2_user_data(args)##_ref_string("user_data", args, "user data")
+user_data = _ec2_user_data(args)
 volumes = args[:volumes] || ""
 
 _(name) do

data/template/ec2-network-interface-attachment.rb

@@ -0,0 +1,22 @@
+#
+# EC2 Network Interface Attachment resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "network interface attachment")
+delete = _bool("delete", args, true)
+index = args[:index] || 0
+instance = _ref_string("instance", args, "instance")
+network = _ref_string("network", args, "network interface")
+
+_(name) do
+  Type "AWS::EC2::NetworkInterfaceAttachment"
+  Properties do
+    DeleteOnTermination delete
+    DeviceIndex index
+    InstanceId instance
+    NetworkInterfaceId network
+  end
+end
+

data/template/ec2-network-interface.rb

@@ -0,0 +1,32 @@
+#
+# EC2 Network Interface resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "network interface")
+description = _ref_string_default("description", args)
+group_set = _ref_array("group_set", args, "security group")
+ipv6_addresses = args[:ipv6_addresses] || []
+private_ip = args[:private_ip] || ""
+private_ips = args[:private_ips] || ""
+secondary_private_ip = args[:secondary_private_ip] || ""
+source_dest = _bool("source_dest", args, false)
+subnet = _ref_string("subnet", args, "subnet")
+tags = _tags(args)
+
+_(name) do
+  Type "AWS::EC2::NetworkInterface"
+  Properties do
+    Description description unless description.empty?
+    GroupSet group_set unless group_set.empty?
+    Ipv6AddressCount ipv6_addresses.size unless ipv6_addresses.empty?
+    Ipv6Addresses ipv6_addresses unless ipv6_addresses.empty?
+    PrivateIpAddress private_ip unless private_ips.empty?
+    PrivateIpAddresses private_ips unless private_ip.empty?
+    SecondaryPrivateIpAddressCount secondary_private_ip unless secondary_private_ip.empty?
+    SourceDestCheck source_dest
+    SubnetId subnet
+    Tags tags
+  end
+end

data/template/ec2-placement-group.rb

@@ -0,0 +1,17 @@
+#
+# EC2 Placement Group resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "placement group")
+strategy = args[:strategy] || "cluster"
+
+_(name) do
+  Type "AWS::EC2::PlacementGroup"
+  Properties do
+    Strategy strategy
+  end
+end
+
+

data/template/ec2-security-group-egress.rb

@@ -0,0 +1,15 @@
+#
+# EC2 Security Group Egress resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/ec2'
+
+name = _resource_name(args[:name], "security group egress")
+egress = _ec2_security_group_egress_rule(args)
+egress["GroupId"] = _ref_string("group", args, "security group")
+
+_(name) do
+  Type "AWS::EC2::SecurityGroupEgress"
+  Properties egress
+end

data/template/ec2-security-group-ingress.rb

@@ -0,0 +1,19 @@
+#
+# EC2 Security Group Ingress resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/ec2'
+
+name = _resource_name(args[:name], "security group ingress")
+ingress = _ec2_security_group_ingress_rule(args)
+group_id = _ref_string("group_id", args, "security group")
+ingress["GroupId"] = group_id unless group_id.empty?
+group_name = _ref_string("group_name", args, "security group")
+ingress["GroupName"] = group_name unless group_name.empty?
+ingress["GroupName"] = _ref_name("name", args, "security group") if group_name.empty? and group_id.empty?
+
+_(name) do
+  Type "AWS::EC2::SecurityGroupIngress"
+  Properties ingress
+end

data/template/ec2-security-group.rb

@@ -6,17 +6,17 @@ require 'kumogata/template/helper'
 require 'kumogata/template/ec2'
 
 name = _resource_name(args[:name], "security group")
-group_name = _real_name(args[:group_name] || "")
+group_name = _real_name("group", args)
 description = args[:description] || "#{args[:name]} security group description"
-egress = _ec2_security_group_egresses("egress", args)
-ingress = _ec2_security_group_ingresses("ingress", args)
+egress = _ec2_security_group_egress_rules("egress", args)
+ingress = _ec2_security_group_ingress_rules("ingress", args)
 tags = _tags(args)
 vpc = _ref_string("vpc", args, "vpc")
 
 _(name) do
   Type "AWS::EC2::SecurityGroup"
   Properties do
-    GroupName group_name unless group_name.empty?
+    GroupName group_name if group_name
     GroupDescription description
     SecurityGroupEgress egress unless egress.empty?
     SecurityGroupIngress ingress unless ingress.empty?

data/template/ec2-subnet-cidr-block.rb

@@ -0,0 +1,17 @@
+#
+# EC2 Subnet Cidr Block resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "subnet cidr block")
+cidr = _ref_string("cidr", args, "cidr")
+subnet = _ref_string("subnet", args, "subnet")
+
+_(name) do
+  Type "AWS::EC2::SubnetCidrBlock"
+  Properties do
+    Ipv6CidrBlock cidr
+    SubnetId subnet
+  end
+end

data/template/ec2-vpc-cidr-block.rb

@@ -0,0 +1,17 @@
+#
+# EC2 VPC Cidr Block resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpc cidr block")
+cidr = true
+vpc = _ref_string("vpc", args, "vpc")
+
+_(name) do
+  Type "AWS::EC2::VPCCidrBlock"
+  Properties do
+    AmazonProvidedIpv6CidrBlock cidr
+    VpcId vpc
+  end
+end