ecs_deployer 2.1.13 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b29a6b759c8374e99b6b5c8c513e1e781f5207de52e19613619344d6e396af
-  data.tar.gz: d49839f00dcb9b254d4ee9a1535cfe4176baa8ce255440ec051ab3510ef7147f
+  metadata.gz: 074c9a43276dd4667e47d6177aa20fdfb2b65d85dda2f40c79184b2a2a63d938
+  data.tar.gz: b2ed769b0f71267662bbbe9e6c5130498377f2865c1dd933eb1560f4eb3149cb
 SHA512:
-  metadata.gz: 5cb81db355611be4b8cb2ca131380f3554d0b8071f4759bbeb87b439939329d09c2b280fd7b8f4142d52d5874e2d5e788d701621fd89038e4609789bcb853693
-  data.tar.gz: 5eec9fa0df0d9571c15fe073379b9730835c2ba9651394bee233700c3cf63ce5a035445a9998a8ac71cab301e1f62fa5d73194201861c8b589899131658f3194
+  metadata.gz: fe22a8d339905fcb4300951a4bf48c502a34d19974ce9c1cc871dcecde0c3140bc6eeed9854dc68bf832e84ac107be6d3b6a64d8f9c8d27deb081be6da3f916e
+  data.tar.gz: 1a049a1f2d7d8794fa96b61b30039e19833fca8dfa4ae3559befb4681b7aa95da83c37ff957182a84589569f78aac2444a9b28c817d24f963ee7d1518be1a692

data/README.md

