hako 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef02b44439fedefe65ec80e5af6d296bc735817dc271b9129b96abb8448ee6e
-  data.tar.gz: 382a1d4dc73953bd345a66e8c79ce1733fb1c7a926d9306feda1673bd1cd933d
+  metadata.gz: 1c1298dda5d9e120f1856ed3a559c520451b1023384d1a56bd921f66c70f6da5
+  data.tar.gz: 833a89a305a9e075df8016e90a7d4ad45f18c29ad208197e3ebdacba5a60848b
 SHA512:
-  metadata.gz: a253c0e8147b6c00372ee07376397a29b2f8df83abeaafed018a352a99261ac3f161cee579225e314d3a01dd6582216ba31c5b5f773fb5485ab112a5420d78fb
-  data.tar.gz: 17cc31d59e1e53819eb1c47f8c78159d7a86c5bef6fc7e970a9d133fc4852afa02094c3ea4607dea8bd29b347691ab19ec45ff4cd26a1ba06cc33e69df934034
+  metadata.gz: bfba96a068f38a760e7760188574e7b5afe2dd5400ce745905f3611f71fe18f87d2cbe446878c2d00ee55e56b423ac0185baa96c91737b10847f3f77442d5035
+  data.tar.gz: cfa5202766106d88e125cba58011fcccff3954a843c2fdc56a301e62d476239b1ae955b627de3dfbcf185e08bfb721418669c6f86548f68d55765f164e969e56

data/.rubocop.yml

@@ -2,10 +2,13 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
+  NewCops: disable
 
 Layout/FirstArgumentIndentation:
   Enabled: false
+Layout/LineLength:
+  Enabled: false
 
 Naming/PredicateName:
   Enabled: false
@@ -35,6 +38,8 @@ Style/RaiseArgs:
   EnforcedStyle: compact
 Style/SignalException:
   Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
 Style/StderrPuts:
   Enabled: false
 Style/TrailingCommaInArguments:

data/.rubocop_todo.yml

@@ -6,8 +6,6 @@ Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ParameterLists:

data/.travis.yml

@@ -1,14 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - ruby-head
-before_install:
-  - gem update --system # https://github.com/rubygems/rubygems/pull/1819
-  - gem install bundler
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.15.0 (2020-11-02)
+## New features
+- Support protocol_version and matcher option of ALB target groups
+
 # 2.14.0 (2020-05-20)
 ## New features
 - Support tags for task definition and propagate them to ECS tasks

data/examples/hello-grpc.jsonnet

@@ -0,0 +1,60 @@
+{
+  scheduler: {
+    type: 'ecs',
+    region: 'ap-northeast-1',
+    cluster: 'eagletmt',
+    desired_count: 2,
+    role: 'ecsServiceRole',
+    elb_v2: {
+      // Specify protocol_version for gRPC servers
+      protocol_version: 'GRPC',
+      // VPC id where the target group is located
+      vpc_id: 'vpc-WWWWWWWW',
+      // If you want internal ELB, then use 'scheme'. (ex. internal service that like microservice inside VPC)
+      scheme: 'internal',
+      // Health check path of the target group
+      health_check_path: '/AWS.ELB/healthcheck',
+      listeners: [
+        {
+          port: 50051,
+          protocol: 'HTTPS',
+          certificate_arn: 'arn:aws:acm:ap-northeast-1:012345678901:certificate/01234567-89ab-cdef-0123-456789abcdef',
+        },
+      ],
+      subnets: ['subnet-XXXXXXXX', 'subnet-YYYYYYYY'],
+      security_groups: ['sg-ZZZZZZZZ'],
+      load_balancer_attributes: {
+        'access_logs.s3.enabled': 'true',
+        'access_logs.s3.bucket': 'hako-access-logs',
+        'access_logs.s3.prefix': 'hako-hello-grpc',
+      },
+      target_group_attributes: {
+        // http://docs.aws.amazon.com/en_us/elasticloadbalancing/latest/application/load-balancer-target-groups.html#target-group-attributes
+        'deregistration_delay.timeout_seconds': '20',
+      },
+      // Route ELB traffic to app container directly
+      container_name: 'app',
+      container: 50051,
+    },
+  },
+  app: {
+    image: 'awesome-grpc-server',
+    memory: 128,
+    cpu: 256,
+    env: {
+      PORT: '50051',
+    },
+    secrets: [{
+      name: 'MESSAGE',
+      value_from: 'arn:aws:ssm:ap-northeast-1:012345678901:parameter/hako/hello-grpc/secret-message',
+    }],
+    port_mappings: [
+      {
+        container_port: 50051,
+        host_port: 0,
+        protocol: 'tcp',
+      },
+    ],
+  },
+  scripts: [],
+}

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.3.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_dependency 'aws-sdk-applicationautoscaling'
   spec.add_dependency 'aws-sdk-autoscaling'
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-ec2'
   spec.add_dependency 'aws-sdk-ecs', '>= 1.54.0'
   spec.add_dependency 'aws-sdk-elasticloadbalancing'
