hako 0.25.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5db2f14a93b2673dbbe11138f18bea8b4226fd
-  data.tar.gz: 7621bff9212dcb049e529a410752618543247ea9
+  metadata.gz: 5af9dc270bc2256c6afe5c2a1f4a3aa5cbce005d
+  data.tar.gz: 7e776cd502c68aa760dee703aba4da6089bbd695
 SHA512:
-  metadata.gz: f81bd0a6bd273965a57b051ed7824b30cc5dcfa0edca7c6d5a5768e71f319673948b9a0a16df6d48ff7897233fbd020e9ab66032a07161d98b69c98e00a6f730
-  data.tar.gz: a5530102648067b4565781a6bdb07aa878820fcb0711fd050722bf43567d282c0e340e7270cb92c463e3a621f19e6ea2f2dd1d7cec63a7a065d7f83e8fb858c3
+  metadata.gz: 84cb70ece19f489aecbeb85f7a39d56445a276925ecf771b3ffb07d192a2a9fa563c252699e2e62b8d64daee39d35f537d6ac947ce445f0832f1f755d98fb45f
+  data.tar.gz: 9625218050f8d55df0a69d4e38c770dff1d9bf5c66b7fe605ee8b54a76fef954da166fbd75959d9b6bb7c5d18cb1f7d0b839d9baae0b178dc938359a4d2cce6c

data/lib/hako/schedulers/ecs.rb

@@ -141,12 +141,11 @@ module Hako
 
         if @dry_run
           definitions.each do |d|
-            Hako.logger.info "Add container #{d}"
-          end
-          env.each do |k, v|
-            Hako.logger.info "Add environment #{k}=#{v}"
+            if d[:name] == 'app'
+              d[:command] = commands
+            end
+            print_definition_in_cli_format(d, additional_env: env)
           end
-          Hako.logger.info "Execute command #{commands}"
           0
         else
           task_definition = register_task_definition_for_oneshot(definitions)
@@ -770,8 +769,9 @@ module Hako
       end
 
       # @param [Hash] definition
+      # @param [Hash<String, String>] additional_env
       # @return [nil]
-      def print_definition_in_cli_format(definition)
+      def print_definition_in_cli_format(definition, additional_env: {})
         cmd = %w[docker run]
         cmd << '--name' << definition.fetch(:name)
         cmd << '--cpu-shares' << definition.fetch(:cpu)
@@ -808,7 +808,16 @@ module Hako
 
         cmd << "\\\n  "
         definition.fetch(:environment).each do |env|
-          cmd << '--env' << "#{env.fetch(:name)}=#{env.fetch(:value)}"
+          name = env.fetch(:name)
+          value = env.fetch(:value)
+          # additional_env (given in command line) has priority over env (declared in YAML)
+          unless additional_env.key?(name)
+            cmd << '--env' << "#{name}=#{value}"
+            cmd << "\\\n  "
+          end
+        end
+        additional_env.each do |name, value|
+          cmd << '--env' << "#{name}=#{value}"
           cmd << "\\\n  "
         end
 

data/lib/hako/schedulers/ecs_elb.rb

@@ -29,6 +29,8 @@ module Hako
       # @return [Aws::ElasticLoadBalancing::Types::LoadBalancerDescription]
       def describe_load_balancer
         @elb.describe_load_balancers(load_balancer_names: [name]).load_balancer_descriptions[0]
+      rescue Aws::ElasticLoadBalancing::Errors::LoadBalancerNotFound
+        nil
       end
 
       # @param [Fixnum] front_port

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk