kumogata-template 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3ef42d67f39067721ba98afb39d9392c2d0551e
-  data.tar.gz: 2b67f7e99a815830cded5cf6ae4cb5d295bfb9da
+  metadata.gz: a072c9287be025226a5046066132716048ede1a2
+  data.tar.gz: ccfe43986bc296bec97d755cce6f3f1bc96cf291
 SHA512:
-  metadata.gz: 5cfcba9ce73284c4ca4de89ef518e136f165f64e8e42145c7bdfb850860a290205e2ce652023bcb0a593b6ccef6925b371608efca172b415fba7a47901a08681
-  data.tar.gz: 11bfdc2ace307e23e6c71e93e1bad0dfdcca46c9e5324f3ad75a334712a12bc3f19df6b93acb521212ef01644e783edb2ec94cdf724157e74e9824797569d5f3
+  metadata.gz: 6f6e0278162a801dcb24ff85836fe6879b14f374926b42c91484405c46f468ba09a8adf58f5c52e1049453af70e65a89c408e1f20e2078202996cffce85a868d
+  data.tar.gz: d78e60f26dd322470bada79d3884f134a4f1deb5c5e3826d5949ae64ff0e144a2a809be8d8147e0b51d4defdb2b37c908a3c1c7d11fe2c0284b6ecde970ea606

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.17)
+    kumogata-template (0.0.18)
       aws-sdk (~> 2.3)
       kumogata (= 0.5.12)
 

data/README.md

@@ -1,5 +1,6 @@
 # kumogata-template
 
