kumogata-template 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7c5c58bc386eb269e5d341c8ebf017a35acfb4
-  data.tar.gz: fe355680255862807a561345d95d579b5d59714d
+  metadata.gz: 2e12e89a89f82fa03c5fd7d65813a60a86c387a9
+  data.tar.gz: 6fb3b59eab473bd93551eaf0289cc3d79bef748b
 SHA512:
-  metadata.gz: f199fc4f72e2a341e97aa94eacc362143dc33f8a5a959c77c28881caddf909c380c2dfac5bdf4c4c76bcb2bc1f5ecae4dd3d5a4a941dce512e099c4a9ccc3a79
-  data.tar.gz: 38306ede34739c5a85b4a200fa123f408bc33683ebc2ac6a3baf2e077a82e12663c336147b79b58ae8dc8f1df103666330654692ac664ce24e5f362d64eb2f89
+  metadata.gz: 344f8ec28fa37924fefc87483d9de29dad189195aa8a5a470994487833a44486da9e1a676c73f029962396ac7ac202d5e24a743b711cc914fd2759c8c1653ca8
+  data.tar.gz: c2005b2a03797e94e535d7bcfd624067b1fc31773037926d878d95ced42f443caab739e9d5138346059c398cb6aeba432f4ee31cdfdd3a21a45b2f7e2d3a03cb

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.4
+  - 2.4.1
 gemfile: n0ts/kumogata-template/Gemfile
 script:
   - bundle install --path vendor/bundle

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.28)
+    kumogata-template (0.0.29)
       aws-sdk (~> 2.3)
