hako 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a138ad34e8358e637424783db88022f2b3018fdd
-  data.tar.gz: 26643b7c4701669d9014cc15e0c9efaa6c6d4911
+  metadata.gz: b994047cb6fcb14d8748fe5966480737e35d29ac
+  data.tar.gz: 71d27d9b3e3e36d2b623a73452d06e9ef12e36a5
 SHA512:
-  metadata.gz: 6ac024fb63476147ae026c12af7a60af5677e7c2978c5d7a42051fccd34e6a09da751ead807072f4ddf3891271e69849ea33187b01da86a9d88abb89dc5f3daa
-  data.tar.gz: 933b38fb37e3d364a835285903b470656e7fecbb6ea5d9dc7cb36807a93fe8350ec56e1243e142a4c1c54c2951adce03710c1216ed0a93f7f66860c06e5aa303
+  metadata.gz: bb8cdd9a3ed51cce575782d30811bd78858e4cde9f00d7cd56fe0ee66246e490e1d386c47a217457221339b31c98f8370154b7e05e9e3412b0538398d8e6c5b9
+  data.tar.gz: caa93254187ecec7f652a3d80a0d0b3cfbfac0b9e8079b86559e6db4b89503e5ea5b09612356de174f0891c40d4364e621ed159f4fdcfa274c36d2c43b419d7c

data/examples/hello-awslogs-driver.yml

@@ -0,0 +1,16 @@
+scheduler:
+  type: ecs
+  region: ap-northeast-1
+  cluster: eagletmt
+  desired_count: 1
+app:
+  image: busybox
+  memory: 128
+  cpu: 256
+  command: ['echo', 'hello awslogs']
+  log_configuration:
+    log_driver: awslogs
+    options:
+      awslogs-group: my-logs
+      awslogs-region: ap-northeast-1
+      awslogs-stream-prefix: example

data/examples/hello.yml

@@ -6,6 +6,9 @@ scheduler:
   task_role_arn: arn:aws:iam::012345678901:role/HelloRole
   # dynamic_port_mapping is enabled by default with no ELB option
   # dynamic_port_mapping: false
+  deployment_configuration:
+    maximum_percent: 200
+    minimum_healthy_percent: 50
 app:
   image: ryotarai/hello-sinatra
   memory: 128

data/lib/hako/container.rb

@@ -63,6 +63,17 @@ module Hako
       end
     end
 
+    # @return [Hash, nil]
+    def log_configuration
+      if @definition.key?('log_configuration')
+        conf = @definition['log_configuration']
+        {
+          log_driver: conf.fetch('log_driver'),
+          options: conf.fetch('options'),
+        }
+      end
+    end
+
     private
 
     PROVIDERS_KEY = '$providers'

data/lib/hako/env_providers/yaml.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+require 'hako/env_provider'
+require 'yaml'
+
+module Hako
+  module EnvProviders
+    class Yaml < EnvProvider
+      # @param [Pathname] root_path
+      # @param [Hash<String, Object>] options
+      def initialize(root_path, options)
+        unless options['path']
+          validation_error!('path must be set')
+        end
+
+        @yaml = YAML.load_file root_path.join(options['path'])
+
+        unless @yaml.is_a?(Hash)
+          validation_error!('Env yaml root must be Hash')
+        end
+
+        @options = options
+      end
+
+      # @param [Array<String>] variables
+      # @return [Hash<String, String>]
+      def ask(variables)
+        env = {}
+        read_from_yaml do |key, val|
+          if variables.include?(key)
+            env[key] = val
+          end
+        end
+        env
+      end
+
+      private
+
+      # @yieldparam [String] key
+      # @yieldparam [String] val
+      def read_from_yaml(&block)
+        flatten(@yaml).each(&block)
+      end
+
+      # @param [Object] obj
+      # @param [String] root
+      # @param [Hash<String,String>] acc
+      # @return [Hash<String, String>]
+      def flatten(obj, root = nil, acc = {})
+        case obj
+        when Array
+          ary_sep = @options.fetch('ary_sep', ',')
+          acc[root] = obj.join(ary_sep)
+        when Hash
+          obj.each do |key, value|
+            key_sep = @options.fetch('key_sep', '.')
+            new_root = [root, key].reject(&:nil?).join(key_sep)
+            flatten(value, new_root, acc)
+          end
+        else
+          acc[root] = obj.to_s
+        end
+
+        acc
+      end
+    end
+  end
+end