-  spec.add_dependency 'aws-sdk-elasticloadbalancingv2'
+  spec.add_dependency 'aws-sdk-elasticloadbalancingv2', '>= 1.54.0'
   spec.add_dependency 'aws-sdk-s3'
   spec.add_dependency 'aws-sdk-servicediscovery'
   spec.add_dependency 'aws-sdk-sns'

data/lib/hako/commander.rb

@@ -18,7 +18,7 @@ module Hako
     # @param [String, nil] tag
     # @param [Boolean] dry_run
     # @return [nil]
-    def deploy(force: false, tag:, dry_run: false, timeout:)
+    def deploy(tag:, timeout:, force: false, dry_run: false)
       containers = load_containers(tag, dry_run: dry_run)
       scripts = @app.definition.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
       volumes = @app.definition.fetch('volumes', {})
@@ -126,7 +126,7 @@ module Hako
     # @param [Boolean] dry_run
     # @param [Integer] timeout
     # @return [Scheduler]
-    def load_scheduler(scheduler_definition, scripts, volumes: {}, force: false, dry_run:, timeout: nil)
+    def load_scheduler(scheduler_definition, scripts, dry_run:, volumes: {}, force: false, timeout: nil)
       Loader.new(Hako::Schedulers, 'hako/schedulers').load(scheduler_definition.fetch('type')).new(@app.id, scheduler_definition, volumes: volumes, scripts: scripts, force: force, dry_run: dry_run, timeout: timeout)
     end
 

data/lib/hako/env_providers/file.rb

@@ -7,7 +7,7 @@ module Hako
     class File < EnvProvider
       # @param [Pathname] root_path
       # @param [Hash<String, Object>] options
-      def initialize(root_path, options)
+      def initialize(root_path, options) # rubocop:disable Lint/MissingSuper
         unless options['path']
           validation_error!('path must be set')
         end

data/lib/hako/env_providers/yaml.rb

@@ -8,7 +8,7 @@ module Hako
     class Yaml < EnvProvider
       # @param [Pathname] root_path
       # @param [Hash<String, Object>] options
-      def initialize(root_path, options)
+      def initialize(root_path, options) # rubocop:disable Lint/MissingSuper
         unless options['path']
           validation_error!('path must be set')
         end

data/lib/hako/schedulers/ecs.rb

@@ -515,7 +515,8 @@ module Hako
         if actual_definition.requires_compatibilities != @requires_compatibilities
           return true
         end
-        actual_tags_set = Set.new(actual_tags.map { |t| {key: t.key, value: t.value } })
+
+        actual_tags_set = Set.new(actual_tags.map { |t| { key: t.key, value: t.value } })
         tags_set = Set.new(@tags)
         if actual_tags_set != tags_set
           return true
@@ -576,38 +577,36 @@ module Hako
       # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition]
       def register_task_definition_for_oneshot(definitions)
         10.times do |i|
