hako 2.15.1 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c14a60c35c89be5465d9844da304c8dad15dce069edf54ccbba7f47376dc536
-  data.tar.gz: c9714116d65bc4d3746cbc968a0bd0315cd3677d3e5042e0937e4cfd29a48620
+  metadata.gz: 247a60cab9d7f9bec3f63bb9858453499066c9b54d23ce9f1d8bae69c133973a
+  data.tar.gz: c004ff0c4aac3d742f89f4eeb455ff189acebabc0d398dc586eb835902129577
 SHA512:
-  metadata.gz: 12f663b6e4c17872e8d117f0a5fb4049b786e4af0e76ac7ff0b0d9bcb490299da15c0bc24a86a8a16a7d286585e9b428b68eba6121ed0212d353027db049cbe9
-  data.tar.gz: ee0bc9a4692583f332ac08060088f3e5374fd2297d6c54b9208ec529a813413ee11f3847788b32aa43f5c1d7b40814889de86b9290c4000707060ea51a68e8cb
+  metadata.gz: c3a12ca201d09312f3c71e18e7418941aaf9330ad99d7acccb32094f0579d3085817004cea7209691d43a4f00f3181c242fbe452cc856ae9aad723bbf05d829b
+  data.tar.gz: a110da777e6ab79a3af3a3ebd6d6923e2428b59947208ad0bf771577bb45fb775ccbe723d0377d32e6b3df52419914e60ff1681a574db304763f11d13c3b6bf4

data/.github/workflows/ci.yml

@@ -3,25 +3,20 @@ name: CI
 on:
   push:
     branches:
-    pull_request:
+  pull_request:
 
 jobs:
   rspec:
     name: RSpec
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
-          - 3.0
-        experimental: [false]
-        include:
-          - ruby: head
-            experimental: true
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
@@ -37,6 +32,6 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           # Use the same version with .rubocop.yml
-          ruby-version: 2.5
+          ruby-version: 2.6
           bundler-cache: true
       - run: bundle exec rubocop

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   NewCops: disable
 
 Layout/FirstArgumentIndentation:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.16.0 (2022-05-02)
+## New features
+- Support ephemeral_storage option in ECS scheduler
+
+## Bug fixes
+- Fix keyword arguments for Ruby 3.0
+
+## Changes
+- Drop support for Ruby 2.5 (EOL on 2021-04-05)
+
 # 2.15.1 (2021-08-06)
 ## Bug fixes
 - Fix keyword arguments for Ruby 3.0

data/examples/hello-fargate-batch.jsonnet

@@ -7,6 +7,9 @@
     execution_role_arn: 'arn:aws:iam::012345678901:role/ecsTaskExecutionRole',
     cpu: '1024',
     memory: '2048',
+    ephemeral_storage: {
+      size_in_gi_b: '25',
+    },
     requires_compatibilities: ['FARGATE'],
     network_mode: 'awsvpc',
     launch_type: 'FARGATE',

data/examples/hello-fargate.jsonnet

@@ -51,6 +51,9 @@ local awslogs = {
     execution_role_arn: 'arn:aws:iam::012345678901:role/ecsTaskExecutionRole',
     cpu: '1024',
     memory: '2048',
+    ephemeral_storage: {
+      size_in_gi_b: '25',
+    },
     requires_compatibilities: ['FARGATE'],
     network_mode: 'awsvpc',
     launch_type: 'FARGATE',

data/hako.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'aws-sdk-applicationautoscaling'
   spec.add_dependency 'aws-sdk-autoscaling'

data/lib/hako/schedulers/ecs.rb

@@ -72,6 +72,14 @@ module Hako
         @execution_role_arn = options.fetch('execution_role_arn', nil)
         @cpu = options.fetch('cpu', nil)
         @memory = options.fetch('memory', nil)
+        if options.key?('ephemeral_storage')
+          ephemeral_storage = options.fetch('ephemeral_storage')
+          if ephemeral_storage.key?('size_in_gi_b')
+            @ephemeral_storage = {
+              size_in_gi_b: ephemeral_storage.fetch('size_in_gi_b')
+            }
+          end
+        end
         @requires_compatibilities = options.fetch('requires_compatibilities', nil)
         @launch_type = options.fetch('launch_type', nil)
         if options.key?('capacity_provider_strategy')
@@ -515,6 +523,9 @@ module Hako
         if actual_definition.requires_compatibilities != @requires_compatibilities
           return true
         end
+        if actual_definition.ephemeral_storage != @ephemeral_storage
+          return true
+        end
 
         actual_tags_set = Set.new(actual_tags.map { |t| { key: t.key, value: t.value } })
         tags_set = Set.new(@tags)
@@ -557,6 +568,7 @@ module Hako
             requires_compatibilities: @requires_compatibilities,
             cpu: @cpu,
             memory: @memory,
+            ephemeral_storage: @ephemeral_storage,
             tags: @tags.empty? ? nil : @tags,
           ).task_definition
           [true, new_task_definition]
