ecs_deployer 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022b3442f88234d68a859aea13ab1be47f7d357b
-  data.tar.gz: 62578b367ebf2d506b745d304068a1ac07ccd3cd
+  metadata.gz: 5fd6d6f9f5273217eda74eb3591b68d995756699
+  data.tar.gz: b8c28e3077e600f1819af1c5962b72932304a83f
 SHA512:
-  metadata.gz: 590fb52f78f7181d1e1a2cf2c8a68dfb0847718aa9a2ee84d4d61ec1d55bf8a0f7d74fdc7abd89491ea0d5b0def2fb4c3a7bcf7af6c19a47cfbf9588c7d488e3
-  data.tar.gz: ac1d5b859568aa7f6d5efb95c0f5f62faef1d17ba247b870c3424600bb065af54e9d3356299a04473277aab4212075ad165126704ba4e431093ee248ecf2963c
+  metadata.gz: 7cf7d00b7a60e0f4adeab84e64195c7461ac652c94589a60c0258ae1a8dd279b06e82f172370314e88f7e0c89e19f714b0c9e73f3f6f4294385dd95cb397627c
+  data.tar.gz: a827047b284fb20d6c1418b774b4bb624e309e33b7a63f7cd4dab61c331f3b9bd0cbd111cfae6d2fe7453b45c045acbdf939611b6bfb8f158881f1b8649d44f8

data/README.md

@@ -25,14 +25,14 @@ For available parameters see [Task Definition Parameters](http://docs.aws.amazon
 The sample file is in `example/fixtures/task.yml`.
 
 ```
-containerDefinitions:
+container_definitions:
 - name: wordpress
   links:
   - mysql
   image: wordpress
   essential: true
-  portMappings:
-  - containerPort: 80
+  port_mappings:
+  - container_port: 80
     hostPort: 80
   memory: 500
   cpu: 10
@@ -50,7 +50,7 @@ family: hello_world
 ## Usage
 
 ```
-ecs_deployer = EcsDeployer::Client.new()
+ecs_deployer = EcsDeployer::Client.new
 ecs_deployer.register_task('development.yml')
-ecs_deployer.update_service('cluster', 'application')
+ecs_deployer.update_service('cluster', 'development')
 ```

data/ecs_deployer.gemspec

@@ -29,8 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'runtime_command'
-  spec.add_dependency 'oj'
+  spec.add_dependency "runtime_command"
+  spec.add_dependency "oj"
+  spec.add_dependency "thor"
+  spec.add_dependency "aws-sdk"
+  spec.add_dependency "aws_config"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/example/fixtures/task.yml

@@ -1,12 +1,12 @@
-containerDefinitions:
+container_definitions:
 - name: wordpress
   links:
   - mysql
   image: wordpress
   essential: true
-  portMappings:
-  - containerPort: 80
-    hostPort: 80
+  port_mappings:
+  - container_port: 80
+    host_port: 80
   memory: 500
   cpu: 10
 - environment:

data/example/sample.rb

@@ -3,7 +3,6 @@ require 'ecs_deployer'
 
 task_path = File.expand_path('./fixtures/task.yml', File.dirname(File.realpath(__FILE__)))
 
-ecs_deployer = EcsDeployer::Client.new('sandbox-ecs-production')
+ecs_deployer = EcsDeployer::Client.new
 ecs_deployer.register_task(task_path)
-ecs_deployer.update_service('application')
-#ecs_deployer.log
+# ecs_deployer.update_service('sandbox', 'production')

data/exe/ecs_deployer

@@ -0,0 +1,3 @@
+require 'ecs_deployer'
+
+EcsDeployer::CLI.start

data/lib/ecs_deployer/cli.rb

@@ -0,0 +1,10 @@
+require 'thor'
+
+module EcsDeployer
+  class CLI < Thor
+    desc 'hello', 'world'
+    def update
+      puts 'hello'
+    end
+  end
+end

data/lib/ecs_deployer/client.rb

@@ -1,21 +1,24 @@
 require 'yaml'
+require 'oj'
+require 'aws-sdk'
 require 'runtime_command'
-require 'ecs_deployer/commander'
 
 module EcsDeployer
   class Client
     PAULING_INTERVAL = 20
 
+    attr_reader :commander
+
     # @param [Hash] options
     # @option options [String] :profile
     # @option options [String] :region
     # @return [EcsDeployer::Client]
     def initialize(options = {})
-      @runtime = RuntimeCommand::Builder.new
-      @ecs_command = Commander.new(@runtime, options)
+      @command = RuntimeCommand::Builder.new
       @family = ''
       @revision = ''
       @new_task_definition_arn = ''
+      @commander = Aws::ECS::Client.new(options)
     end
 
     # @param [String] task_path
@@ -28,11 +31,17 @@ module EcsDeployer
     # @param [Hash] task_hash
     # @return [String]
     def register_task_hash(task_hash)
-      result = @ecs_command.register_task_definition(task_hash['family'], task_hash['containerDefinitions'])
+      task_hash = Oj.load(Oj.dump(task_hash), symbol_keys: true)
+
+      result = @commander.register_task_definition({
+        container_definitions: task_hash[:container_definitions],
+        family: task_hash[:family],
+        task_role_arn: task_hash[:task_role_arn]
+      })
 
-      @family = result['taskDefinition']['family']
-      @revision = result['taskDefinition']['revision']
-      @new_task_definition_arn = result['taskDefinition']['taskDefinitionArn']
+      @family = result[:task_definition][:family]
+      @revision = result[:task_definition][:revision]
+      @new_task_definition_arn = result[:task_definition][:task_definition_arn]
     end
 
     # @param [String] cluster
@@ -41,11 +50,17 @@ module EcsDeployer
     def register_clone_task(cluster, service)
       detected_service = false
 
-      result = @ecs_command.describe_services([service], { 'cluster': cluster })
-      result['services'].each do |svc|
-        if svc['serviceName'] == service
-          result = @ecs_command.describe_task_definition(svc['taskDefinition'])
-          @new_task_definition_arn = register_task_hash(result['taskDefinition'])
+      result = @commander.describe_services({
+        cluster: cluster,
+        services: [service]
+      })
+
+      result[:services].each do |svc|
+        if svc[:service_name] == service
+          result = @commander.describe_task_definition({
+            task_definition: svc[:task_definition]
+          })
+          @new_task_definition_arn = register_task_hash(result[:task_definition])
           detected_service = true
           break
         end
@@ -61,17 +76,13 @@ module EcsDeployer
     # @param [Fixnum] timeout
     def update_service(cluster, service, wait = true, timeout = 600)
       register_clone_task(service) if @new_task_definition_arn.empty?
-      options = {
-        'cluster': cluster,
-        'task-definition': @family + ':' + @revision.to_s
-      }
-      @ecs_command.update_service(service, options)
-      wait_for_deploy(cluster, service, timeout) if wait
-    end
 
-    # @return [String]
-    def log
-      @ecs_command.log
+      @commander.update_service({
+        cluster: cluster,
+        service: service,
+        task_definition: @family + ':' + @revision.to_s
+      })
+      wait_for_deploy(cluster, service, timeout) if wait
     end
 
     private
@@ -81,53 +92,61 @@ module EcsDeployer
     def wait_for_deploy(cluster, service, timeout)
       detected_service = false
 
-      result = @ecs_command.describe_services([service], { 'cluster': cluster })
-      result['services'].each do |svc|
-        next unless svc['serviceName'] == service
+      result = @commander.describe_services({
+        cluster: cluster,
+        services: [service]
+      })
+      result[:services].each do |svc|
+        next unless svc[:service_name] == service
         detected_service = true
 
-        result = @ecs_command.describe_task_definition(svc['taskDefinition'])
+        result = @commander.describe_task_definition({
+          task_definition: svc[:task_definition]
+        })
 
-        if svc['desiredCount'] > 0
+        if svc[:desired_count] > 0
           running_new_task = false
           wait_time = 0
-          @runtime.puts 'Start deploing...'
+          @command.puts 'Start deploing...'
 
           begin
             sleep(PAULING_INTERVAL)
             wait_time += PAULING_INTERVAL
 
             # Get current tasks
-            options = {
-              'cluster': cluster,
-              'service-name': service,
-              'desired-status': 'RUNNING'
-            }
-            result = @ecs_command.list_tasks(options)
+            result = @commander.list_tasks({
+              cluster: cluster,
+              service_name: service,
+              desired_status: 'RUNNING'
+            })
 
-            raise TaskNotFoundError.new('Desired count is 0.') if result['taskArns'].size == 0
+            raise TaskNotFoundError.new('Desired count is 0.') if result[:task_arns].size == 0
 
             new_running_count = 0
-            result = @ecs_command.describe_tasks(result['taskArns'], { 'cluster': cluster })
+            result = @commander.describe_tasks({
+              tasks: result[:task_arns],
+              cluster: cluster
+            })
 
-            result['tasks'].each do |task|
-              new_running_count += 1 if @new_task_definition_arn == task['taskDefinitionArn']
+            result[:tasks].each do |task|
+              new_running_count += 1 if @new_task_definition_arn == task[:task_definition_arn]
             end
 
-            current_running_count = result['tasks'].size
+            current_running_count = result[:tasks].size
 
             if current_running_count == new_running_count
-              @runtime.puts "Service update succeeded. [#{new_running_count}/#{current_running_count}]"
-              @runtime.puts "New task definition: #{@new_task_definition_arn}"
+              @command.puts "Service update succeeded. [#{new_running_count}/#{current_running_count}]"
+              @command.puts "New task definition: #{@new_task_definition_arn}"
 
               running_new_task = true
 
             else
-              @runtime.puts "Deploying... [#{new_running_count}/#{current_running_count}] (#{wait_time} seconds elapsed)"
-              @runtime.puts 'You can stop process with Ctrl+C. Deployment will continue.'
+              @command.puts "Deploying... [#{new_running_count}/#{current_running_count}] (#{wait_time} seconds elapsed)"
+              @command.puts "New task: #{@new_task_definition_arn}"
+              @command.puts 'You can stop process with Ctrl+C. Deployment will continue.'
 
               if wait_time > timeout
-                @runtime.puts "New task definition: #{@new_task_definition_arn}"
+                @command.puts "New task definition: #{@new_task_definition_arn}"
                 raise DeployTimeoutError.new('Service is being updating, but process is timed out.')
               end
             end

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/ecs_deployer.rb

@@ -1,10 +1,10 @@
 require 'ecs_deployer/version'
 require 'ecs_deployer/client'
 require 'ecs_deployer/error'
+require 'ecs_deployer/cli'
 
 module EcsDeployer
   class ServiceNotFoundError < EcsDeployer::Error; end
   class TaskNotFoundError < EcsDeployer::Error; end
   class DeployTimeoutError < EcsDeployer::Error; end
-  class CommandError < EcsDeployer::Error; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runtime_command
@@ -38,6 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +125,8 @@ dependencies:
 description: This package provides the service deployment function of ECS.
 email:
 - n.yamakita@gmail.com
-executables: []
+executables:
+- ecs_deployer
 extensions: []
 extra_rdoc_files: []
 files:
@@ -98,9 +141,10 @@ files:
 - ecs_deployer.gemspec
 - example/fixtures/task.yml
 - example/sample.rb
+- exe/ecs_deployer
 - lib/ecs_deployer.rb
+- lib/ecs_deployer/cli.rb
 - lib/ecs_deployer/client.rb
-- lib/ecs_deployer/commander.rb
 - lib/ecs_deployer/error.rb
 - lib/ecs_deployer/version.rb
 homepage: https://github.com/naomichi-y/ecs_deployer

data/lib/ecs_deployer/commander.rb

@@ -1,87 +0,0 @@
-require 'oj'
-
-module EcsDeployer
-  class Commander
-    # @param [RuntimeCommand::Builder] runtime
-    # @param [Hash] options
-    # @return EcsDeployer::Commander
-    def initialize(runtime, options = {})
-      @runtime = runtime
-      @options = options
-    end
-
-    # @param [String] service
-    # @param [Hash] options
-    # @return [Hash]
-    def update_service(service, options = {})
-      options['service'] = service
-      exec('update-service', options)
-    end
-
-    # @param [Hash] options
-    # @return [Hash]
-    def list_tasks(options = {})
-      exec('list-tasks', options)
-    end
-
-    # @param [Array] tasks
-    # @param [Hash] options
-    # @return [Hash]
-    def describe_tasks(tasks, options = {})
-      options['tasks'] = tasks.join(' ')
-      exec('describe-tasks', options)
-    end
-
-    # @param [String] task_definition
-    # @param [Hash] options
-    # @return [Hash]
-    def describe_task_definition(task_definition, options = {})
-      options['task-definition'] = task_definition
-      exec('describe-task-definition', options)
-    end
-
-    # @param [Array] services
-    # @param [Hash] options
-    # @return [Hash]
-    def describe_services(services, options = {})
-      options['services'] = services.join(' ')
-      exec('describe-services', options)
-    end
-
-    # @param [String] family
-    # @param [Hash] container_definitions
-    # @param [Hash] options
-    # @return [Hash]
-    def register_task_definition(family, container_definitions, options = {})
-      options['family'] = family
-      options['container-definitions'] = '"' + Oj.dump(container_definitions).gsub('"', '\\"') + '"'
-      exec('register-task-definition', options)
-    end
-
-    # @return [String]
-    def log
-      @runtime.buffered_log
-    end
-
-    private
-    # @param [String] command
-    # @param [Hash] params
-    # @return [Hash]
-    def exec(command, params)
-      arg = ''
-      params.each do |name, value|
-        arg << "--#{name} #{value} "
-      end
-
-      arg << "--profile #{params[:profile]} " if params.has_key?(:profile)
-      arg << "--region #{params[:region]} " if params.has_key?(:region)
-
-      command = "aws ecs #{command} #{arg}"
-      result = @runtime.exec(command)
-
-      raise CommandError.new unless result.buffered_stderr.empty?
-
-      Oj.load(result.buffered_stdout)
-    end
-  end
-end