kumogata-template 0.0.29 → 0.0.30

data/lib/kumogata/template/ext/kumogata.rb

@@ -1,11 +1,13 @@
-require 'kumogata'
-require 'kumogata/argument_parser'
+require 'kumogata2'
+require 'kumogata2/cli/option_parser'
+require 'kumogata2/logger'
+require 'kumogata2/plugin/ruby'
 
-class Kumogata::Client
+class Kumogata2::Client
   def init(stack_name)
     begin
       base_template = ''
-      File.open(get_template_path('_template'), 'r'){|f|
+      File.open(Kumogata2::Client::get_template_path('_template'), 'r'){|f|
         base_template = f.read
       }
       raise 'initialize template is empty' if base_template.empty?
@@ -21,16 +23,71 @@ class Kumogata::Client
         template = base_template.gsub('#{NAME}', stack_name)
         f.write(template)
       }
-      Kumogata.logger.info("Saved template to #{stack_name}.rb".green)
+      Kumogata2::Logger::Helper.log(:info, "Saved template to #{stack_name}.rb".green)
     rescue => e
-      Kumogata.logger.info("Failed to template #{stack_name} - #{e}".red)
+      Kumogata2::Logger::Helper.log(:error, "Failed to template #{stack_name} - #{e}".red)
     end
     nil
   end
 
+  def self.get_template_path(file = nil)
+    template_path = File.expand_path(File.join(File.dirname(__FILE__),
+                                               '..', '..', '..','..', 'template'))
+    template_path = File.join(template_path, "#{file}.rb") unless file.nil?
+    template_path
+  end
+end
+
+class Kumogata2::Plugin::Ruby
+  def parse(str)
+    str = <<EOS
+template do
+  #{str}
+end
+EOS
+    context = Kumogata2::Plugin::Ruby::Context.new(@options)
+    context.instance_eval(str, @options.path_or_url)
+    @post = context.instance_variable_get(:@_post)
+    context.instance_variable_get(:@_template)
+  end
+end
+
+class Kumogata2::Plugin::Ruby::Context
+  def template(&block)
+    key_converter = proc do |key|
+      key = key.to_s
+      unless @options.skip_replace_underscore?
+        key.gsub!('__', '::')
+        key.gsub!('_', ':')
+      end
+      key
+    end
+
+    value_converter = proc do |v|
+      case v
+      when Hash, Array
+        v
+      else
+        v.to_s
+      end
+    end
+
+    @_template = Dslh.eval({
+      key_conv: key_converter,
+      value_conv: value_converter,
+      scope_hook: proc {|scope|
+        define_template_func(scope, @options.path_or_url)
+      },
+      filename: @options.path_or_url,
+      ignore_methods: IGNORE_METHODS,
+    }, &block)
+  end
+
+  private
+
   def define_template_func(scope, path_or_url)
     functions = ''
-    Dir.glob(File.join(get_template_path, '*.rb')).all? do |file|
+    Dir.glob(File.join(Kumogata2::Client::get_template_path, '*.rb')).all? do |file|
       functions << include_func(path_or_url, file)
       functions << "\n\n"
     end
@@ -71,9 +128,6 @@ class Kumogata::Client
     EOS
   end
 
-
-  private  ###########################################################
-
   def include_func(path_or_url, file)
     <<-EOS
       def _#{get_funcname(file)}(name, args = {})
@@ -93,10 +147,4 @@ class Kumogata::Client
   def get_funcname(file)
     File.basename(file, '.rb').gsub('-', '_')
   end
-
-  def get_template_path(file = nil)
-    template_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..','..', 'template'))
-    template_path = File.join(template_path, "#{file}.rb") unless file.nil?
-    template_path
-  end
 end

data/lib/kumogata/template/helper.rb

@@ -52,16 +52,30 @@ def _valid_numbers(value, min = 0, max = 0, default = nil)
 end
 
 def _real_name(name)
-  name.to_s.gsub(' ', '-')
+  name.to_s.gsub(" ", "-")
+end
+
+def _ref_key?(name, args, ref_name = '')
+  return true if args.key? "import_#{name}".to_sym
+  return true if args.key? "ref_#{name}".to_sym
+  return true unless args[name.to_sym].to_s.empty?
+  false
 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
 
