hako 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e670cdac7ce5a24b4d82bc026eceaa8068b6422f
-  data.tar.gz: 6b5a6ca2de09ae0a680e4ff1de903798cb04c78d
+  metadata.gz: df6d36f3dcad17f7d794bb91775db9f74fb96c70
+  data.tar.gz: 3eaaf846fbb6306ef95235f5092c27f33bd94dcf
 SHA512:
-  metadata.gz: 2ca1d9c75bbc08407d04f1dbc510f695c24b84fb45b8ea03bd56562d7049e010f214dbc8514f413350a880892fbad2f6780ae368cff1e7e4491177c763b6d0cd
-  data.tar.gz: 6871ae244cf85ac56ff6256fbe6799b1f39540f9823a1288e97b9c67bda32301c32829ecd7cb9b06ebbc0b5dca1df0b86d4b5df48abba4f351a2f92c5b078a5a
+  metadata.gz: 2fb9a1d911b4c3a02693f6204bfeb1a66e0ed4655ff6aff36aafb08e0c69a9cf21e8343306faa6ff0952b313e37abc28aaf000678309ad20e16fd5c1f863538a
+  data.tar.gz: 32fb06237271a486c2d41fbdd5a2de64128418833ff6c6d82dab560a8f8ae8f273661687bd82552ee922ed0c35bf7b5ba0c1a9ec4bd4b635a4437c58ab1f21d9

data/.rubocop.yml

@@ -7,6 +7,9 @@ AllCops:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
+Style/FirstParameterIndentation:
+  Enabled: false
+
 Style/GuardClause:
   Enabled: false
 

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.3
-  - 2.4.0
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 before_install:
   - gem update --system # https://github.com/rubygems/rubygems/pull/1819

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.0 (2017-05-25)
+## New features
+- Support `ulimits` option
+
 # 1.3.3 (2017-05-23)
 ## Bug fixes
 - Fix error of autoscaling for oneshot when container instances are empty

data/hako.gemspec

@@ -23,8 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk', '>= 2.6.43'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '>= 0.36.0'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'yard'
 end

data/lib/hako/container.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'hako/env_expander'
 require 'hako/version'
 
 module Hako
@@ -86,6 +87,19 @@ module Hako
       end
     end
 
+    # @return [Array<Hash>, nil]
+    def ulimits
+      if @definition.key?('ulimits')
+        @definition['ulimits'].map do |ulimit|
+          {
+            name: ulimit.fetch('name'),
+            soft_limit: ulimit.fetch('soft_limit'),
+            hard_limit: ulimit.fetch('hard_limit'),
+          }
+        end
+      end
+    end
+
     private
 
     PROVIDERS_KEY = '$providers'

data/lib/hako/schedulers/ecs.rb

@@ -357,7 +357,7 @@ module Hako
         if @force
           return true
         end
-        if !actual_definition
+        unless actual_definition
           # Initial deployment
           return true
         end
@@ -486,6 +486,7 @@ module Hako
           volumes_from: container.volumes_from,
           user: container.user,
           log_configuration: container.log_configuration,
+          ulimits: container.ulimits,
         }
       end
 

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -35,6 +35,7 @@ module Hako
           struct.member(:user, Schema::Nullable.new(Schema::String.new))
           struct.member(:privileged, Schema::Boolean.new)
           struct.member(:log_configuration, Schema::Nullable.new(log_configuration_schema))
+          struct.member(:ulimits, Schema::Nullable.new(ulimits_chema))
         end
       end
 
@@ -74,6 +75,18 @@ module Hako
           struct.member(:options, Schema::Table.new(Schema::String.new, Schema::String.new))
         end
       end
+
+      def ulimits_chema
+        Schema::UnorderedArray.new(ulimit_schema)
+      end
+
+      def ulimit_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:name, Schema::String.new)
+          struct.member(:hard_limit, Schema::Integer.new)
+          struct.member(:soft_limit, Schema::Integer.new)
+        end
+      end
     end
   end
 end

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -12,7 +12,7 @@ module Hako
       # @param [Boolean] dry_run
       def initialize(app_id, region, elb_v2_config, dry_run:)
         @app_id = app_id
-        @elb_v2 = Aws::ElasticLoadBalancingV2::Client.new(region: region)
+        @region = region
         @elb_v2_config = elb_v2_config
         @dry_run = dry_run
       end
@@ -21,7 +21,7 @@ module Hako
       # @return [nil]
       def show_status(ecs_lb)
         lb = describe_load_balancer
