ecs_deploy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd660050684f5a635cea49f382b3bb0b26b9326
-  data.tar.gz: 5676af9f244b931200517a2fe5f89bba11e8d482
+  metadata.gz: b00504a25168d2bc3b6c700c8ec8ff5ccded3ff3
+  data.tar.gz: 97c42178d1adec1876d319ddb8776cf28f687231
 SHA512:
-  metadata.gz: ff2d1000dcd9b1abc9f4856252697694eeedf6b91931411ff2f167301c08b33ddf617c4c13c27e0263f30abb3bd892d6fbd1cb1b6714704272d2318a1689f8b3
-  data.tar.gz: 33e16338511b030bb0790990eb1d6951429c8fc2120430be97d589d4295172fd87c1463daa9335f407029dfdffa3a8bab31a44065a93cb2beb6eb1e2ad205305
+  metadata.gz: fa259524dc7c1c0d0b2a61228d61014106df9ecc9c5b0ae21eda2300917935103f4122d8d2682e51f4232da6d9037b79a7f4646ff189915a64c12330bb39a33c
+  data.tar.gz: b2d4350db7dd4083fceef62a38c9dc229e20bdfec903a09ee5cfbf5ba8a4a9089c1177fb23a7dfb2ba1659515f2b94e12c9a3df15b4ebaa9c03f3c6f6942c6f3

data/README.md

@@ -28,8 +28,6 @@ require 'ecs_deploy/capistrano'
 
 # deploy.rb
 set :ecs_default_cluster, "ecs-cluster-name"
-set :ecs_access_key_id, "dummy" # optional, if nil, use environment variable
-set :ecs_secret_access_key, "dummy" # optional, if nil, use environment variable
 set :ecs_region, %w(ap-northeast-1) # optional, if nil, use environment variable
 set :ecs_service_role, "customEcsServiceRole" # default: ecsServiceRole
 set :ecs_deploy_wait_timeout, 600 # default: 300
@@ -87,12 +85,27 @@ set :ecs_tasks, [
       }
     ],
     volumes: [{name: "sockets_path", host: {}}],
-    executions: [ # execution task on deploy timing
-      {container_overrides: [{name: "myapp", command: ["db_migrate"]}]},
-    ]
   },
 ]
 
+set :ecs_scheduled_tasks, [
+  {
+    cluster: "default", # Unless this key, use fetch(:ecs_default_cluster)
+    rule_name: "schedule_name",
+    schedule_expression: "cron(0 12 * * ? *"),
+    description: "schedule_description", # Optional
+    target_id: "task_name", # Unless this key, use task_definition_name
+    task_definition_name: "myapp-#{fetch(:rails_env)}",
+    task_count: 2, # Default 1
+    revision: 12, # Optional
+    role_arn: "TaskRoleArn", # Optional
+    container_overrides: [ # Optional
+      name: "myapp-main",
+      command: ["ls"],
+    ]
+  }
+]
+
 set :ecs_services, [
   {
     name: "myapp-#{fetch(:rails_env)}",
@@ -116,6 +129,7 @@ set :ecs_services, [
 
 ```sh
 cap <stage> ecs:register_task_definition # register ecs_tasks as TaskDefinition
+cap <stage> ecs:deploy_scheduled_task # register ecs_scheduled_tasks to CloudWatchEvent
 cap <stage> ecs:deploy # create or update Service by ecs_services info
 
 cap <stage> ecs:rollback # deregister current task definition and update Service by previous revision of current task definition

data/lib/ecs_deploy/auto_scaler.rb

@@ -290,7 +290,6 @@ module EcsDeploy
         end
       rescue => e
         AutoScaler.error_logger.error(e)
-        clear_client
       end
     end
 

data/lib/ecs_deploy/capistrano.rb

@@ -36,15 +36,6 @@ namespace :ecs do
           )
           result = task_definition.register
           ecs_registered_tasks[region][t[:name]] = result
-
-          executions = t[:executions].to_a
-          unless executions.empty?
-            warn "`executions` config is deprecated. I will remove this in near future"
-          end
-          executions.each do |exec|
-            exec[:cluster] ||= fetch(:ecs_default_cluster)
-            task_definition.run(exec)
-          end
         end
       end
 
@@ -53,14 +44,14 @@ namespace :ecs do
   end
 
   task deploy_scheduled_task: [:configure, :register_task_definition] do
-    if fetch(:ecs_tasks)
+    if fetch(:ecs_scheduled_tasks)
       regions = Array(fetch(:ecs_region))
       regions = [nil] if regions.empty?
       regions.each do |r|
         fetch(:ecs_scheduled_tasks).each do |t|
           scheduled_task = EcsDeploy::ScheduledTask.new(
             region: r,
-            cluster: t[:cluster],
+            cluster: t[:cluster] || fetch(:ecs_default_cluster),
             rule_name: t[:rule_name],
             schedule_expression: t[:schedule_expression],
             enabled: t[:enabled] != false,
@@ -70,6 +61,7 @@ namespace :ecs do
             revision: t[:revision],
             task_count: t[:task_count],
             role_arn: t[:role_arn],
+            container_overrides: t[:container_overrides],
           )
           scheduled_task.deploy
         end

data/lib/ecs_deploy/scheduled_task.rb

@@ -9,7 +9,7 @@ module EcsDeploy
     def initialize(
       cluster:, rule_name:, schedule_expression:, enabled: true, description: nil, target_id: nil,
       task_definition_name:, revision: nil, task_count: nil, role_arn:,
-      region: nil
+      region: nil, container_overrides: nil
     )
       @cluster = cluster
       @rule_name = rule_name
@@ -22,6 +22,7 @@ module EcsDeploy
       @revision = revision
       @role_arn = role_arn
       @region = region || EcsDeploy.config.default_region || ENV["AWS_DEFAULT_REGION"]
+      @container_overrides = container_overrides
 
       @client = Aws::ECS::Client.new(region: @region)
       @cloud_watch_events = Aws::CloudWatchEvents::Client.new(region: @region)
@@ -58,19 +59,22 @@ module EcsDeploy
     end
 
     def put_targets
+      target = {
+        id: @target_id,
+        arn: cluster_arn,
+        role_arn: @role_arn,
+        ecs_parameters: {
+          task_definition_arn: task_definition_arn,
+          task_count: @task_count,
+        },
+      }
+      if @container_overrides
+        target.merge!(input: { containerOverrides: @container_overrides }.to_json)
+      end
+
       res = @cloud_watch_events.put_targets(
         rule: @rule_name,
-        targets: [
-          {
-            id: @target_id,
-            arn: cluster_arn,
-            role_arn: @role_arn,
-            ecs_parameters: {
-              task_definition_arn: task_definition_arn,
-              task_count: @task_count,
-            },
-          }
-        ]
+        targets: [target]
       )
       if res.failed_entry_count.zero?
         EcsDeploy.logger.info "create cloudwatch event target [#{@target_id}] [#{@region}] [#{Paint['OK', :green]}]"

data/lib/ecs_deploy/task_definition.rb

@@ -56,41 +56,5 @@ module EcsDeploy
       EcsDeploy.logger.info "register task definition [#{@task_definition_name}] [#{@region}] [#{Paint['OK', :green]}]"
       res.task_definition
     end
-
-    def run(info)
-      resp = @client.run_task({
-        cluster: info[:cluster],
-        task_definition: @task_definition_name,
-        overrides: {
-          container_overrides: info[:container_overrides] || []
-        },
-        count: info[:count] || 1,
-        started_by: "capistrano",
-      })
-      unless resp.failures.empty?
-        resp.failures.each do |f|
-          raise "#{f.arn}: #{f.reason}"
-        end
-      end
-
-      wait_targets = Array(info[:wait_stop])
-      unless wait_targets.empty?
-        @client.wait_until(:tasks_running, cluster: info[:cluster], tasks: resp.tasks.map { |t| t.task_arn })
-        @client.wait_until(:tasks_stopped, cluster: info[:cluster], tasks: resp.tasks.map { |t| t.task_arn })
-
-        resp = @client.describe_tasks(cluster: info[:cluster], tasks: resp.tasks.map { |t| t.task_arn })
-        resp.tasks.each do |t|
-          t.containers.each do |c|
-            next unless wait_targets.include?(c.name)
-
-            unless c.exit_code.zero?
-              raise "Task has errors: #{c.reason}"
-            end
-          end
-        end
-      end
-
-      EcsDeploy.logger.info "run task [#{@task_definition_name} #{info.inspect}] [#{@region}] [#{Paint['OK', :green]}]"
-    end
   end
 end

data/lib/ecs_deploy/version.rb

@@ -1,3 +1,3 @@
 module EcsDeploy
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: AWS ECS deploy helper