-  _{ Ref _resource_name(args["ref_#{name}".to_sym].to_s, ref_name) }
+  _ref(_resource_name(args["ref_#{name}".to_sym].to_s, ref_name))
+end
+
+def _ref_string_default(name, args, ref_name = '', default = '')
+  ref_string = _ref_string(name, args, ref_name)
+  ref_string.empty? ? default : ref_string
 end
 
 def _ref_array(name, args, ref_name = '')
+  return args["import_#{name}".to_sym].collect{|v| _import(v) } if args.key? "import_#{name}".to_sym
   return _array(args[name.to_sym]) || [] unless args.key? "ref_#{name}".to_sym
 
   array = []
@@ -69,7 +83,7 @@ def _ref_array(name, args, ref_name = '')
     array << _ref_string(name, args, ref_name)
   else
     args["ref_#{name}".to_sym].collect{|v|
-      array << _{ Ref _resource_name(v, ref_name) }
+      array << _ref(_resource_name(v, ref_name))
     }
   end
   array
@@ -77,9 +91,7 @@ end
 
 def _ref_attr_string(name, attr, args, ref_name = '')
   if args.key? "ref_#{name}".to_sym
-    _{
-      Fn__GetAtt [ _resource_name(args["ref_#{name}".to_sym], ref_name), attr ]
-    }
+    _attr_string(args["ref_#{name}".to_sym], attr, ref_name)
   elsif args.key? name.to_sym
     args[name.to_sym]
   else
@@ -88,32 +100,98 @@ 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 _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
+  return _import(args["import_#{name}".to_sym]) if args.key? "import_#{name}".to_sym
+
   name = _ref_string(name, args, ref_name)
   if name.empty?
-    _{ Fn__Join "-", [ _{ Ref _resource_name("service") }, _{ Ref _resource_name("name") } ] }
+    _join([ _ref(_resource_name("service")), _ref(_resource_name("name")) ], "-")
   elsif name.is_a? Hash
-    _{ Fn__Join "-", [ _{ Ref _resource_name("service") }, name ] }
+    _join([ _ref(_resource_name("service")), name ], "-")
   else
-    name.gsub(' ', '-')
+    name.gsub(" ", "-")
   end
 end
 
 def _ref_name_default(name, args, ref_name = '')
   return args["raw_#{name}".to_sym] if args.key? "raw_#{name}".to_sym
   name = _ref_string(name, args, ref_name)
-  name.empty? ? args[:name] : name.gsub(' ', '-')
+  name.empty? ? args[:name] : name.gsub(" ", "-")
 end
 
 def _ref_resource_name(args, ref_name = '')
-  _{ Ref _resource_name(args[:name], ref_name) }
+  _ref(_resource_name(args[:name], ref_name))
+end
+
+def _ref_arn(service, name)
+  _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
+
+def _ref(name)
+  _{ Ref name }
+end
+
+def _azs(region)
+  _{ Fn__GetAZs region }
 end
 
 def _attr_string(name, attr, ref_name = '')
   _{ Fn__GetAtt [ _resource_name(name, ref_name), attr ] }
 end
 
+def _and(conditions)
+  _{ Fn__And conditions }
+end
+
+def _equals(value1, value2)
+  _{ Fn__Equals [ value1, value2 ] }
+end
+
+def _if(name, value_if_true, value_if_false)
+  _{ Fn__If [ name, value_if_true, value_if_false ] }
+end
+
+def _not(conditions)
+  _{ Fn__Not conditions }
+end
+
+def _or(conditions)
+  _{ Fn__Or conditions }
+end
+
+def _condition(condition)
+  _{ Condition condition }
+end
+
+def _base64(data)
+  data  = data.undent if data.is_a? String
+  _{ Fn__Base64 data }
+end
+
+def _base64_shell(data, shell = "/bin/bash")
+  _base64("#!#{shell}\n#{data}")
+end
+
 def _find_in_map(name, top_level, secondary_level)
   _{ Fn__FindInMap [ name, top_level, secondary_level ] }
 end
@@ -122,12 +200,53 @@ def _select(index, list)
   _{ Fn__Select [ index.to_s, list ] }
 end
 