-        @elb_v2.describe_listeners(load_balancer_arn: lb.load_balancer_arn).each do |page|
+        elb_client.describe_listeners(load_balancer_arn: lb.load_balancer_arn).each do |page|
           page.listeners.each do |listener|
             puts "  #{lb.dns_name}:#{listener.port} -> #{ecs_lb.container_name}:#{ecs_lb.container_port}"
           end
@@ -30,14 +30,14 @@ module Hako
 
       # @return [Aws::ElasticLoadBalancingV2::Types::LoadBalancer]
       def describe_load_balancer
-        @elb_v2.describe_load_balancers(names: [name]).load_balancers[0]
+        elb_client.describe_load_balancers(names: [name]).load_balancers[0]
       rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
         nil
       end
 
       # @return [Aws::ElasticLoadBalancingV2::Types::TargetGroup]
       def describe_target_group
-        @elb_v2.describe_target_groups(names: [name]).target_groups[0]
+        elb_client.describe_target_groups(names: [name]).target_groups[0]
       rescue Aws::ElasticLoadBalancingV2::Errors::TargetGroupNotFound
         nil
       end
@@ -52,7 +52,7 @@ module Hako
         load_balancer = describe_load_balancer
         unless load_balancer
           tags = @elb_v2_config.fetch('tags', {}).map { |k, v| { key: k, value: v.to_s } }
-          load_balancer = @elb_v2.create_load_balancer(
+          load_balancer = elb_client.create_load_balancer(
             name: name,
             subnets: @elb_v2_config.fetch('subnets'),
             security_groups: @elb_v2_config.fetch('security_groups'),
@@ -64,7 +64,7 @@ module Hako
 
         target_group = describe_target_group
         unless target_group
-          target_group = @elb_v2.create_target_group(
+          target_group = elb_client.create_target_group(
             name: name,
             port: 80,
             protocol: 'HTTP',
@@ -74,7 +74,7 @@ module Hako
           Hako.logger.info "Created target group #{target_group.target_group_arn}"
         end
 
-        listener_ports = @elb_v2.describe_listeners(load_balancer_arn: load_balancer.load_balancer_arn).flat_map { |page| page.listeners.map(&:port) }
+        listener_ports = elb_client.describe_listeners(load_balancer_arn: load_balancer.load_balancer_arn).flat_map { |page| page.listeners.map(&:port) }
         @elb_v2_config.fetch('listeners').each do |l|
           params = {
             load_balancer_arn: load_balancer.load_balancer_arn,
@@ -88,7 +88,7 @@ module Hako
           end
 
           unless listener_ports.include?(params[:port])
-            listener = @elb_v2.create_listener(params).listeners[0]
+            listener = elb_client.create_listener(params).listeners[0]
             Hako.logger.info("Created listener #{listener.listener_arn}")
           end
         end
@@ -110,9 +110,9 @@ module Hako
         load_balancer = describe_load_balancer
         if load_balancer
           if @dry_run
-            Hako.logger.info("@elb_v2.delete_load_balancer(load_balancer_arn: #{load_balancer.load_balancer_arn})")
+            Hako.logger.info("elb_client.delete_load_balancer(load_balancer_arn: #{load_balancer.load_balancer_arn})")
           else
-            @elb_v2.delete_load_balancer(load_balancer_arn: load_balancer.load_balancer_arn)
+            elb_client.delete_load_balancer(load_balancer_arn: load_balancer.load_balancer_arn)
             Hako.logger.info "Deleted ELBv2 #{load_balancer.load_balancer_arn}"
           end
         else
@@ -122,9 +122,9 @@ module Hako
         target_group = describe_target_group
         if target_group
           if @dry_run
-            Hako.logger.info("@elb_v2.delete_target_group(target_group_arn: #{target_group.target_group_arn})")
+            Hako.logger.info("elb_client.delete_target_group(target_group_arn: #{target_group.target_group_arn})")
           else
-            @elb_v2.delete_target_group(target_group_arn: target_group.target_group_arn)
+            elb_client.delete_target_group(target_group_arn: target_group.target_group_arn)
             Hako.logger.info "Deleted target group #{target_group.target_group_arn}"
           end
         end
@@ -139,6 +139,12 @@ module Hako
       def load_balancer_params_for_service
         { target_group_arn: describe_target_group.target_group_arn }
       end
+
+      private
+
+      def elb_client
+        @elb_v2 ||= Aws::ElasticLoadBalancingV2::Client.new(region: @region)
+      end
     end
   end
 end

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.36.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement