ecs_deployer 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b9bc5a8735c4eb1d79342c151373c12f4cebd9
-  data.tar.gz: c5c20860e6c7529810199f6eed0b862828f8fecb
+  metadata.gz: 1c2e073c32d7935742a6d87dcf5b04afd2503fee
+  data.tar.gz: 2e983699cf073f336fe1965d8e2e7ee1b464f5f4
 SHA512:
-  metadata.gz: 6bc40dd8e90ab7229ea6288da8afe181634a9c08ee5b73fef4239ecb7c00c39e863f74e63fd8ee959d05e617c5000d796ba245ca493ddfdd1ccbf547ca4937ae
-  data.tar.gz: 736a31ecbfe3abe35fc9f998f32971f3de152e360466a4346dd5375f252d8a1ba90ed22b6b21a3f3bd9e60378d25ea3db8275e10a8f143a0bf39537de0365f66
+  metadata.gz: '02872736a0060a1b4fc78fb6a628f536a25e68b8031fc1e936f2da9569d3f999bb66cc5720c2bc248e6026bcb52a3804940fed22419476271c93d79de5e35117'
+  data.tar.gz: 8018bd2bd361c359ff257259529386adfbe41a14705fff23e299b2be7ba3160b63badff81c41d8a393d99aa3f1b1e43619a8816934e70869742a094f256d0e40

data/lib/ecs_deployer.rb

@@ -8,6 +8,7 @@ module EcsDeployer
   class TaskRunningError < EcsDeployer::Error; end
   class TaskDefinitionValidateError < EcsDeployer::Error; end
   class TaskDesiredError < EcsDeployer::Error; end
+  class TaskStoppedError < EcsDeployer::Error; end
   class KmsEncryptError < EcsDeployer::Error; end
   class KmsDecryptError < EcsDeployer::Error; end
   class DeployTimeoutError < EcsDeployer::Error; end

data/lib/ecs_deployer/client.rb

@@ -9,16 +9,16 @@ module EcsDeployer
     LOG_SEPARATOR = '-' * 96
     ENCRYPT_PATTERN = /^\${(.+)}$/
 
-    attr_reader :cli
+    attr_reader :ecs
     attr_accessor :timeout, :pauling_interval
 
     # @param [Logger] logger
     # @return [EcsDeployer::Client]
     def initialize(logger = nil, aws_options = {})
       @logger = logger.nil? ? Logger.new(STDOUT) : logger
-      @cli = Aws::ECS::Client.new(aws_options)
+      @ecs = Aws::ECS::Client.new(aws_options)
       @kms = Aws::KMS::Client.new(aws_options)
-      @timeout = 600
+      @timeout = 900
       @pauling_interval = 20
     end
 
@@ -63,7 +63,7 @@ module EcsDeployer
       replace_parameter_variables!(task_definition, replace_variables)
       decrypt_environment_variables!(task_definition)
 
-      result = @cli.register_task_definition(
+      result = @ecs.register_task_definition(
         container_definitions: task_definition[:container_definitions],
         family: task_definition[:family],
         task_role_arn: task_definition[:task_role_arn],
@@ -81,7 +81,7 @@ module EcsDeployer
     def register_clone_task(cluster, service)
       detected_service = false
 
-      result = @cli.describe_services(
+      result = @ecs.describe_services(
         cluster: cluster,
         services: [service]
       )
@@ -89,7 +89,7 @@ module EcsDeployer
       result[:services].each do |svc|
         next unless svc[:service_name] == service
 
-        result = @cli.describe_task_definition(
+        result = @ecs.describe_task_definition(
           task_definition: svc[:task_definition]
         )
         @new_task_definition_arn = register_task_hash(result[:task_definition].to_hash)
@@ -107,13 +107,13 @@ module EcsDeployer
     # @return [String]
     def update_service(cluster, service, wait = true)
       register_clone_task(cluster, service) if @new_task_definition_arn.nil?
-
-      result = @cli.update_service(
+      result = @ecs.update_service(
         cluster: cluster,
         service: service,
         task_definition: @family + ':' + @revision.to_s
       )
-      wait_for_deploy(cluster, service) if wait
+
+      wait_for_deploy(cluster, service, result.service.task_definition) if wait
       result.service.service_arn
     end
 
@@ -156,7 +156,7 @@ module EcsDeployer
     # @return [Aws::ECS::Types::Service]
     def service_status(cluster, service)
       status = nil
-      result = @cli.describe_services(
+      result = @ecs.describe_services(
         cluster: cluster,
         services: [service]
       )
@@ -173,10 +173,35 @@ module EcsDeployer
 
     # @param [String] cluster
     # @param [String] service
+    # @param [String] task_definition_arn
+    def detect_stopped_task(cluster, service, task_definition_arn)
+      stopped_tasks = @ecs.list_tasks(
+        cluster: cluster,
+        service_name: service,
+        desired_status: 'STOPPED'
+      ).task_arns
+
+      return if stopped_tasks.size.zero?
+
+      description_tasks = @ecs.describe_tasks(
+        cluster: cluster,
+        tasks: stopped_tasks
+      ).tasks
+
+      description_tasks.each do |task|
+        raise TaskStoppedError, task.stopped_reason if task.task_definition_arn == task_definition_arn
+      end
+    end
+
+    # @param [String] cluster
+    # @param [String] service
+    # @param [String] task_definition_arn
     # @return [Hash]
-    def deploy_status(cluster, service)
+    def deploy_status(cluster, service, task_definition_arn)
+      detect_stopped_task(cluster, service, task_definition_arn)
+
       # Get current tasks
-      result = @cli.list_tasks(
+      result = @ecs.list_tasks(
         cluster: cluster,
         service_name: service,
         desired_status: 'RUNNING'
@@ -184,7 +209,7 @@ module EcsDeployer
 
       raise TaskRunningError, 'Running task not found.' if result[:task_arns].size.zero?
 
-      result = @cli.describe_tasks(
+      result = @ecs.describe_tasks(
         cluster: cluster,
         tasks: result[:task_arns]
       )
@@ -206,7 +231,8 @@ module EcsDeployer
 
     # @param [String] cluster
     # @param [String] service
-    def wait_for_deploy(cluster, service)
+    # @param [String] task_definition_arn
+    def wait_for_deploy(cluster, service, task_definition_arn)
       service_status = service_status(cluster, service)
       raise TaskDesiredError, 'Task desired by service is 0.' if service_status[:desired_count].zero?
 
@@ -216,7 +242,7 @@ module EcsDeployer
       loop do
         sleep(@pauling_interval)
         wait_time += @pauling_interval
-        result = deploy_status(cluster, service)
+        result = deploy_status(cluster, service, task_definition_arn)
 
         @logger.info "Deploying... [#{result[:new_running_count]}/#{result[:current_running_count]}] (#{wait_time} seconds elapsed)"
         @logger.info "New task: #{@new_task_definition_arn}"

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj