hako 2.15.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1298dda5d9e120f1856ed3a559c520451b1023384d1a56bd921f66c70f6da5
-  data.tar.gz: 833a89a305a9e075df8016e90a7d4ad45f18c29ad208197e3ebdacba5a60848b
+  metadata.gz: 39056ee36a91a2e24c9dc59cfe7e5a0fef62c55578c31cf6aa2243d29d89ca8e
+  data.tar.gz: ca5ecea7f27470068cf6d69d925363fa43dfcde5bba28764e51df11e9e57cfb2
 SHA512:
-  metadata.gz: bfba96a068f38a760e7760188574e7b5afe2dd5400ce745905f3611f71fe18f87d2cbe446878c2d00ee55e56b423ac0185baa96c91737b10847f3f77442d5035
-  data.tar.gz: cfa5202766106d88e125cba58011fcccff3954a843c2fdc56a301e62d476239b1ae955b627de3dfbcf185e08bfb721418669c6f86548f68d55765f164e969e56
+  metadata.gz: 99c17719f1f60db1bd9c5413f6cb02005464f90bda67f5f543b6537d71796f0fe8ea9e32a267bf1000bcc48e1b98ef03c03cf4a0878cc1d8b2107e9fb405b362
+  data.tar.gz: 23f57698cb4d2cdf7fd59bed1c25977fefbea9868fcbd4179d860729ca0ebf372d177dd8d25d5205e6814b7edd77450837054da96d232f8844c604e743324264

data/.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  push:
+    branches:
+  pull_request:
+
+jobs:
+  rspec:
+    name: RSpec
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec
+  rubocop:
+    name: RuboCop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          # Use the same version with .rubocop.yml
+          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:
@@ -36,6 +36,8 @@ Style/PercentLiteralDelimiters:
     '%i': '[]'
 Style/RaiseArgs:
   EnforcedStyle: compact
+Style/RedundantCondition:
+  Enabled: false
 Style/SignalException:
   Enabled: false
 Style/SoleNestedConditional:

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 2.17.0 (2022-05-31)
+## New features
+- Support runtime_platform option
+
+# 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
+
 # 2.15.0 (2020-11-02)
 ## New features
 - Support protocol_version and matcher option of ALB target groups

data/README.md

@@ -1,6 +1,6 @@
 # Hako
 [![Gem Version](https://badge.fury.io/rb/hako.svg)](http://badge.fury.io/rb/hako)
-[![Build Status](https://travis-ci.org/eagletmt/hako.svg)](https://travis-ci.org/eagletmt/hako)
+![CI](https://github.com/eagletmt/hako/workflows/CI/badge.svg)
 
 Deploy Docker container.
 

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'
@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'jsonnet'
 
   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.53.0'

data/lib/hako/cli.rb

@@ -73,7 +73,7 @@ module Hako
           else
             {}
           end
-        Commander.new(Application.new(@definition_path, options)).deploy(force: @force, tag: @tag, dry_run: @dry_run, timeout: @timeout)
+        Commander.new(Application.new(@definition_path, **options)).deploy(force: @force, tag: @tag, dry_run: @dry_run, timeout: @timeout)
       end
 
       DEFAULT_TIMEOUT = 1200 # 20 minutes
@@ -121,7 +121,7 @@ module Hako
           else
             {}
           end
-        Commander.new(Application.new(@definition_path, options)).rollback(dry_run: @dry_run)
+        Commander.new(Application.new(@definition_path, **options)).rollback(dry_run: @dry_run)
       end
 
       def parse!(argv)
@@ -164,7 +164,7 @@ module Hako
           else
             {}
           end
-        Commander.new(Application.new(@definition_path, options)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait, overrides: @overrides)
+        Commander.new(Application.new(@definition_path, **options)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait, overrides: @overrides)
       end
 
       def parse!(argv)

data/lib/hako/schedulers/ecs.rb

@@ -72,7 +72,22 @@ 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)
+        if options.key?('runtime_platform')
+          runtime_platform = options.fetch('runtime_platform')
+          @runtime_platform = {
+            cpu_architecture: runtime_platform.fetch('cpu_architecture', nil),
+            operating_system_family: runtime_platform.fetch('operating_system_family', nil),
+          }
+        end
         @launch_type = options.fetch('launch_type', nil)
         if options.key?('capacity_provider_strategy')
           @capacity_provider_strategy = options.fetch('capacity_provider_strategy').map do |strategy|
@@ -515,6 +530,12 @@ module Hako
         if actual_definition.requires_compatibilities != @requires_compatibilities
           return true
         end
+        if actual_definition.runtime_platform != @runtime_platform
+          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)
@@ -555,8 +576,10 @@ module Hako
             container_definitions: definitions,
             volumes: volumes_definition,
             requires_compatibilities: @requires_compatibilities,
+            runtime_platform: @runtime_platform,
             cpu: @cpu,
             memory: @memory,
+            ephemeral_storage: @ephemeral_storage,
             tags: @tags.empty? ? nil : @tags,
           ).task_definition
           [true, new_task_definition]
@@ -591,8 +614,10 @@ module Hako
               container_definitions: definitions,
               volumes: volumes_definition,
               requires_compatibilities: @requires_compatibilities,
+              runtime_platform: @runtime_platform,
               cpu: @cpu,
               memory: @memory,
+              ephemeral_storage: @ephemeral_storage,
               tags: @tags.empty? ? nil : @tags,
             ).task_definition
             return [true, new_task_definition]
@@ -916,7 +941,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 +977,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 +1347,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.0'
+  VERSION = '2.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.17.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -206,20 +206,6 @@ 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
@@ -298,11 +284,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -391,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.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Deploy Docker container

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head