data/lib/hako/schedulers/ecs.rb

@@ -35,9 +35,14 @@ module Hako
         if options.key?('autoscaling')
           @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), dry_run: @dry_run)
         end
+        @autoscaling_group_for_oneshot = options.fetch('autoscaling_group_for_oneshot', nil)
+        @deployment_configuration = {}
+        %i[maximum_percent minimum_healthy_percent].each do |key|
+          @deployment_configuration[key] = options.dig('deployment_configuration', key.to_s)
+        end
+
         @started_at = nil
         @container_instance_arn = nil
-        @autoscaling_group_for_oneshot = options.fetch('autoscaling_group_for_oneshot', nil)
       end
 
       # @param [Hash<String, Container>] containers
@@ -239,9 +244,9 @@ module Hako
         service = describe_service
         if service
           if @dry_run
-            Hako.logger.info("ecs_client.update_service(cluster: #{@cluster}, service: #{@app_id}, desired_count: 0)")
+            Hako.logger.info("ecs_client.update_service(cluster: #{service.cluster_arn}, service: #{service.service_arn}, desired_count: 0)")
           else
-            ecs_client.update_service(cluster: @cluster, service: @app_id, desired_count: 0)
+            ecs_client.update_service(cluster: service.cluster_arn, service: service.service_arn, desired_count: 0)
             Hako.logger.info("#{service.service_arn} is stopped")
           end
         else
@@ -453,6 +458,7 @@ module Hako
           command: container.command,
           volumes_from: container.volumes_from,
           user: container.user,
+          log_configuration: container.log_configuration,
         }
       end
 
@@ -580,6 +586,7 @@ module Hako
             task_definition: task_definition_arn,
             desired_count: @desired_count,
             role: @role,
+            deployment_configuration: @deployment_configuration,
           }
           if ecs_elb_client.find_or_create_load_balancer(front_port)
             params[:load_balancers] = [
@@ -593,6 +600,7 @@ module Hako
             service: @app_id,
             desired_count: @desired_count,
             task_definition: task_definition_arn,
+            deployment_configuration: @deployment_configuration,
           }
           if @autoscaling
             # Keep current desired_count if autoscaling is enabled
@@ -617,6 +625,11 @@ module Hako
             return true
           end
         end
+        params[:deployment_configuration].each do |key, val|
+          if val && val != service.deployment_configuration.public_send(key)
+            return true
+          end
+        end
         false
       end
 

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -7,7 +7,7 @@ module Hako
         @expected_container = expected_container
       end
 
-      CONTAINER_KEYS = %i[image cpu memory memory_reservation links docker_labels user].freeze
+      CONTAINER_KEYS = %i[image cpu memory memory_reservation links docker_labels user log_configuration].freeze
       PORT_MAPPING_KEYS = %i[container_port host_port protocol].freeze
       ENVIRONMENT_KEYS = %i[name value].freeze
       MOUNT_POINT_KEYS = %i[source_volume container_path read_only].freeze

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.20.1'
+  VERSION = '0.20.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -116,6 +116,7 @@ files:
 - examples/front.yml
 - examples/hello-autoscaling-group.yml
 - examples/hello-autoscaling.yml
+- examples/hello-awslogs-driver.yml
 - examples/hello-lb-v2.yml
 - examples/hello-lb.yml
 - examples/hello.env
@@ -133,6 +134,7 @@ files:
 - lib/hako/env_provider.rb
 - lib/hako/env_providers.rb
 - lib/hako/env_providers/file.rb
+- lib/hako/env_providers/yaml.rb
 - lib/hako/error.rb
 - lib/hako/loader.rb
 - lib/hako/scheduler.rb