+def _split(name, delimiter = ",")
+  _{
+    Fn__Split [ delimiter, name ]
+  }
+end
+
+def _sub(name)
+  _{ Fn__Sub name }
+end
+
+def _export_string(args, prefix)
+  if args.key? :export and args[:export] == true
+    "#{args[:name]}-#{prefix}"
+  else
+    ""
+  end
+end
+
+def _export(args)
+  export = args[:export] || ''
+  return '' if export.empty?
+
+  _{
+    Name _sub("${AWS::StackName}-#{export.gsub(" ", "-")}")
+  }
+end
+
+def _join(args, delimiter = ",")
+  _{ Fn__Join delimiter, args }
+end
+
+def _import(name)
+  _{
+    Fn__ImportValue _sub(name)
+  }
+end
+
+def _region
+  _ref("AWS::Region")
+end
+
 def _tag(args)
   key = args[:key].to_s || ''
   value = args[:value] || ''
   if key =~ /^ref_.*/
     key.gsub!(/^ref_/, '')
-    value = _{ Ref _resource_name(value) }
+    value = _ref(_resource_name(value))
   end
 
   _{
@@ -144,11 +263,11 @@ def _tags(args)
           },
           _{
             Key "Service"
-            Value { Ref _resource_name("service") }
+            Value _ref(_resource_name("service"))
           },
           _{
             Key "Version"
-            Value { Ref _resource_name("version") }
+            Value _ref(_resource_name("version"))
           },
          ]
   args[:tags_append].collect{|k, v| tags << _tag(key: k, value: v) } if args.key? :tags_append
@@ -156,15 +275,15 @@ def _tags(args)
 end
 
 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 _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 ] ] }
+  tag_name = tag_name.gsub(" ", "-") if tag_name.is_a? String
+  _join([ _ref(_resource_name(args[:tag_service] || "service")), tag_name ], "-")
 end
 
 def _availability_zone(args, use_subnet = true)
@@ -196,7 +315,7 @@ def _availability_zones(args, use_subnet = true)
   elsif  args.key? :ref_az
     [ _ref_string("az", zone, "zone") ]
   else
-    _{ Fn__GetAZs _{ Ref "AWS::Region" } }
+    _azs(_region)
   end
 end
 
@@ -215,6 +334,14 @@ def _timestamp_utc_from_string(time, type= nil)
   _timestamp_utc(Time.strptime(time, "%Y-%m-%d %H:%M"), type)
 end
 
+def _timestamp_utc_duration(minute, hour = nil, second = nil)
+  duration = "PT"
+  duration += "#{hour}H" unless hour.nil?
+  duration += "#{minute}M"
+  duration += "#{second}S" unless second.nil?
+  duration
+end
+
 def _maintenance_window(service, start_time)
   start_time = start_time.utc
   format = "%a:%H:%M"

data/lib/kumogata/template/iam.rb

@@ -47,7 +47,6 @@ def _iam_to_policy_condition(args)
     end
     condition[key] = value
   end
-
   condition
 end
 
@@ -212,7 +211,7 @@ def _iam_arn(service, resource)
       "#{arn_prefix_s3}#{resource}"
 
     elsif resource.is_a? Hash
-      _{ Fn__Join "", [ arn_prefix_s3, _convert(resource) ] }
+      _join([ arn_prefix_s3, _convert(resource) ], "")
 
     else
       array, array_map = [], []
@@ -232,7 +231,7 @@ def _iam_arn(service, resource)
       if array.select{|v| v.is_a? Hash }.empty?
         array.collect{|v| "#{arn_prefix_s3}#{v}" }
       else
-        _{ Fn__Join "", array.insert(0, arn_prefix_s3) }
+        _join(array.insert(0, arn_prefix_s3), "")
       end
     end
 

data/lib/kumogata/template/lambda.rb

@@ -23,7 +23,7 @@ def _lambda_function_code(args)
     S3Bucket s3_bucket if is_s3
     S3Key s3_key if is_s3
     S3ObjectVersion s3_object_version if is_s3 and !s3_object_version.empty?
-    ZipFile _{ Fn__Join '\n', zip_file_code } unless is_s3
+    ZipFile _join(zip_file_code, '\n') unless is_s3
   }
 end
 
@@ -45,3 +45,12 @@ def _lambda_vpc_config(args)
     SubnetIds subnet_ids unless subnet_ids.empty?
   }
 end
+
+def _lambda_dead_letter(args)
+  return "" unless args.key? :dead_latter
+
+  dead_letter = _ref_string("dead_letter", args)
+  _{
+    TargetArn dead_letter
+  }
+end

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.29'
+KUMOGATA_TEMPLATE_VERSION = '0.0.30'

data/template/_template.rb

