kumogata-template 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e312fcdabe283ed54187861ab3bca524c0514072
-  data.tar.gz: 52b57de9ea1ad263d9a98aa266a670f8670d9984
+  metadata.gz: c0b3009b60eaa96c62f0e6cfcb8b5e93453e19a5
+  data.tar.gz: f4cfbdffa75b3855c1aa1f49d7c5f3d032d56331
 SHA512:
-  metadata.gz: e7f8b1fd4229e5ed0f9b68cfa5cc741619a254090ebc0b8d1ce9023bb228f34ffb56df4b5cd5383a488479c77e43368e58cabe4fd444c250652b1f4dd2ef7544
-  data.tar.gz: 1d7dd194fbc6bf98cb05b0a08bbf40e7efdde98fe44c9c18d879df30a46af6c8caecd5942d84d39ef6f61253792c74acc33e37819d0661c31a873386547dd203
+  metadata.gz: 8461e8ea61c6a49d1ec819213056ee32a89457da7dff59a1127fe5a8d97351d833084a3242cea845f6b4f507e50085db2650bce8ccb619e176c56b6adb85f97d
+  data.tar.gz: 5ede82ac1c09eecb65d379251dd575ccc3ad8da3dd010f8de1c256424a05d53c158d7e9eb4fe53560ab88aba0db5a62c666b8eff63d73e5e2cac23204b4df57a

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.4)
+    kumogata-template (0.0.5)
       aws-sdk (~> 2.3)
-      kumogata (= 0.5.8)
+      kumogata (= 0.5.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.3.8)
-      aws-sdk-resources (= 2.3.8)
-    aws-sdk-core (2.3.8)
+    aws-sdk (2.5.5)
+      aws-sdk-resources (= 2.5.5)
+    aws-sdk-core (2.5.5)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.8)
-      aws-sdk-core (= 2.3.8)
+    aws-sdk-resources (2.5.5)
+      aws-sdk-core (= 2.5.5)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -23,21 +23,19 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     diffy (3.1.0)
-    dslh (0.3.7)
+    dslh (0.2.7)
     execjs (2.7.0)
     hashie (3.4.4)
     highline (1.7.8)
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
+    jmespath (1.3.1)
     json (1.8.3)
     json5 (0.0.1)
-    json_pure (1.8.3)
-    kumogata (0.5.8)
+    kumogata (0.5.10)
       aws-sdk-v1
       coderay
       coffee-script
       diffy
-      dslh (>= 0.2.7)
+      dslh (>= 0.2.7, < 0.3)
       hashie
       highline
       json
@@ -48,20 +46,22 @@ GEM
       therubyracer
       uuidtools
     libv8 (3.16.14.15)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