-      kumogata (= 0.5.12)
+      kumogata2-plugin-ruby (= 0.1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -15,64 +15,37 @@ GEM
       jmespath (~> 1.0)
     aws-sdk-resources (2.9.25)
       aws-sdk-core (= 2.9.25)
-    aws-sdk-v1 (1.67.0)
-      json (~> 1.4)
-      nokogiri (~> 1)
     aws-sigv4 (1.0.0)
     coderay (1.1.1)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     diffy (3.2.0)
-    dslh (0.2.7)
-    execjs (2.7.0)
+    dslh (0.4.8)
     hashie (3.5.5)
     highline (1.7.8)
     jmespath (1.3.1)
-    json (1.8.3)
-    json5 (0.0.1)
-    kumogata (0.5.12)
-      aws-sdk-v1
+    kumogata2 (0.1.9)
+      aws-sdk (>= 2.3.0)
       coderay
-      coffee-script
       diffy
-      dslh (>= 0.2.7, < 0.3)
       hashie
       highline
-      json (= 1.8.3)
-      json5
-      net-ssh
-      nokogiri (= 1.6.7.2)
-      retryable (~> 2.0.0)
       term-ansicolor
-      therubyracer (= 0.12.2)
-      uuidtools
-    libv8 (3.16.14.19-x86_64-darwin-16)
-    mini_portile2 (2.0.0)
+    kumogata2-plugin-ruby (0.1.3)
+      dslh (>= 0.3.7)
+      kumogata2
     minitest (5.10.2)
-    net-ssh (4.1.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    rake (11.3.0)
-    ref (2.0.0)
-    retryable (2.0.4)
+    rake (12.0.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
     tins (1.14.0)
-    uuidtools (2.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.11)
+  bundler
   kumogata-template!
-  minitest (~> 5.8)
-  rake (~> 11.1)
+  minitest
+  rake
 
 BUNDLED WITH
-   1.15.0
+   1.15.1

data/README.md

@@ -5,13 +5,10 @@
 
 ## About
 
-- `kumogate-template` is a template sets for [kumogata](https://github.com/winebarrel/kumogata).
+- `kumogate-template` is a template sets for [kumogata2](https://github.com/winebarrel/kumogata2).
 
 ## Installation
 
-Add
-
-
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -124,82 +121,36 @@ EOS
 - more example see [test code](test/template)
 
 
-## Support AWS Resource Types
-
-- AWS::AutoScaling::AutoScalingGroup
-- AWS::AutoScaling::LaunchConfiguration
-- AWS::AutoScaling::LifecycleHook
-- AWS::AutoScaling::ScalingPolicy
-- AWS::AutoScaling::ScheduledAction
-- AWS::CloudTrail::Trail
-- AWS::CodeDeploy::Application
-- AWS::CodeDeploy::DeploymentConfig
-- AWS::CodeDeploy::DeploymentGroup
-- AWS::DataPipeline::Pipeline
-- AWS::DynamoDB::Table
-- AWS::EC2::EIPAssociation
-- AWS::EC2::EIP
-- AWS::EC2::Instance
-- AWS::EC2::InternetGateway
-- AWS::EC2::NatGateway
-- AWS::EC2::NetworkAclEntry
-- AWS::EC2::NetworkAcl
-- AWS::EC2::RouteTable
-- AWS::EC2::Route
-- AWS::EC2::SecurityGroup
-- AWS::EC2::SubnetNetworkAclAssociation
-- AWS::EC2::SubnetRouteTableAssociation
-- AWS::EC2::Subnet
-- AWS::EC2::VolumeAttachment
-- AWS::EC2::VPCEndpoint
-- AWS::EC2::VPCGatewayAttachment
-- AWS::EC2::VPC
-- AWS::ECS::Cluster
-- AWS::ECS::Service
-- AWS::ECS::TaskDefinition
-- AWS::ElastiCache::CacheCluster
-- AWS::ElastiCache::ParameterGroup
-- AWS::ElastiCache::ReplicationGroup
-- AWS::ElastiCache::SubnetGroup
-- AWS::ElasticBeanstalk::ApplicationVersion
-- AWS::ElasticBeanstalk::Application
-- AWS::ElasticBeanstalk::ConfigurationTemplate
-- AWS::ElasticBeanstalk::Environment
-- AWS::ElasticLoadBalancing::LoadBalancer
-- AWS::EMR::Cluster
-- AWS::EMR::InstanceGroupConfig
-- AWS::EMR::Step
-- AWS::Events::Rule
-- AWS::IAM::AccessKey
-- AWS::IAM::Group
-- AWS::IAM::InstanceProfile
-- AWS::IAM::ManagedPolicy
-- AWS::IAM::Policy
-- AWS::IAM::Role
-- AWS::IAM::UserToGroupAddition
-- AWS::IAM::User
-- AWS::Lambda::Alias
-- AWS::Lambda::EventSourceMapping
-- AWS::Lambda::Function
-- AWS::Lambda::Permission
-- AWS::Lambda::Version
-- AWS::RDS::DBClusterParameterGroup
-- AWS::RDS::DBCluster
-- AWS::RDS::DBInstance
-- AWS::RDS::DBParameterGroup
-- AWS::RDS::DBSubnetGroup
-- AWS::RDS::EventSubscription
-- AWS::RDS::OptionGroup
-- AWS::Redshift::ClusterParameterGroup
-- AWS::Redshift::ClusterSubnetGroup
-- AWS::Redshift::Cluster
-- AWS::S3::BucketPolicy
-- AWS::S3::Bucket
-- AWS::SNS::Topic
-- AWS::SQS::Queue
-
-
-## TODO
-
-- Support [Kumogata2](https://github.com/winebarrel/kumogata2)
-- Useful kumogate-template snippets
+## 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::*

data/bin/kumogata-template

@@ -2,8 +2,8 @@
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
 require 'kumogata/template/ext/kumogata'
-require 'kumogata/template/ext/argument_parser'
+require 'kumogata/template/ext/option_parser'
 require 'kumogata/template'
 
 
-load Gem.bin_path('kumogata', 'kumogata')
+load Gem.bin_path('kumogata2', 'kumogata2')

data/kumogata-template.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk', '~> 2.3'
-  spec.add_dependency 'kumogata', '0.5.12'
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 11.1'
-  spec.add_development_dependency 'minitest', '~> 5.8'
+  spec.add_dependency 'kumogata2-plugin-ruby', '0.1.3'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
 end

data/lib/kumogata/template/autoscaling.rb

@@ -43,6 +43,25 @@ def _autoscaling_to_policy(value)
   end
 end
 
+def _autoscaling_to_schedued_recurrence(value)
+  case value
+  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 /\*/
+    value
+  else
+    _timestamp_utc(value, "cron")
+  end
+end
+
 def _autoscaling_metrics
   _{
     Granularity "1Minute"

data/lib/kumogata/template/cloudwatch.rb

@@ -238,15 +238,7 @@ end
 
 def _cloudwatch_to_ec2_action(value)
   value = _valid_values(value, %w( recover stop terminate reboot ), "recover")
-  _{
-    Fn__Join "", [
-                  "arn:aws:automate:",
-                  _{
-                    Ref "AWS::Region"
-                  },
-                  ":ec2:#{value}"
-                 ]
-  }
+  _join([ "arn:aws:automate:", _region, ":ec2:#{value}" ], "")
 end
 
 def _cloudwatch_dimension(args)

data/lib/kumogata/template/const.rb

@@ -95,7 +95,7 @@ EC2_INSTANCE_TYPES =
    # x1.32xlarge  128   1,952      2 x 1,902 SSD    10
    "x1.16xlarge", "x1.32xlarge",
   ]
-EC2_DEFAULT_INSTANCE_TYPE = "t2.medium"
+EC2_DEFAULT_INSTANCE_TYPE = "t2.micro"
 
 ELASTICACHE_DEFAULT_ENGINE = "redis"
 ELASTICACHE_DEFAULT_ENGINE_VERSION = {
@@ -160,10 +160,10 @@ RDS_INSTANCE_CLASSES =
 RDS_DEFAULT_INSTANCE_CLASS = "db.t2.medium"
 RDS_DEFAULT_ENGINE = "mysql"
 RDS_DEFAULT_ENGINE_VERSION = {
-  mysql: "5.7.10",
-  mariadb: "10.0.17",
+  mysql: "5.7.17",
+  mariadb: "10.1.19",
   aurora: "5.6.10a",
-  postgres: "9.4.5",
+  postgres: "9.6.2-R1",
 }
 
 # https://aws.amazon.com/redshift/pricing/
@@ -204,3 +204,21 @@ ELB_ACCESS_LOG_ACCOUNT_ID = {
   "ap-northeast-2": "600734575887",
   "sa-east-1": "507241528517",
 }
+
+# http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html
+ELASTIC_BEANTALK_LINUX = "64bit Amazon Linux 2017.03"
+ELASTIC_BEANTALK_PLATFORM = {
+  packer: "#{ELASTIC_BEANTALK_LINUX} v2.2.0 running Packer 1.0.0",
+  docker: "#{ELASTIC_BEANTALK_LINUX} v2.6.0 running Docker 1.12.6",
+  go: "#{ELASTIC_BEANTALK_LINUX} v2.4.0 running Go 1.7",
+  java: "#{ELASTIC_BEANTALK_LINUX} v2.5.0 running Java 8",
+  java_tomcat: "#{ELASTIC_BEANTALK_LINUX} v2.6.0 running Tomcat 8 Java 8",
+  windows_server: "64bit Windows Server 2012 R2 v1.2.0 running IIS 8.5",
+  node: "#{ELASTIC_BEANTALK_LINUX} v4.1.0 running Node.js",
+  php: "#{ELASTIC_BEANTALK_LINUX} v2.4.0 running PHP 7.0",
+  python: "#{ELASTIC_BEANTALK_LINUX} v2.4.0 running Python 3.4",
+  ruby_puma: "#{ELASTIC_BEANTALK_LINUX} v2.4.0 running Ruby 2.3 (Puma)",
+  ruby_passenger: "#{ELASTIC_BEANTALK_LINUX} v2.4.0 running Ruby 2.3 (Passenger Standalone)",
+}
+
+ELASTIC_BEANTALK_EC2_DEFAULT_ROLE = "aws-elasticbeanstalk-ec2-role"

data/lib/kumogata/template/ec2.rb

@@ -31,6 +31,7 @@ end
 
 def _ec2_security_group_egress(args)
   cidr = args[:cidr] || "0.0.0.0/0"
+  cidr_ipv6 = args[:cidr_ipv6] || ""
   destination = _ref_string("destination", args, "security group")
   from = _ref_string("from", args)
   group = _ref_string("group", args, "security group")
@@ -40,6 +41,7 @@ def _ec2_security_group_egress(args)
 
   _{
     CidrIp cidr if destination.empty?
+    CidrIpv6 cidr_ipv6 unless cidr_ipv6.empty?
     DestinationSecurityGroupId destination unless destination.empty?
     FromPort from unless ip == "icmp"
     GroupId group unless group.empty?
@@ -66,6 +68,7 @@ end
 
 def _ec2_security_group_ingress(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] || ""
@@ -79,6 +82,7 @@ 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?
@@ -153,7 +157,7 @@ def _ec2_image(instance_type, args)
 
   resource_image = _resource_name(args[:image] || EC2_DEFAULT_IMAGE)
   _find_in_map("AWSRegionArch2AMI#{resource_image}",
-               _{ Ref "AWS::Region" },
+               _region,
                _find_in_map("AWSInstanceType2Arch", instance_type, "Arch"))
 end
 
@@ -178,6 +182,17 @@ def _ec2_protocol_number(protocol)
   end
 end
 
+def _ec2_user_data(args)
+  user_data = _ref_string("user_data", args, "user data")
+  return "" if user_data.empty?
+
+  if user_data.is_a? Hash
+    _base64(user_data)
+  else
+    _base64_shell(user_data)
+  end
+end
+
 def _ec2_spot_fleet_request(args)
   allocation = _valid_values(args[:allocation], %w( lowestPrice diversified), "lowestPrice")
   express = _valid_values(args[:express], %w( noTermination default), "")
@@ -225,7 +240,7 @@ def _ec2_spot_fleet_launches(args)
   ram_disk = args[:ram_disk] || ""
   security_groups = _ref_array("security_groups", args, "security group")
   subnet = _ref_string("subnet", args, "subnet")
-  user_data = _ref_string("user_data", args, "user data")
+  user_data = _ec2_user_data(args)
   weighted = args[:weighted] || ""
 
   _{
@@ -246,12 +261,7 @@ def _ec2_spot_fleet_launches(args)
     RamdiskId ram_disk unless ram_disk.empty?
     SecurityGroups security_groups unless security_groups.empty?
     SubnetId subnet unless subnet.empty?
-    UserData do
-      Fn__Base64 (<<-EOS).undent
-#!/bin/bash
-#{user_data}
-EOS
-    end unless user_data.empty?
+    UserData user_data unless user_data.empty?
     WeightedCapacity weighted if args.key? :weighted
   }
 end

data/lib/kumogata/template/ecs.rb

@@ -126,3 +126,37 @@ def _ecs_deployment(args)
     MinimumHealthyPercent args[:min]
   }
 end
+
+def _ecs_placement_definition(args)
+  return "" unless args.key? :placement
+
+  placement = args[:placement]
+  type = _valid_values(placement[:type], %w( distinctInstance memberOf), "distinctInstance")
+  expression = placement[:expression] || ""
+
+  _{
+    Type type
+    Expression expression unless placement.empty?
+  }
+end
+
+def _ecs_placement_service(args)
+  return "" unless args.key? :placement
+
+  placement = args[:placement]
+  type = _valid_values(placement[:type], %w( random spread binpack ), "random")
+  field =
+    case type
+    when "binpack"
+      _valid_values(args[:field], %w( cpu memory ), "cpu")
+    when "spread"
+      args[:field] || ""
+    else
+      ""
+    end
+
+  _{
+    Type type
+    Field field unless field.empty?
+  }
+end