@@ -1,25 +1,42 @@
+require 'aws-sdk'
+
 AWSTemplateFormatVersion "2010-09-09"
 
 Description (<<-EOS).undent
   Kumogata Template - #{NAME} stack
 EOS
 
+Metadata do
+end
+
 Parameters do
+  _parameter "stack name", default: "",
+                           description: "the name of this stack"
   _parameter "name", default: "#{NAME}",
                      description: "name of this stack"
   _parameter "service", default: "service",
                         description: "#{NAME} service"
-  _parameter "version", default: "1.0.0",
+  _parameter "version", default: "0.0.1",
                         description: "#{NAME} version"
 end
 
 Mappings do
 end
 
+Conditions do
+end
+
+Transform do
+end
+
 Resources do
-  _s3_bucket "#{NAME}"
+  # And more kumogata-template examples at examples/
+
+  # Create a S3 Bucket
+  #_s3_bucket "#{NAME}"
 end
 
 Outputs do
-  _output_s3 "#{NAME}"
+  # Output S3 Bucket Information
+  #_output_s3 "#{NAME}"
 end

data/template/alb-load-balancer.rb

@@ -1,5 +1,5 @@
 #
-# ALB(ElasticLoadBalancingV2) LoadBalancer resource
+# ALB(ElasticLoadBalancingV2) loadbalancer resource
 # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
 #
 require 'kumogata/template/helper'
@@ -13,6 +13,12 @@ scheme = _valid_values("scheme", %w( internal internal-facing ), "")
 security_groups = _ref_array("security_groups", args, "security group")
 subnets = _ref_array("subnets", args, "subnet")
 tags = _tags(args)
+ip_address =
+  if args.key? :ip_address
+    _valid_values("ip_address", %w( ipv4 dualstack ), "ipv4")
+  else
+    ""
+  end
 
 _(name) do
   Type "AWS::ElasticLoadBalancingV2::LoadBalancer"
@@ -23,5 +29,6 @@ _(name) do
     SecurityGroups security_groups
     Subnets subnets unless subnets.empty?
     Tags tags
+    IpAddressType ip_address unless ip_address.empty?
   end
 end

data/template/autoscaling-launch-configuration.rb

@@ -19,7 +19,7 @@ placement = _ref_string("placement", args)
 ram = args[:ram] || ""
 security_groups = _ref_array("security_groups", args, "security group")
 spot = args[:spot] || ""
-user_data = _ref_string("user_data", args, "user data")
+user_data = _ec2_user_data(args)
 
 _(name) do
   Type "AWS::AutoScaling::LaunchConfiguration"
@@ -40,15 +40,6 @@ _(name) do
     RamDiskId ram unless ram.empty?
     SecurityGroups security_groups unless security_groups.empty?
     SpotPrice spot unless spot.empty?
-    UserData do
-      if user_data.is_a? Hash
-        Fn__Base64 user_data
-      else
-        Fn__Base64 (<<-EOS).undent
-#!/bin/bash
-#{user_data}
-EOS
-      end
-    end
+    UserData user_data unless user_data.empty?
   end
 end

data/template/autoscaling-scheduled-action.rb

@@ -3,6 +3,7 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/autoscaling'
 
 name = _resource_name(args[:name], "autoscaling scheduled action")
 autoscaling = _ref_string("autoscaling", args, "autoscaling group")
@@ -18,25 +19,9 @@ max = _integer("max", args, -1)
 max = desired if max < desired
 min = _integer("min", args, -1)
 min = desired if min < desired
-
 recurrence =
   if args.key? :recurrence
-    case args[:recurrence]
-    when "every 5 min"
-      "*/5 * * * *"
-    when "every 30 min"
-      "0,30 * * * *"
-    when "every 1 hour"
-      "0 * * * *"
-    when "every day"
-      "0 0 * * *"
-    when "every week"
-      "0 0 * * Tue"
-    when /\*/
-      args[:recurrence]
-    else
-      _timestamp_utc(args[:recurrence], "cron")
-    end
+    _autoscaling_to_schedued_recurrence(args[:recurrence])
   else
     ""
   end

data/template/ec2-instance.rb

@@ -15,6 +15,7 @@ host_id = args[:host_id] || ""
 iam_instance = _ref_string("iam_instance", args, "iam instance profile")
 image =_ec2_image(instance_type, args)
 instance_initiated = args[:instance_initiated] || "stop"