+[![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

data/lib/kumogata/template/alb.rb

@@ -3,19 +3,51 @@
 #
 require 'kumogata/template/helper'
 
-def _alb_certificates(args)
-  certificates = args[:certificates] || []
+def _alb_to_lb_attribute_access_log(args)
+  {
+    "access_logs.s3.enabled": true,
+    "access_logs.s3.bucket": args[:bucket],
+    "access_logs.s3.prefix": args[:prefix],
+  }
+end
 
-  array = []
-  certificates.each do |certificate|
-    cert = _ref_string("value", { value: certificate }, "certificate")
-    next if cert.empty?
+def _alb_to_lb_attribute_delete_protection
+  {
+    "deletion_protection.enabled": true
+  }
+end
 
-    array << _{
-      CertificateArn cert
-    }
-  end
-  array
+def _alb_to_lb_attribute_idle_timeout(value)
+  # idle timeout seconds 1-3600
+  {
+    "idle_timeout.timeout_seconds": value
+  }
+end
+
+def _alb_to_target_group_attribute_delay_timeout(value)
+  # wait before changing the state of a deregistering target from draining to unused 0-3600 seconds.
+  {
+    "deregistration_delay.timeout_seconds": value
+  }
+end
+
+def _alb_to_target_group_stickiness(value)
+  # 1 second to 1 week (604800 seconds). The default value is 1 day (86400 seconds).
+  {
+    "stickiness.enabled": true,
+    "stickiness.type": "lb_cookie",
+    "stickiness.lb_cookie.duration_seconds": value
+  }
+end
+
+def _alb_certificates(args)
+  certificate = _ref_string("certificate", args)
+
+  [
+   _{
+     CertificateArn certificate
+   }
+  ]
 end
 
 def _alb_actions(args)

data/lib/kumogata/template/autoscaling.rb

@@ -92,7 +92,7 @@ def _autoscaling_tags(args)
   tags = [
           _{
             Key "Name"
-            Value _tag_name(args[:tag_name] || args[:name])
+            Value _tag_name(args)
             PropagateAtLaunch _bool("tag_name_launch", args, true)
           },
           _{

data/lib/kumogata/template/const.rb

@@ -2,19 +2,22 @@
 # AWS Constants
 #
 
+# http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions
 AWS_REGION = {
   virginia:   "us-east-1",
   ohio:       "us-east-2",
-  oregon:     "us-west-2",
   california: "us-west-1",
+  oregon:     "us-west-2",
+  canada:     "ca-central-1",
   ireland:    "eu-west-1",
   frankfurt:  "eu-central-1",
-  singapore:  "ap-southeast-1",
+  london:     "eu-west-2",
   tokyo:      "ap-northeast-1",
-  sydney:     "ap-southeast-2",
   seoul:      "ap-northeast-2",
-  saopaulo:   "sa-east-1",
+  singapore:  "ap-southeast-1",
+  sydney:     "ap-southeast-2",
   mumbai:     "ap-south-1",
+  saopaulo:   "sa-east-1",
 }
 
 PORT = {

data/lib/kumogata/template/helper.rb

@@ -21,7 +21,8 @@ def _array(args)
 end
 
 def _bool(name, args, default = false)
-  args.key?(name.to_sym) ? args[name.to_sym].to_s : default.to_s
+  bool = args.key?(name.to_sym) ? args[name.to_sym] : default
+  bool.to_s == 'true'
 end
 
 def _integer(name, args, default = 0)
@@ -32,6 +33,12 @@ def _capitalize(name)
   name.split(' ').map(&:capitalize).join()
 end
 
+def _description(name)
+  name.gsub("\n", ' ').
+    gsub(/\s+/, ' ').gsub(/^\s/, '').gsub(/\s$/, '').
+    chomp.slice(0, 1024)
+end
+
 def _valid_values(value, values, default = nil)
   return default if value.nil?
   values.collect{|v| return v if v =~ /^#{value}$/i }
@@ -81,12 +88,13 @@ def _ref_attr_string(name, attr, args, ref_name = '')
 end
 
 def _ref_name(name, args, ref_name = '')
+  return _{ Ref _resource_name(args["ref_raw_#{name}".to_sym], ref_name) } if args.key? "ref_raw_#{name}".to_sym
   return args["raw_#{name}".to_sym] if args.key? "raw_#{name}".to_sym
   name = _ref_string(name, args, ref_name)
   if name.empty?
-    _{ Fn__Join "-", [ _{ Ref "Service" }, _{ Ref "Name" } ] }
+    _{ Fn__Join "-", [ _{ Ref _resource_name("service") }, _{ Ref _resource_name("name") } ] }
   elsif name.is_a? Hash
-    _{ Fn__Join "-", [ _{ Ref "Service" }, name ] }
+    _{ Fn__Join "-", [ _{ Ref _resource_name("service") }, name ] }
   else
     name.gsub(' ', '-')
   end
@@ -132,7 +140,7 @@ def _tags(args)
   tags = [
           _{
             Key "Name"
-            Value _tag_name(args[:name])
+            Value _tag_name(args)
           },
           _{
             Key "Service"
@@ -147,10 +155,16 @@ def _tags(args)
   tags
 end
 
-def _tag_name(name)
-  _{
-    Fn__Join [ "-", [ _{ Ref _resource_name("service") }, name.to_s.gsub(' ', '-') ] ]
-  }
+def _tag_name(args)
+  return _{ Ref _resource_name(args["ref_raw_tag_name".to_sym]) } if args.key? "ref_raw_tag_name".to_sym
+  return args["raw_tag_name".to_sym] if args.key? "raw_tag_name".to_sym
+
+  tag_name = _ref_string("tag_name", args)
+  return tag_name unless tag_name.empty?
+
+  tag_name = _ref_string("name", args)
+  tag_name = tag_name.gsub(' ', '-') if tag_name.is_a? String
+  _{ Fn__Join [ "-", [ _{ Ref _resource_name(args[:tag_service] || "service") }, tag_name ] ] }
 end
 
 def _availability_zone(args, use_subnet = true)

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.18'
+KUMOGATA_TEMPLATE_VERSION = '0.0.19'

data/template/alb-listener.rb

@@ -10,13 +10,13 @@ certificates = _alb_certificates(args)
 defaults = _alb_actions(args)
 lb = _ref_string("lb", args, "load balancer")
 port = args[:port] || 80
-protocol = _valid_values("protocol", %w( http https ), "http")
+protocol = _valid_values(args[:protocol], %w( http https ), "http")
 ssl = args[:ssl] || ""
 
 _(name) do
   Type "AWS::ElasticLoadBalancingV2::Listener"
   Properties do
-    Certificates certificates unless certificates.empty?
+    Certificates certificates if protocol == "https"
     DefaultActions defaults
     LoadBalancerArn lb
     Port port

data/template/alb-target-group.rb

@@ -11,8 +11,14 @@ matcher = _alb_matcher(args)
 target_name = _ref_name("target_name", args)
 target_name = args[:name] if target_name.empty?
 attributes = _alb_attributes(args)
-port = args[:port] || 80
-protocol = _valid_values("protocol", %w( http https ), "http")
+full_name = _ref_string("full_name", args)
+protocol = _valid_values(args[:protocol], %w( http https ), "http")
+port =
+  if PORT.key? protocol.to_sym
+    PORT[protocol.to_sym]
+  else
+    args[:port] || PORT[:http]
+  end
 tags = _tags(args)
 targets = _alb_targets(args)
 vpc = _ref_string("vpc", args, "vpc")
@@ -31,8 +37,9 @@ _(name) do
     Port port
     Protocol protocol.upcase
     Tags tags
-    TargetGroupAttributes attributes
-    Targets targets
+    TargetGroupAttributes attributes unless attributes.empty?
+    TargetGroupFullName full_name unless full_name.empty?
+    Targets targets unless targets.empty?
     UnhealthyThresholdCount health_check[:unhealthly]
     VpcId vpc
   end

data/template/autoscaling-scheduled-action.rb

@@ -19,9 +19,10 @@ max = desired if max < desired
 min = _integer("min", args, -1)
 min = desired if min < desired
 
+# 0 - 6 Sunday to Saturday
 recurrence =
-  if args.key? :recurrence
-    case args[:recurrence]
+  if args.key? :cron
+    case args[:cron]
     when "every 5 min"
       "*/5 * * * *"
     when "every 30 min"
@@ -31,21 +32,19 @@ recurrence =
     when "every day"
       "0 0 * * *"
     when "every week"
-      "0 0 * * Tue"
+      "0 0 * * #{args[:cron_day] || 'Tue'}"
     when /\*/
-      args[:recurrence]
-    else
-      _timestamp_utc(args[:recurrence], "cron")
+      args[:cron]
     end
+  elsif args[:cron_time]
+    _timestamp_utc(args[:cron_time], "cron")
   else
     ""
   end
-start_time =
-  if args.key? :start_time
-    _timestamp_utc(args[:start_time])
-  else
-    _timestamp_utc(Time.now + 3600)
-  end
+start_time = _timestamp_utc(args[:start_time] || Time.now + 3600)
+
+## FIXME if older dot not empty
+
 
 _(name) do
   Type "AWS::AutoScaling::ScheduledAction"

data/template/mappings-ec2.rb

@@ -12,20 +12,24 @@ AWSInstanceType2Arch do
 end
 
 # Amazon Linux AMI (HVM / 64-bit)
-# https://aws.amazon.com/marketplace/pp/B00CIYTQTC/ref=srh_res_product_title?ie=UTF8&sr=0-3&qid=1460447105907
+# https://aws.amazon.com/marketplace/pp/B00CIYTQTC/
 AWSRegionArch2AMIAmazonLinuxOfficial do
-  # 2016.03
+  # 2016.09
   image_id = {
-    virginia: "08111162",
-    oregon: "c229c0a2",
-    california: "1b0f7d7b",
-    frankfurt: "e2df388d",
-    ireland: "31328842",
-    singapore: "e90dc68a",
-    sydney: "f2210191",
-    tokyo: "f80e0596",
-    seoul: "6598510b",
-    saopaulo: "1e159872",
+    virginia:   "0b33d91d",
+    ohio:       "c55673a0",
+    california: "165a0876",
+    oregon:     "f173cc91",
+    canada:     "ebed508f",
+    ireland:    "70edb016",
+    frankfurt:  "af0fc0c0",
+    london:     "f1949e95",
+    tokyo:      "56d4ad31",
+    seoul:      "dac312b4",
+    singapore:  "dc9339bf",
+    sydney:     "1c47407f",
+    mumbai:     "f9daac96",
+    saopaulo:   "80086dec",
   }
 
   AWS_REGION.each do |key, region|
@@ -37,20 +41,24 @@ end
 
 # CentOS 7 (x86_64) with Updates HVM
 # https://wiki.centos.org/Cloud/AWS
-# https://aws.amazon.com/marketplace/ordering/ref=dtl_psb_continue?ie=UTF8&productId=b7ee8a69-ee97-4a49-9e68-afaee216db2e
+# https://aws.amazon.com/marketplace/pp/B00O7WM7QW/
 AWSRegionArch2AMICentos7Official do
   # 1602, released 02/26/2016
   image_id = {
-    virginia: "6d1c2007",
-    oregon: "d2c924b2",
+    virginia:   "6d1c2007",
+    ohio:       "6a2d760f",
     california: "af4333cf",
-    ireland: "7abd0209",
-    frankfurt: "9bf712f4",
-    singapore: "f068a193",
-    tokyo: "eec1c380",
-    sydney: "fedafc9d",
-    seoul: "c74789a9",
-    saopaulo: "26b93b4a",
+    oregon:     "d2c924b2",
+    canada:     "af62d0cb",
+    ireland:    "7abd0209",
+    frankfurt:  "9bf712f4",
+    london:     "bb373ddf",
+    tokyo:      "eec1c380",
+    seoul:      "c74789a9",
+    singapore:  "f068a193",
+    sydney:     "fedafc9d",
+    mumbai:     "95cda6fa",
+    saopaulo:   "26b93b4a",
   }
 
   AWS_REGION.each do |key, region|
@@ -62,19 +70,24 @@ end
 
 # Ubuntu Server 16.04 LTS
 # https://cloud-images.ubuntu.com/locator/ec2/
+# https://aws.amazon.com/marketplace/pp/B01JBL2M0O
 AWSRegionArch2AMIUbuntu16Official do
   # 16.04 LTS 20160907.1 hvm:ebs-ssd
   image_id = {
-    virginia: "2ef48339",
-    oregon:	"746aba14",
-    california: "a9a8e4c9",
-    frankfurt: "a9a557c6",
-    ireland: "643d4217",
-    singapore: "42934921",
-    sydney: "623c0d01",
-    tokyo: "919cd68",
-    seoul: "", ## N/A
-    saopaulo: "60bd2d0c",
+    virginia:   "3267bb24",
+    ohio:       "e5be9b80",
+    california: "456f3125",
+    oregon:	"df25a6bf",
+    canada:     "",  ## N/A
+    ireland:    "cdfed1ab",
+    frankfurt:  "f6dd0899",
+    london:     "bcc5d0d8",
+    tokyo:      "0c05506b",
+    seoul:      "fc38e892",
+    singapore:  "4a299829",
+    sydney:     "d02d2eb3",
+    mumbai:     "",  ## N/A
+    saopaulo:   "4cacca20",
   }
 
   AWS_REGION.each do |key, region|

data/template/output-ec2.rb

@@ -2,7 +2,9 @@
 # Output ec2
 #
 
+public_ip = args[:public_ip] || false
+
 _output "#{args[:name]} instance", ref_value: "#{args[:name]} instance"
 _output "#{args[:name]} instance az", ref_value: [ "#{args[:name]} instance", "AvailabilityZone" ]
-_output "#{args[:name]} instance public ip", ref_value: [ "#{args[:name]} instance", "PublicIp" ] if args.key? :public_ip
+_output "#{args[:name]} instance public ip", ref_value: [ "#{args[:name]} instance", "PublicIp" ] if public_ip
 _output "#{args[:name]} instance private ip", ref_value: [ "#{args[:name]} instance", "PrivateIp" ]

data/template/output-elb.rb

@@ -12,5 +12,5 @@ _output "#{args[:name]} load balancer dns name",
         ref_value: [ "#{args[:name]} load balancer", "DNSName" ]
 _output "#{args[:name]} load balancer security group name",
         ref_value: [ "#{args[:name]} load balancer", "SourceSecurityGroup.GroupName" ]
-_output "#{args[:name]} load balancer securiry group owner",
+_output "#{args[:name]} load balancer security group owner",
         ref_value: [ "#{args[:name]} load balancer", "SourceSecurityGroup.OwnerAlias" ]

data/template/output-iam-instance-profile.rb

@@ -0,0 +1,6 @@
+#
+# Output IAM instance profile
+#
+
+_output "#{args[:name]} instance profile", ref_value: "#{args[:name]} instance profile"
+_output "#{args[:name]} instance profile arn", ref_value: [ "#{args[:name]} instance profile", "Arn" ]

data/template/output-iam-role.rb

@@ -0,0 +1,6 @@
+#
+# Output IAM role
+#
+
+_output "#{args[:name]} role", ref_value: "#{args[:name]} role"
+_output "#{args[:name]} role arn", ref_value: [ "#{args[:name]} role", "Arn" ]

data/test/ec2_test.rb

@@ -171,7 +171,7 @@ Test _ec2_security_group_egress(to: 80, group: "test")
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ec2_securiry_group_ingresses
+  def test_ec2_security_group_ingresses
     template = <<-EOS
 args = { ingress: [ from: 80 ] }
 Test _ec2_security_group_ingresses("ingress", args)
@@ -317,6 +317,28 @@ Test _ec2_image("test", { image_id: false })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::FindInMap": [
+      "AWSRegionArch2AMIAmazonLinuxOfficial",
+      {
+        "Ref": "AWS::Region"
+      },
+      {
+        "Fn::FindInMap": [
+          "AWSInstanceType2Arch",
+          "test",
+          "Arch"
+        ]
+      }
+    ]
+  }
+
+    template = <<-EOS
+Test _ec2_image("test", { image_id: nil })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
 {
   "Test": {
     "Fn::FindInMap": [

data/test/helper_test.rb

@@ -16,10 +16,10 @@ class HelperTest < Minitest::Test
   end
 
   def test_bool
-    assert_equal _bool("test", { test: true }), "true"
-    assert_equal _bool("test", { test: false }), "false"
-    assert_equal _bool("test", { test1: false }, true), "true"
-    assert_equal _bool("test", { test1: false }, false), "false"
+    assert_equal _bool("test", { test: true }), true
+    assert_equal _bool("test", { test: false }), false
+    assert_equal _bool("test", { test1: false }, true), true
+    assert_equal _bool("test", { test1: false }, false), false
   end
 
   def test_integer
@@ -33,6 +33,14 @@ class HelperTest < Minitest::Test
     assert_equal _capitalize("test test"), "TestTest"
   end
 
+  def test_description
+    description = _description <<-EOS
+  test description,
+  test
+EOS
+    assert_equal description, "test description, test"
+  end
+
   def test_valid_values
     assert_equal _valid_values("test1", ["test1", "test2"]), "test1"
     assert_equal _valid_values("test3", ["test1", "test2"], "test1"), "test1"
@@ -201,6 +209,30 @@ Test _ref_name("test", ref_test: "test")
     EOS
     assert_equal exp_template.chomp, act_template
 
+    template = <<-EOS
+Test _ref_name("test", raw_test: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "test"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _ref_name("test", ref_raw_test: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "Test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
     template = <<-EOS
 Test _ref_name("test", {})
     EOS
@@ -416,7 +448,7 @@ Test _tags({ name: "test", tags_append: { ref_test: "test" } })
 
   def test_tag_name
     template = <<-EOS
-Test _tag_name("test")
+Test _tag_name(name: "test")
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -432,6 +464,111 @@ Test _tag_name("test")
       ]
     ]
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name(ref_name: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Join": [
+      "-",
+      [
+        {
+          "Ref": "Service"
+        },
+        {
+          "Ref": "Test"
+        }
+      ]
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name(tag_name: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "test"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name(ref_tag_name: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "Test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name({ name: "test", ref_tag_name: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "Test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name(ref_raw_tag_name: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "Test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name(raw_tag_name: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "test"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _tag_name(name: "test", tag_service: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Join": [
+      "-",
+      [
+        {
+          "Ref": "Test"
+        },
+        "test"
+      ]
+    ]
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template
@@ -477,6 +614,7 @@ Test _availability_zone({})
 }
     EOS
     assert_equal exp_template.chomp, act_template
+
   end
 
   def test_availability_zones

data/test/template/mappings-ec2_test.rb

@@ -3,47 +3,7 @@ require 'kumogata/template/const'
 
 class MappingsEc2Test < Minitest::Test
   def test_normal
-    # from mappings-ec2
-    amazon_image_id = {
-      virginia: "08111162",
-      oregon: "c229c0a2",
-      california: "1b0f7d7b",
-      frankfurt: "e2df388d",
-      ireland: "31328842",
-      singapore: "e90dc68a",
-      sydney: "f2210191",
-      tokyo: "f80e0596",
-      seoul: "6598510b",
-      saopaulo: "1e159872",
-    }
-    amazon_images = get_image_values(amazon_image_id)
-    centos7_image_id = {
-      virginia: "6d1c2007",
-      oregon: "d2c924b2",
-      california: "af4333cf",
-      ireland: "7abd0209",
-      frankfurt: "9bf712f4",
-      singapore: "f068a193",
-      tokyo: "eec1c380",
-      sydney: "fedafc9d",
-      seoul: "c74789a9",
-      saopaulo: "26b93b4a",
-    }
-    centos7_images = get_image_values(centos7_image_id)
-    ubuntu16_image_id = {
-      virginia: "2ef48339",
-      oregon:	"746aba14",
-      california: "a9a8e4c9",
-      frankfurt: "a9a557c6",
-      ireland: "643d4217",
-      singapore: "42934921",
-      sydney: "623c0d01",
-      tokyo: "919cd68",
-      seoul: "", ## N/A
-      saopaulo: "60bd2d0c",
-    }
-    ubuntu16_images = get_image_values(ubuntu16_image_id)
-
+    images = generate_image_values
     archs = ""
     EC2_INSTANCE_TYPES.each_with_index do |type, i|
       archs += <<-EOS
@@ -56,20 +16,21 @@ class MappingsEc2Test < Minitest::Test
     template = <<-EOS
 _mappings_ec2 "test"
     EOS
-    act_template = run_client_as_json(template)
+    act_template = convert_image_values(run_client_as_json(template))
+
     exp_template = <<-EOS
 {
   "AWSInstanceType2Arch": {
 #{archs.chomp}
   },
   "AWSRegionArch2AMIAmazonLinuxOfficial": {
-#{amazon_images.chomp}
+#{images.chomp}
   },
   "AWSRegionArch2AMICentos7Official": {
-#{centos7_images.chomp}
+#{images.chomp}
   },
   "AWSRegionArch2AMIUbuntu16Official": {
-#{ubuntu16_images.chomp}
+#{images.chomp}
   }
 }
     EOS
@@ -77,16 +38,35 @@ _mappings_ec2 "test"
   end
 
   private
-  def get_image_values image_ids
+  def generate_image_values
     values = ''
     AWS_REGION.each_with_index do |v, i|
       region, location = v
       values += <<-EOS
     "#{location}": {
-      "HVM64": "ami-#{image_ids[region]}"
+      "HVM64": "ami-*"
     }#{i == (AWS_REGION.size - 1) ? '' : ','}
     EOS
     end
     values
   end
+
+  def convert_image_values(values)
+    result = {}
+    JSON.parse(values).each do |k ,v|
+      if k == "AWSInstanceType2Arch"
+        result[k] = v
+        next
+      else
+        result[k] = {}
+      end
+      v.each do |kk, vv|
+        result[k][kk] = {}
+        vv.each do |kkk, vvv|
+          result[k][kk][kkk] = vvv.gsub(/^ami-(.*)/, 'ami-*')
+        end
+      end
+    end
+    JSON.pretty_generate(result)
+  end
 end

data/test/template/output-elb_test.rb

@@ -32,8 +32,8 @@ _output_elb "test"
       ]
     }
   },
-  "TestLoadBalancerSecuriryGroupOwner": {
-    "Description": "description of TestLoadBalancerSecuriryGroupOwner",
+  "TestLoadBalancerSecurityGroupOwner": {
+    "Description": "description of TestLoadBalancerSecurityGroupOwner",
     "Value": {
       "Fn::GetAtt": [
         "TestLoadBalancer",
@@ -93,8 +93,8 @@ _output_elb "test", route53: true
       ]
     }
   },
-  "TestLoadBalancerSecuriryGroupOwner": {
-    "Description": "description of TestLoadBalancerSecuriryGroupOwner",
+  "TestLoadBalancerSecurityGroupOwner": {
+    "Description": "description of TestLoadBalancerSecurityGroupOwner",
     "Value": {
       "Fn::GetAtt": [
         "TestLoadBalancer",

data/test/template/output-iam-instance-profile_test.rb

@@ -0,0 +1,30 @@
+require 'abstract_unit'
+
+class OutputIamInstancerProfileTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_iam_instance_profile "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestInstanceProfile": {
+    "Description": "description of TestInstanceProfile",
+    "Value": {
+      "Ref": "TestInstanceProfile"
+    }
+  },
+  "TestInstanceProfileArn": {
+    "Description": "description of TestInstanceProfileArn",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestInstanceProfile",
+        "Arn"
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/output-iam-role_test.rb

@@ -0,0 +1,30 @@
+require 'abstract_unit'
+
+class OutputIamRoleTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_iam_role "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestRole": {
+    "Description": "description of TestRole",
+    "Value": {
+      "Ref": "TestRole"
+    }
+  },
+  "TestRoleArn": {
+    "Description": "description of TestRoleArn",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestRole",
+        "Arn"
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/rds-db-instance_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class RdsDbInstanceTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_rds_db_instance "test", ref_db_name: "test", ref_port: "test", ref_subnet_group: "test", ref_security_groups: "test", ref_user_name: "test", ref_user_password: "test"
+_rds_db_instance "test", ref_db_name: "test", ref_port: "test", ref_subnet_group: "test", ref_security_groups: "test", ref_user_name: "test", ref_user_password: "test", az: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -14,6 +14,7 @@ _rds_db_instance "test", ref_db_name: "test", ref_port: "test", ref_subnet_group
       "AllocatedStorage": "5",
       "AllowMajorVersionUpgrade": "true",
       "AutoMinorVersionUpgrade": "true",
+      "AvailabilityZone": "test",
       "BackupRetentionPeriod": "7",
       "DBInstanceClass": "db.t2.medium",
       "DBInstanceIdentifier": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -214,6 +214,8 @@ files:
 - template/output-elasticache.rb
 - template/output-elb.rb
 - template/output-emr.rb
+- template/output-iam-instance-profile.rb
+- template/output-iam-role.rb
 - template/output-name.rb
 - template/output-rds.rb
 - template/output-redshift.rb
@@ -354,6 +356,8 @@ files:
 - test/template/output-elasticache_test.rb
 - test/template/output-elb_test.rb
 - test/template/output-emr_test.rb
+- test/template/output-iam-instance-profile_test.rb
+- test/template/output-iam-role_test.rb
 - test/template/output-name_test.rb
 - test/template/output-rds_test.rb
 - test/template/output-redshift_test.rb
@@ -519,6 +523,8 @@ test_files:
 - test/template/output-elasticache_test.rb
 - test/template/output-elb_test.rb
 - test/template/output-emr_test.rb
+- test/template/output-iam-instance-profile_test.rb
+- test/template/output-iam-role_test.rb
 - test/template/output-name_test.rb
 - test/template/output-rds_test.rb
 - test/template/output-redshift_test.rb