@@ -593,6 +605,7 @@ module Hako
               requires_compatibilities: @requires_compatibilities,
               cpu: @cpu,
               memory: @memory,
+              ephemeral_storage: @ephemeral_storage,
               tags: @tags.empty? ? nil : @tags,
             ).task_definition
             return [true, new_task_definition]
@@ -916,7 +929,7 @@ module Hako
         warn_placement_policy_change(current_service)
         warn_service_registries_change(current_service)
         if service_changed?(current_service, params)
-          ecs_client.update_service(params).service
+          ecs_client.update_service(**params).service
         else
           :noop
         end
@@ -952,7 +965,7 @@ module Hako
           @service_discovery.apply
           params[:service_registries] = @service_discovery.service_registries
         end
-        ecs_client.create_service(params).service
+        ecs_client.create_service(**params).service
       end
 
       # @param [Aws::ECS::Types::Service] service
@@ -1322,7 +1335,7 @@ module Hako
             when 'NONE'
               cmd << '--no-healthcheck'
             when 'CMD', 'CMD-SHELL'
-              health_check_command = definition[:health_check][:command][1..-1].join(' ')
+              health_check_command = definition[:health_check][:command][1..].join(' ')
               cmd << '--health-cmd' << health_check_command.inspect
             else
               raise "Health check command type #{health_check_command_type} is not supported. CMD, CMD-SHELL and NONE are supported."

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -127,7 +127,7 @@ module Hako
             end
 
             unless listener_ports.include?(params[:port])
-              listener = elb_client.create_listener(params).listeners[0]
+              listener = elb_client.create_listener(**params).listeners[0]
               Hako.logger.info("Created listener #{listener.listener_arn}")
             end
           end

data/lib/hako/schedulers/ecs_service_discovery.rb

@@ -134,7 +134,7 @@ module Hako
             condition: 'EQ',
           ],
         }
-        services = service_discovery_client.list_services(params).flat_map(&:services)
+        services = service_discovery_client.list_services(**params).flat_map(&:services)
         services.find { |service| service.name == service_name }
       end
 
@@ -146,7 +146,7 @@ module Hako
       # @param [Hash] service
       # @return [Aws::ServiceDiscovery::Types::Service]
       def create_service(service)
-        service_discovery_client.create_service(create_service_params(service)).service
+        service_discovery_client.create_service(**create_service_params(service)).service
       end
 
       # @param [Hash] service

data/lib/hako/scripts/nginx_front.rb

@@ -107,7 +107,7 @@ module Hako
 
         # @return [String]
         def render
-          ERB.new(File.read(nginx_conf_erb), nil, '-').result(binding)
+          ERB.new(File.read(nginx_conf_erb), trim_mode: '-').result(binding)
         end
 
         private
@@ -150,7 +150,7 @@ module Hako
         # @param [Location] location
         # @return [String]
         def render_location(listen_spec, location)
-          ERB.new(File.read(nginx_location_conf_erb), nil, '-').result(binding).each_line.map do |line|
+          ERB.new(File.read(nginx_location_conf_erb), trim_mode: '-').result(binding).each_line.map do |line|
             "    #{line}"
           end.join('')
         end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -377,14 +377,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: Deploy Docker container