+ipv6_addresses = args[:ipv6_addresses] || []
 kernel = args[:kernel] || ""
 key_name = _ref_string("key_name", args, "key name")
 monitoring = _bool("monitoring", args, true)
@@ -28,7 +29,7 @@ ssm = args[:ssm] || []
 subnet = _ref_string("subnet", args, "subnet")
 tags = _ec2_tags(args)
 tenancy = args[:tenancy] || "default"
-user_data = _ref_string("user_data", args, "user data")
+user_data = _ec2_user_data(args)##_ref_string("user_data", args, "user data")
 volumes = args[:volumes] || ""
 
 _(name) do
@@ -44,6 +45,8 @@ _(name) do
     ImageId image
     InstanceInitiatedShutdownBehavior instance_initiated
     InstanceType instance_type
+    Ipv6AddressCount ipv6_addresses.size unless ipv6_addresses.empty?
+    Ipv6Addresses ipv6_addresses unless ipv6_addresses.empty?
     KernelId kernel unless kernel.empty?
     KeyName key_name
     Monitoring monitoring
@@ -58,12 +61,7 @@ _(name) do
     SubnetId subnet unless subnet.empty?
     Tags tags
     Tenancy tenancy unless tenancy.empty?
-    UserData do
-      Fn__Base64 (<<-EOS).undent
-#!/bin/bash
-#{user_data}
-EOS
-    end
+    UserData user_data unless user_data.empty?
     Volumes volumes unless volumes.empty?
   end
 end

data/template/ec2-network-acl-entry.rb

@@ -7,6 +7,7 @@ require 'kumogata/template/ec2'
 
 name = _resource_name(args[:name], "network acl entry")
 cidr = args[:cidr] || "0.0.0.0/0"
+cidr_ipv6 = args[:cidr_ipv6] || ""
 egress = _bool("egress", args, false)
 icmp = args[:icmp] || ""
 network_acl = _ref_attr_string("vpc_network_acl", "DefaultNetworkAcl", args, "vpc")
@@ -19,7 +20,8 @@ rule_number = _valid_numbers(args[:number], 1, 32766, 100)
 _(name) do
   Type "AWS::EC2::NetworkAclEntry"
   Properties do
-    CidrBlock cidr
+    CidrBlock cidr if cidr_ipv6.empty?
+    Ipv6CidrBlock ipv6_cidr if cidr.empty?
     Egress egress
     Icmp _{
       Code -1

data/template/ec2-route.rb

@@ -6,6 +6,7 @@ require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "route")
 destination_cidr = args[:destination_cidr] || "0.0.0.0/0"
+destination_cidr_ipv6 = args[:destination_cidr_ipv6] || ""
 gateway = _ref_string("gateway", args, "internet gateway")
 instance = _ref_string("instance", args, "intance")
 nat_gateway = _ref_string("nat_gateway", args, "nat gateway")
@@ -16,7 +17,8 @@ vpc_peering_connection = _ref_string("vpc_peering_connection", args)
 _(name) do
   Type "AWS::EC2::Route"
   Properties do
-    DestinationCidrBlock destination_cidr
+    DestinationCidrBlock destination_cidr if destination_cidr_ipv6.empty?
+    DestinationIpv6CidrBlock destination_cidr_ipv6 if destination_cidr.empty?
     GatewayId gateway unless gateway.empty?
     InstanceId instance unless instance.empty?
     NatGatewayId nat_gateway unless nat_gateway.empty?

data/template/ec2-security-group.rb

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

data/template/ec2-subnet.rb

@@ -6,7 +6,8 @@ require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "subnet")
 az = _availability_zone(args, false)
-cidr = args[:cidr] || "10.1.0.0/24"
+cidr = _ref_string("cidr", args)
+cidr = "10.1.0.0/24" if cidr.empty?
 map_public_ip_on_launch = _bool("map_public_ip_on_launch", args, true)
 tags = _tags(args)
 vpc = _ref_string("vpc", args, "vpc")

data/template/ec2-vpc.rb

@@ -5,7 +5,8 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "vpc")
-cidr = args[:cidr] || "191.168.1.0/16"
+cidr = _ref_string("cidr", args)
+cidr = "10.1.1.0/28" if cidr.empty?
 dns_support = _bool("dns_support", args, true)
 dns_hostnames = args[:dns_hostnames] || dns_support
 instance_tenancy = _valid_values(args[:instance_tenancy],