-          begin
-            family = "#{@app_id}-oneshot"
-            current_task_definition = describe_task_definition(family)
-            if current_task_definition
-              current_tags = ecs_client.list_tags_for_resource(resource_arn: current_task_definition.task_definition_arn).tags
-            end
-            if task_definition_changed?(definitions, current_task_definition, current_tags)
-              new_task_definition = ecs_client.register_task_definition(
-                family: family,
-                task_role_arn: @task_role_arn,
-                execution_role_arn: @execution_role_arn,
-                network_mode: @network_mode,
-                container_definitions: definitions,
-                volumes: volumes_definition,
-                requires_compatibilities: @requires_compatibilities,
-                cpu: @cpu,
-                memory: @memory,
-                tags: @tags.empty? ? nil : @tags,
-              ).task_definition
-              return [true, new_task_definition]
-            else
-              return [false, current_task_definition]
-            end
-          rescue Aws::ECS::Errors::ClientException => e
-            if e.message.include?('Too many concurrent attempts to create a new revision of the specified family')
-              Hako.logger.error(e.message)
-              interval = 2**i + rand(0.0..10.0)
-              Hako.logger.error("Retrying register_task_definition_for_oneshot after #{interval} seconds")
-              sleep(interval)
-            else
-              raise e
-            end
+          family = "#{@app_id}-oneshot"
+          current_task_definition = describe_task_definition(family)
+          if current_task_definition
+            current_tags = ecs_client.list_tags_for_resource(resource_arn: current_task_definition.task_definition_arn).tags
+          end
+          if task_definition_changed?(definitions, current_task_definition, current_tags)
+            new_task_definition = ecs_client.register_task_definition(
+              family: family,
+              task_role_arn: @task_role_arn,
+              execution_role_arn: @execution_role_arn,
+              network_mode: @network_mode,
+              container_definitions: definitions,
+              volumes: volumes_definition,
+              requires_compatibilities: @requires_compatibilities,
+              cpu: @cpu,
+              memory: @memory,
+              tags: @tags.empty? ? nil : @tags,
+            ).task_definition
+            return [true, new_task_definition]
+          else
+            return [false, current_task_definition]
+          end
+        rescue Aws::ECS::Errors::ClientException => e
+          if e.message.include?('Too many concurrent attempts to create a new revision of the specified family')
+            Hako.logger.error(e.message)
+            interval = 2**i + rand(0.0..10.0)
+            Hako.logger.error("Retrying register_task_definition_for_oneshot after #{interval} seconds")
+            sleep(interval)
+          else
+            raise e
           end
         end
         raise Error.new('Unable to register task definition for oneshot due to too many client errors')

data/lib/hako/schedulers/ecs_autoscaling.rb

@@ -162,9 +162,7 @@ module Hako
       end
 
       class Policy
-        attr_reader :policy_type
-        attr_reader :alarms, :cooldown, :adjustment_type, :scaling_adjustment, :metric_interval_lower_bound, :metric_interval_upper_bound, :metric_aggregation_type
-        attr_reader :target_value, :predefined_metric_type, :scale_out_cooldown, :scale_in_cooldown, :disable_scale_in
+        attr_reader :policy_type, :alarms, :cooldown, :adjustment_type, :scaling_adjustment, :metric_interval_lower_bound, :metric_interval_upper_bound, :metric_aggregation_type, :target_value, :predefined_metric_type, :scale_out_cooldown, :scale_in_cooldown, :disable_scale_in
 
         # @param [Hash] options
         def initialize(options)

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -89,13 +89,22 @@ module Hako
                              target_type: @elb_v2_config.fetch('target_type', nil),
                            ).target_groups[0]
                          else
+                           matcher =
+                             if @elb_v2_config.key?('matcher')
+                               {
+                                 http_code: @elb_v2_config.fetch('matcher')['http_code'],
+                                 grpc_code: @elb_v2_config.fetch('matcher')['grpc_code'],
+                               }
+                             end
                            elb_client.create_target_group(
                              name: target_group_name,
                              port: 80,
                              protocol: 'HTTP',
+                             protocol_version: @elb_v2_config.fetch('protocol_version', 'HTTP1'),
                              vpc_id: @elb_v2_config.fetch('vpc_id'),
                              health_check_path: @elb_v2_config.fetch('health_check_path', nil),
                              target_type: @elb_v2_config.fetch('target_type', nil),
+                             matcher: matcher,
                            ).target_groups[0]
                          end
 

data/lib/hako/scripts/nginx_front.rb

@@ -10,7 +10,7 @@ module Hako
     class NginxFront < Script
       S3Config = Struct.new(:region, :bucket, :prefix) do
         # @param [Hash] options
-        def initialize(options)
+        def initialize(options) # rubocop:disable Lint/MissingSuper
           self.region = options.fetch('region')
           self.bucket = options.fetch('bucket')
           self.prefix = options.fetch('prefix', nil)

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Kohei Suzuki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.54.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +321,7 @@ files:
 - examples/hello-cap-add-app.jsonnet
 - examples/hello-fargate-batch.jsonnet
 - examples/hello-fargate.jsonnet
+- examples/hello-grpc.jsonnet
 - examples/hello-internal-nlb.jsonnet
 - examples/hello-lb-v2.jsonnet
 - examples/hello-lb.jsonnet
@@ -382,7 +383,7 @@ homepage: https://github.com/eagletmt/hako
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -390,15 +391,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Deploy Docker container
 test_files: []