-    net-ssh (3.1.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    net-ssh (3.2.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     rake (11.1.2)
     ref (2.0.0)
-    retryable (2.0.3)
+    retryable (2.0.4)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    tins (1.10.2)
+    tins (1.12.0)
     uuidtools (2.1.5)
 
 PLATFORMS

data/lib/kumogata/template/alb.rb

@@ -0,0 +1,99 @@
+#
+# Helper - ALB
+#
+require 'kumogata/template/helper'
+
+def _alb_certificates(args)
+  certificates = args[:certificates] || []
+
+  array = []
+  certificates.each do |certificate|
+    cert = _ref_string("value", { value: certificate }, "certificate")
+    next if cert.empty?
+
+    array << _{
+      CertificateArn cert
+    }
+  end
+  array
+end
+
+def _alb_actions(args)
+  defaults = args[:actions] || []
+
+  array = []
+  defaults.each do |default|
+    target = _ref_string("target", default, "target group")
+    array << _{
+      TargetGroupArn target
+      Type "forward"
+    }
+  end
+  array
+end
+
+def _alb_conditions(args)
+  conditions = args[:conditions] || []
+
+  array = []
+  conditions.each do |condition|
+    condition = [ condition ] unless condition.is_a? Array
+    array << _{
+      Field "path-pattern"
+      Values condition
+    }
+  end
+  array
+end
+
+def _alb_attributes(args)
+  attributes = args[:attributes] || []
+
+  array = []
+  attributes.each do |attribute|
+    attribute.each_pair{|key, value|
+      array << _{
+        Key key
+        Value value
+      }
+    }
+  end
+  array
+end
+
+def _alb_matcher(args)
+  args[:matcher] = 200 unless args.key? :matcher
+
+  http_code = _valid_values(args[:matcher], %w( 200 202 299 ), 200)
+  _{
+    HttpCode http_code
+  }
+end
+
+def _alb_health_check(args)
+  protocol = _valid_values(args[:protocol] || "", %w( http https ), "http")
+  # Return to native hash
+  {
+    interval: args[:interval] || 30,
+    path: args[:path] || "/",
+    port: args[:port] || 80,
+    protocol: protocol.upcase,
+    timeout: args[:timeout] || 5,
+    healthy: args[:healthy] || 10,
+    unhealthly: args[:unhealthly] || 2,
+  }
+end
+
+def _alb_targets(args)
+  targets = args[:targets] || []
+
+  array = []
+  targets.each do |target|
+    id = _ref_string("instance", target, "instance")
+    array << _{
+      Id id
+      Port target[:port] if target.key? :port
+    }
+  end
+  array
+end

data/lib/kumogata/template/certificate.rb

@@ -0,0 +1,18 @@
+#
+# Helper - Certificate
+#
+require 'kumogata/template/helper'
+
+def _certificate_validations(args)
+  validation = args[:validation] || []
+  validation << { domain: args[:domain], validation: args[:domain] } if validation.empty?
+
+  result = []
+  validation.each do |val|
+    result << _{
+      DomainName val[:domain]
+      ValidationDomain val[:validation]
+    }
+  end
+  result
+end

data/lib/kumogata/template/const.rb

@@ -112,10 +112,17 @@ ELASTICACHE_NODE_TYPES =
    # cache.r3.2xlarge    8    58.2        High
    # cache.r3.4xlarge   16   118          High
    # cache.r3.8xlarge   32   237          10 Gigabit
+   # cache.m4.large      2     6.42       Moderate
+   # cache.m4.xlarge     4    14.28       High
+   # cache.m4.2xlarge    8    29.70       High
+   # cache.m4.4xlarge   16    60.78       High
+   # cache.m4.10xlarge  40   154.64       10 Gigabit
    "cache.t2.micro", "cache.t2.small", "cache.t2.medium",
    "cache.m3.medium", "cache.m3.large", "cache.m3.xlarge",
    "cache.m3.2xlarge", "cache.r3.large", "cache.r3.xlarge",
    "cache.r3.2xlarge", "cache.r3.4xlarge", "cache.r3.8xlarge",
+   "cache.m4.large", "cache.m4.xlarge", "cache.m4.2xlarge",
+   "cache.m4.4xlarge", "cache.m4.10xlarge",
   ]
 ELASTICACHE_DEFAULT_NODE_TYPE = "cache.t2.medium"
 

data/lib/kumogata/template/ec2.rb

@@ -53,6 +53,12 @@ def _ec2_security_group_ingresses(name, args)
 
   rules = []
   _array(args[name.to_sym]).each do |arg|
+    if arg.is_a? Fixnum
+      arg = {
+        from: arg,
+        to: arg,
+      }
+    end
     rules << _ec2_security_group_ingress(arg)
   end
   rules

data/lib/kumogata/template/ecs.rb

@@ -117,3 +117,12 @@ def _ecs_volumes_host(args)
     SourcePath args[:source_path]
   }
 end
+
+def _ecs_deployment(args)
+  return "" unless args.key? :max or args.key? :min
+
+  _{
+    MaximumPercent args[:max]
+    MinimumHealthyPercent args[:min]
+  }
+end

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

@@ -5,7 +5,7 @@ class Kumogata::Client
   def init(stack_name)
     begin
       base_template = ''