@@ -1,9 +1,3 @@
-# Release news
-
-I developed ECS deployment tool based on `ecs_deployer`.
-
-http://github.com/metaps/genova
-
 # ECS Deployer
 
 [![Gem Version](https://badge.fury.io/rb/ecs_deployer.svg)](https://badge.fury.io/rb/ecs_deployer)
@@ -11,9 +5,10 @@ http://github.com/metaps/genova
 [![Code Climate](https://codeclimate.com/github/naomichi-y/ecs_deployer/badges/gpa.svg)](https://codeclimate.com/github/naomichi-y/ecs_deployer)
 [![CircleCI](https://circleci.com/gh/naomichi-y/ecs_deployer/tree/master.svg?style=shield)](https://circleci.com/gh/naomichi-y/ecs_deployer/tree/master)
 
-## Description
+## Features
 
-Deploy Docker container on AWS ECS.
+This package provides ability to deploy tasks to AWS ECS.
+The library is used by [genova](https://github.com/metaps/genova).
 
 * Task
   * Create
@@ -23,8 +18,6 @@ Deploy Docker container on AWS ECS.
   * Create
   * Update
 
-This package is used in [Genova (ECS Deployment Manager)](https://github.com/metaps/genova).
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -70,7 +63,7 @@ Encrypted values must be enclosed in `${XXX}`.
 ```yaml
 - environment:
   - name: MYSQL_ROOT_PASSWORD
-    value: ${fiSAIfIFxd...}
+    value: ${...}
 ```
 
 Values are decrypted when task is created.
@@ -87,8 +80,6 @@ deployer.register_task('development.yml', tag: 'latest')
 
 ### CLI
 
-Please create `.env` from `.env.default` file, before running.
-
 #### Register new task
 
 ```bash

data/lib/ecs_deployer/cli.rb

@@ -11,6 +11,8 @@ module EcsDeployer
         @aws_options[:profile] = options[:profile] if options[:profile]
         @aws_options[:region] = options[:region] if options[:region]
 
+        @logger = Logger.new(STDOUT)
+
         nil
       end
 
@@ -37,12 +39,12 @@ module EcsDeployer
     option :wait, type: :boolean, default: true
     option :wait_timeout, type: :numeric, default: 600
     def update_service
-      deploy_client = EcsDeployer::Client.new(options[:cluster], nil, @aws_options)
+      deploy_client = EcsDeployer::Client.new(options[:cluster], @logger, @aws_options)
       service_client = deploy_client.service
       service_client.wait_timeout = options[:wait_timeout]
       result = service_client.update(options[:service], nil, options[:wait])
 
-      puts "Update service: #{result.service_arn}"
+      puts "Service has been successfully updated: #{result.service_arn}"
     end
 
     desc 'encrypt', 'Encrypt value of argument with KMS.'

data/lib/ecs_deployer/service/client.rb

@@ -90,25 +90,24 @@ module EcsDeployer
           desired_status: 'RUNNING'
         )
 
-        raise TaskRunningError, 'Running task not found.' if result[:task_arns].size.zero?
-
-        result = @ecs.describe_tasks(
-          cluster: @cluster,
-          tasks: result[:task_arns]
-        )
-
-        new_running_count = 0
-        task_status_logs = []
-
-        result[:tasks].each do |task|
-          new_running_count += 1 if task_definition_arn == task[:task_definition_arn] && task[:last_status] == 'RUNNING'
-          task_status_logs << "  #{task[:task_definition_arn]} [#{task[:last_status]}]"
+        new_task_count = 0
+        status_logs = []
+
+        if result[:task_arns].size.positive?
+          result = @ecs.describe_tasks(
+            cluster: @cluster,
+            tasks: result[:task_arns]
+          )
+
+          result[:tasks].each do |task|
+            new_task_count += 1 if task_definition_arn == task[:task_definition_arn] && task[:last_status] == 'RUNNING'
+            status_logs << "  #{task[:task_definition_arn]} [#{task[:last_status]}]"
+          end
         end
 
         {
-          current_running_count: result[:tasks].size,
-          new_running_count: new_running_count,
-          task_status_logs: task_status_logs
+          new_task_count: new_task_count,
+          status_logs: status_logs
         }
       end
 
@@ -118,30 +117,38 @@ module EcsDeployer
         raise ServiceNotFoundError, "'#{service}' service is not found." unless exist?(service)
 
         wait_time = 0
-        @logger.info 'Start deploying...'
+        @logger.info 'Start deployment.'
+
+        result = @ecs.describe_services(
+          cluster: @cluster,
+          services: [service]
+        )
+        desired_count = result[:services][0][:desired_count]
 
         loop do
           sleep(@polling_interval)
           wait_time += @polling_interval
           result = deploy_status(service, task_definition_arn)
 
-          @logger.info "Deploying... [#{result[:new_running_count]}/#{result[:current_running_count]}] (#{wait_time} seconds elapsed)"
+          @logger.info "Updating... [#{result[:new_task_count]}/#{desired_count}] (#{wait_time} seconds elapsed)"
           @logger.info "New task: #{task_definition_arn}"
           @logger.info LOG_SEPARATOR
 
-          result[:task_status_logs].each do |log|
-            @logger.info log
-          end
+          if result[:status_logs].count.positive?
+            result[:status_logs].each do |log|
+              @logger.info log
+            end
 
-          @logger.info LOG_SEPARATOR
+            @logger.info LOG_SEPARATOR
+          end
 
-          if result[:new_running_count] == result[:current_running_count]
-            @logger.info "Service update succeeded. [#{result[:new_running_count]}/#{result[:current_running_count]}]"
+          if result[:new_task_count] == desired_count
+            @logger.info "Service update succeeded. [#{result[:new_task_count]}/#{desired_count}]"
             @logger.info "New task definition: #{task_definition_arn}"
 
             break
           else
-            @logger.info 'You can stop process with Ctrl+C. Deployment will continue.'
+            @logger.info 'You can stop process with Ctrl+C. Deployment continues in background.'
 
             if wait_time > @wait_timeout
               @logger.info "New task definition: #{task_definition_arn}"

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = '2.1.13'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.2.0
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -182,7 +182,6 @@ files:
 - bin/console
 - bin/setup
 - circle.yml
-- config.local.yml
 - config.yml
 - ecs_deployer.gemspec
 - example/register_task.rb

data/config.local.yml

@@ -1,6 +0,0 @@
-task_path: ~/Projects/nichigas-sandbox/config/deploy/development.yml
-scheduled_task_path: ~/Projects/nichigas-sandbox/config/deploy/development.yml
-cluster: sandbox
-service: development
-scheduled_task_rule: curl
-scheduled_task_target_id: worker