-      File.open(get_template_path("_template"), "r"){|f|
+      File.open(get_template_path('_template'), 'r'){|f|
         base_template = f.read
       }
       raise 'initialize template is empty' if base_template.empty?
@@ -17,7 +17,7 @@ class Kumogata::Client
         return nil if answer.upcase != 'Y'
       end
 
-      File.open(new_template, "w"){|f|
+      File.open(new_template, 'w'){|f|
         template = base_template.gsub('#{NAME}', stack_name)
         f.write(template)
       }
@@ -29,9 +29,8 @@ class Kumogata::Client
   end
 
   def define_template_func(scope, path_or_url)
-    functions = ""
-
-    Dir.glob(File.join(get_template_path, "*.rb")).all? do |file|
+    functions = ''
+    Dir.glob(File.join(get_template_path, '*.rb')).all? do |file|
       functions << include_func(path_or_url, file)
       functions << "\n\n"
     end
@@ -96,7 +95,7 @@ class Kumogata::Client
   end
 
   def get_template_path(file = nil)
-    template_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..","..", "template"))
+    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

data/lib/kumogata/template/helper.rb

@@ -92,6 +92,10 @@ def _find_in_map(name, top_level, secondary_level)
   _{ Fn__FindInMap [ name, top_level, secondary_level ] }
 end
 
+def _select(index, list)
+  _{ Fn__Select [ index.to_s, list ] }
+end
+
 def _tag(args)
   key = args[:key].to_s || ""
   value = args[:value] || ""

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.5'
+KUMOGATA_TEMPLATE_VERSION = '0.0.6'

data/lib/kumogata/template.rb

@@ -1,4 +1,6 @@
+require 'kumogata/template/alb'
 require 'kumogata/template/autoscaling'
+require 'kumogata/template/certificate'
 require 'kumogata/template/cloudwatch'
 require 'kumogata/template/codedeploy'
 require 'kumogata/template/const'

data/template/alb-listener-rule.rb

@@ -0,0 +1,22 @@
+#
+# ALB(ElasticLoadBalancingV2) ListenerRule resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/alb'
+
+name = _resource_name(args[:name], "load balancer listener rule")
+actions = _alb_actions(args)
+conditions = _alb_conditions(args)
+listener = _ref_string("listener", args, "load balancer listener")
+priority = args[:priority] || 1
+
+_(name) do
+  Type "AWS::ElasticLoadBalancingV2::ListenerRule"
+  Properties do
+    Actions actions
+    Conditions conditions
+    ListenerArn listener
+    Priority priority
+  end
+end

data/template/alb-listener.rb

@@ -0,0 +1,26 @@
+#
+# ALB(ElasticLoadBalancingV2) Listener resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/alb'
+
+name = _resource_name(args[:name], "load balancer listener")
+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")
+ssl = args[:ssl] || ""
+
+_(name) do
+  Type "AWS::ElasticLoadBalancingV2::Listener"
+  Properties do
+    Certificates certificates unless certificates.empty?
+    DefaultActions defaults
+    LoadBalancerArn lb
+    Port port
+    Protocol protocol.upcase
+    SslPolicy ssl unless ssl.empty?
+  end
+end

data/template/alb-load-balancer.rb

@@ -0,0 +1,27 @@
+#
+# ALB(ElasticLoadBalancingV2) LoadBalancer resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/alb'
+
+name = _resource_name(args[:name], "load balancer")
+lb_attributes = _alb_attributes(args)
+lb_name = _ref_name("lb_name", args)
+lb_name = args[:name] if lb_name.empty?
+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)
+
+_(name) do
+  Type "AWS::ElasticLoadBalancingV2::LoadBalancer"
+  Properties do
+    LoadBalancerAttributes lb_attributes
+    Name lb_name
+    Scheme scheme unless scheme.empty?
+    SecurityGroups security_groups
+    Subnets subnets unless subnets.empty?
+    Tags tags
+  end
+end

data/template/alb-target-group.rb

@@ -0,0 +1,39 @@
+#
+# ALB(ElasticLoadBalancingV2) TargetGroup resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/alb'
+
+name = _resource_name(args[:name], "target group")
+health_check = _alb_health_check(args[:health_check] || {})
+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")
+tags = _tags(args)
+targets = _alb_targets(args)
+vpc = _ref_string("vpc", args, "vpc")
+
+_(name) do
+  Type "AWS::ElasticLoadBalancingV2::TargetGroup"
+  Properties do
+    HealthCheckIntervalSeconds health_check[:interval]
+    HealthCheckPath health_check[:path]
+    HealthCheckPort health_check[:port]
+    HealthCheckProtocol health_check[:protocol]
+    HealthCheckTimeoutSeconds health_check[:timeout]
+    HealthyThresholdCount health_check[:healthy]
+    Matcher matcher
+    Name target_name
+    Port port
+    Protocol protocol.upcase
+    Tags tags
+    TargetGroupAttributes attributes
+    Targets targets
+    UnhealthyThresholdCount health_check[:unhealthly]
+    VpcId vpc
+  end
+end

data/template/autoscaling-group.rb

@@ -21,6 +21,7 @@ max = min if max < min
 notifications = (args[:notifications] || []).collect{|v| _autoscaling_notification(v) }
 placement = args[:placement] || ""
 tags = _autoscaling_tags(args)
+target_groups = args[:target_groups] || []
 terminations = _autoscaling_terminations(args)
 vpc_zones = _ref_array("vpc_zones", args, "subnet")
 
@@ -41,6 +42,7 @@ _(name) do
     NotificationConfigurations notifications
     PlacementGroup placement unless placement.empty?
     Tags tags
+    TargetGroupARNs target_groups unless target_groups.empty?
     TerminationPolicies terminations unless terminations.empty?
     VPCZoneIdentifier vpc_zones unless vpc_zones.empty?
   end

data/template/certificate.rb

@@ -0,0 +1,20 @@
+#
+# CertificateManager Certificate resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/certificate'
+
+name = _resource_name(args[:name], "certificate")
+domain = args[:domain]
+validation = _certificate_validations(args)
+subject = args[:subject] || ""
+
+_(name) do
+  Type "AWS::CertificateManager::Certificate"
+  Properties do
+    DomainName domain
+    DomainValidationOptions validation
+    SubjectAlternativeNames subject unless subject.empty?
+  end
+end

data/template/ec2-flow-log.rb

@@ -0,0 +1,41 @@
+#
+# EC2 FlowLog resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/ec2'
+
+name = _resource_name(args[:name], "flow log")
+deliver = _ref_attr_string("deliver", "Arn", args, "role")
+log = args[:log] || args[:name]
+resource_type_value = _valid_values(args[:type], %w( vpc subnet nic ), "vpc")
+resource_id =
+  case resource_type_value.downcase
+  when "vpc"
+    _ref_string("id", args, "vpc")
+  when "subnet"
+    _ref_string("id", args, "subnet")
+  when "nic"
+    _ref_string("id", args, "network interface")
+  end
+resource_type =
+  case resource_type_value.downcase
+  when "vpc"
+    "VPC"
+  when "subnet"
+    "Subnet"
+  when "nic"
+    "NetworkInterface"
+  end
+traffic = _valid_values(args[:traffic], %w( accept reject all ), "all")
+
+_(name) do
+  Type "AWS::EC2::FlowLog"
+  Properties do
+    DeliverLogsPermissionArn deliver unless deliver.empty?
+    LogGroupName log
+    ResourceId resource_id
+    ResourceType resource_type
+    TrafficType traffic.upcase
+  end
+end

data/template/ec2-host.rb

@@ -0,0 +1,21 @@
+#
+# EC2 Host resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/ec2'
+
+name = _resource_name(args[:name], "host")
+auto = _valid_values(args[:auto], %w( on off ), "")
+az = _availability_zone(args)
+instance_type = _ref_string("instance_type", args, "instance type")
+instance_type = EMR_DEFAULT_INSTANCE_TYPE  if instance_type.empty?
+
+_(name) do
+  Type "AWS::EC2::Host"
+  Properties do
+    AutoPlacement auto unless auto.empty?
+    AvailabilityZone az
+    InstanceType instance_type
+  end
+end

data/template/ec2-instance.rb

@@ -7,9 +7,11 @@ require 'kumogata/template/ec2'
 
 name = _resource_name(args[:name], "instance")
 instance_type = _ref_string("instance_type", args, "instance type")
+affinity = _valid_values(args[:affinity], %w( host default ), "")
 az = _availability_zone(args)
 block_device = (args[:block_device] || []).collect{|v| _ec2_block_device(v) }
 disable_termination = _bool("disable_termination", args, false)
+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"
@@ -32,11 +34,13 @@ volumes = args[:volumes] || ""
 _(name) do
   Type "AWS::EC2::Instance"
   Properties do
+    Affinity affinity unless affinity.empty?
     AvailabilityZone az unless az.empty?
     BlockDeviceMappings block_device
     DisableApiTermination disable_termination
     #EbsOptimized
-    IamInstanceProfile iam_instance
+    HostId host_id unless affinity.empty? and host_id.empty?
+    IamInstanceProfile iam_instance unless iam_instance.empty?
     ImageId image
     InstanceInitiatedShutdownBehavior instance_initiated
     InstanceType instance_type

data/template/ec2-spot-fleet.rb

@@ -0,0 +1,16 @@
+#
+# EC2 Spot Fleet resource
+# https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/ec2'
+
+name = _resource_name(args[:name], "spot fleet")
+data = _ec2_spot_fleet_request(args)
+
+_(name) do
+  Type "AWS::EC2::SpotFleet"
+  Properties do
+    SpotFleetRequestConfigData data
+  end
+end

data/template/ecs-service.rb

@@ -7,6 +7,7 @@ require 'kumogata/template/ecs'
 
 name = _resource_name(args[:name], "ecs service")
 cluster = _ref_string("cluster", args, "ecs cluster")
+deployment = _ecs_deployment(args)
 desired = _ref_string("desired_count", args, "ecs desired count")
 load_balancers = _ecs_load_balancers(args)
 role = args[:role] || ""
@@ -16,6 +17,7 @@ _(name) do
   Type "AWS::ECS::Service"
   Properties do
     Cluster cluster
+    DeploymentConfiguration deployment unless deployment.empty?
     DesiredCount desired
     LoadBalancers load_balancers unless load_balancers.empty?
     Role role unless role.empty?

data/template/{elb-loadbalancer.rb → elb-load-balancer.rb}

@@ -1,5 +1,5 @@
 #
-# ElasticLoadBalancing LoadBalancer resource
+# ELB(ElasticLoadBalancing) LoadBalancer resource
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html
 #
 require 'kumogata/template/helper'

data/template/iam-group.rb

@@ -6,6 +6,7 @@ require 'kumogata/template/helper'
 require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "group")
+group = args[:group] || ""
 managed_policies =
   if args.key? :managed_policies
     _iam_managed_policies(args)
@@ -18,6 +19,7 @@ policies = _iam_policies("policies", args)
 _(name) do
   Type "AWS::IAM::Group"
   Properties do
+    GroupName group_name unless group.empty?
     ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
     Policies policies unless policies.empty?

data/template/iam-role.rb

@@ -7,7 +7,15 @@ require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "role")
 policy = _iam_assume_role_policy_document(args)
+managed_policies =
+  if args.key? :managed_policies
+    _iam_managed_policies(args)
+  else
+    []
+  end
 path = args[:path] || "/"
+policies = _iam_policies("policies", args)
+role = args[:role] || ""
 
 _(name) do
   Type "AWS::IAM::Role"
@@ -16,6 +24,9 @@ _(name) do
       Version "2012-10-17"
       Statement policy
     end
+    ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
+    Policies policies unless policies.empty?
+    RoleName role unless role.empty?
   end
 end

data/template/iam-user.rb

@@ -21,6 +21,7 @@ managed_policies =
   end
 path = args[:path] || "/"
 policies = _iam_policies("policies", args)
+user = args[:user] || ""
 
 _(name) do
   Type "AWS::IAM::User"
@@ -30,5 +31,6 @@ _(name) do
     ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
     Policies policies unless policies.empty?
+    UserName user unless user.empty?
   end
 end