ecs_deploy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5027056d7641256dc566be9a2fd16dff8046f42
-  data.tar.gz: 009c12a42f0fdcd18f3c8a53b35f0e48055112a8
+  metadata.gz: a565132ff142d819e1bdc64368264ebc89de1030
+  data.tar.gz: d0b5d389d5a9311853d8524e45c56bd54943450a
 SHA512:
-  metadata.gz: c53395003a3e8953aef1d63cdf7a59d89b1f45e90b0acef1a00ff4420a4e96139e854427e204650aecfbf02f6a064348a6dea9f5919ef6b161a4e962e9d2b6bf
-  data.tar.gz: 82ce007f7e3e5ac6f4c30a705a6c16ca16889302d4c316a08990fae786bb403f9679582788584a23032d6894f04bcb6b321c82155c759844283c2400279162e2
+  metadata.gz: 50c6f3c9aecdacc26de0d61cb487f4196bf31031b8c43b798b4bebae1e2246e35ebf1bb1c6079a62b7d5f54c3f504fefb69ca08f08689d9717c601746db63bdb
+  data.tar.gz: f4fa32bf5a67e71a6265842eaffbff31647d17337fdb23e01007a6082f13b894a45ec127ca098a7c9125935937f9ac04c5d88025223915938da591a3259119e2

data/README.md

@@ -225,4 +225,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/joker1007/ecs_deploy.
+Bug reports and pull requests are welcome on GitHub at https://github.com/reproio/ecs_deploy.

data/ecs_deploy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "aws-sdk", "~> 2.4"
+  spec.add_runtime_dependency "aws-sdk", "~> 2.9"
   spec.add_runtime_dependency "terminal-table"
   spec.add_runtime_dependency "paint"
 

data/lib/ecs_deploy.rb

@@ -27,3 +27,4 @@ end
 
 require "ecs_deploy/task_definition"
 require "ecs_deploy/service"
+require "ecs_deploy/scheduled_task"

data/lib/ecs_deploy/auto_scaler.rb

@@ -23,7 +23,7 @@ module EcsDeploy
         config_groups = service_configs.group_by { |s| [s.region, s.auto_scaling_group_name] }
         ths = config_groups.map do |(region, auto_scaling_group_name), configs|
           asg_config = auto_scaling_group_configs.find { |c| c.name == auto_scaling_group_name && c.region == region }
-          Thread.new(asg_config, configs, &method(:main_loop))
+          Thread.new(asg_config, configs, &method(:main_loop)).tap { |th| th.abort_on_exception = true }
         end
 
         ths.each(&:join)
@@ -33,10 +33,13 @@ module EcsDeploy
         loop_with_polling_interval("loop of #{asg_config.name}") do
           ths = configs.map do |service_config|
             Thread.new(service_config) do |s|
-              next if s.idle?
-
               @logger.debug "Start service scaling of #{s.name}"
 
+              if s.idle?
+                @logger.debug "#{s.name} is idling"
+                next
+              end
+
               difference = 0
               s.upscale_triggers.each do |trigger|
                 step = trigger.step || s.step
@@ -71,6 +74,7 @@ module EcsDeploy
               end
             end
           end
+          ths.each { |th| th.abort_on_exception = true }
 
           ths.each(&:join)
 
@@ -113,6 +117,7 @@ module EcsDeploy
           next if wait_polling_interval?(last_executed_at)
           yield
           last_executed_at = Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
+          @logger.debug "#{name} is last executed at #{last_executed_at}"
         end
 
         @logger.debug "Stop #{name}"
@@ -148,17 +153,13 @@ module EcsDeploy
       end
 
       def client
-        Thread.current["ecs_auto_scaler_ecs_#{region}"] ||= Aws::ECS::Client.new(
+        Aws::ECS::Client.new(
           access_key_id: EcsDeploy.config.access_key_id,
           secret_access_key: EcsDeploy.config.secret_access_key,
           region: region
         )
       end
 
-      def clear_client
-        Thread.current["ecs_auto_scaler_ecs_#{region}"] = nil
-      end
-
       def idle?
         return false unless @last_updated_at
 
@@ -187,7 +188,6 @@ module EcsDeploy
         res.services[0]
       rescue => e
         AutoScaler.error_logger.error(e)
-        clear_client
       end
 
       def update_service(difference)
@@ -218,13 +218,14 @@ module EcsDeploy
           AutoScaler.logger.info "Service \"#{name}\" clears cooldown state"
         end
 
+        cl = client
         next_desired_count = [next_desired_count, max_task_count[level]].min
-        client.update_service(
+        cl.update_service(
           cluster: cluster,
           service: name,
           desired_count: next_desired_count,
         )
-        client.wait_until(:services_stable, cluster: cluster, services: [name]) do |w|
+        cl.wait_until(:services_stable, cluster: cluster, services: [name]) do |w|
           w.before_wait do
             AutoScaler.logger.debug "wait service stable [#{name}]"
           end
@@ -234,16 +235,16 @@ module EcsDeploy
         AutoScaler.logger.info "Update service \"#{name}\": desired_count -> #{next_desired_count}"
       rescue => e
         AutoScaler.error_logger.error(e)
-        clear_client
       end
 
       def fetch_container_instances
         arns = []
         resp = nil
+        cl = client
         loop do
           options = {cluster: cluster}
           options.merge(next_token: resp.next_token) if resp && resp.next_token
-          resp = client.list_container_instances(options)
+          resp = cl.list_container_instances(options)
           arns.concat(resp.container_instance_arns)
           break unless resp.next_token
         end
@@ -251,7 +252,7 @@ module EcsDeploy
         chunk_size = 50
         container_instances = []
         arns.each_slice(chunk_size) do |arn_chunk|
-          is = client.describe_container_instances(cluster: cluster, container_instances: arn_chunk).container_instances
+          is = cl.describe_container_instances(cluster: cluster, container_instances: arn_chunk).container_instances
           container_instances.concat(is)
         end
 
@@ -269,17 +270,13 @@ module EcsDeploy
       include ConfigBase
 
       def client
-        Thread.current["ecs_auto_scaler_cloud_watch_#{region}"] ||= Aws::CloudWatch::Client.new(
+        Aws::CloudWatch::Client.new(
           access_key_id: EcsDeploy.config.access_key_id,
           secret_access_key: EcsDeploy.config.secret_access_key,
           region: region
         )
       end
 
-      def clear_client
-        Thread.current["ecs_auto_scaler_cloud_watch_#{region}"] = nil
-      end
-
       def match?
         fetch_alarm.state_value == state
       end
@@ -301,29 +298,21 @@ module EcsDeploy
       include ConfigBase
 
       def client
-        Thread.current["ecs_auto_scaler_auto_scaling_#{region}"] ||= Aws::AutoScaling::Client.new(
+        Aws::AutoScaling::Client.new(
           access_key_id: EcsDeploy.config.access_key_id,
           secret_access_key: EcsDeploy.config.secret_access_key,
           region: region
         )
       end
 
-      def clear_client
-        Thread.current["ecs_auto_scaler_auto_scaling_#{region}"] = nil
-      end
-
       def ec2_client
-        Thread.current["ecs_auto_scaler_ec2_#{region}"] ||= Aws::EC2::Client.new(
+        Aws::EC2::Client.new(
           access_key_id: EcsDeploy.config.access_key_id,
           secret_access_key: EcsDeploy.config.secret_access_key,
           region: region
         )
       end
 
-      def clear_ec2_client
-        Thread.current["ecs_auto_scaler_ec2_#{region}"] = nil
-      end
-
       def instances(reload: false)
         if reload || @instances.nil?
           resp = client.describe_auto_scaling_groups({
@@ -378,7 +367,6 @@ module EcsDeploy
         end
       rescue => e
         AutoScaler.error_logger.error(e)
-        clear_client
       end
 
       def detach_and_terminate_instances(instance_ids)
@@ -398,8 +386,6 @@ module EcsDeploy
         AutoScaler.logger.info "Terminated instances: #{instance_ids.inspect}"
       rescue => e
         AutoScaler.error_logger.error(e)
-        clear_client
-        clear_ec2_client
       end
 
       def detach_and_terminate_orphan_instances(service_config)
@@ -415,8 +401,6 @@ module EcsDeploy
         detach_and_terminate_instances(targets.map(&:instance_id))
       rescue => e
         AutoScaler.error_logger.error(e)
-        clear_client
-        clear_ec2_client
       end
     end
   end

data/lib/ecs_deploy/capistrano.rb

@@ -20,24 +20,60 @@ namespace :ecs do
   task register_task_definition: [:configure] do
     if fetch(:ecs_tasks)
       regions = Array(fetch(:ecs_region))
-      regions = [nil] if regions.empty?
+      regions = [EcsDeploy.config.default_region || ENV["AWS_DEFAULT_REGION"]] if regions.empty?
+      ecs_registered_tasks = {}
       regions.each do |r|
+        ecs_registered_tasks[region] = {}
         fetch(:ecs_tasks).each do |t|
           task_definition = EcsDeploy::TaskDefinition.new(
-            region: r,
+            region: region,
             task_definition_name: t[:name],
             container_definitions: t[:container_definitions],
             task_role_arn: t[:task_role_arn],
-            volumes: t[:volumes]
+            volumes: t[:volumes],
+            network_mode: t[:network_mode],
+            placement_constraints: t[:placement_constraints],
           )
-          task_definition.register
+          result = task_definition.register
+          ecs_registered_tasks[region][t[:name]] = result
 
-          t[:executions].to_a.each do |exec|
+          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
+
+      set :ecs_registered_tasks, ecs_registered_tasks
+    end
+  end
+
+  task deploy_scheduled_task: [:configure, :register_task_definition] do
+    if fetch(:ecs_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],
+            rule_name: t[:rule_name],
+            schedule_expression: t[:schedule_expression],
+            enabled: t[:enabled] != false,
+            description: t[:description],
+            target_id: t[:target_id],
+            task_definition_name: t[:task_definition_name],
+            revision: t[:revision],
+            task_count: t[:task_count],
+            role_arn: t[:role_arn],
+          )
+          scheduled_task.deploy
+        end
+      end
     end
   end
 

data/lib/ecs_deploy/scheduled_task.rb

@@ -0,0 +1,85 @@
+require 'timeout'
+
+module EcsDeploy
+  class ScheduledTask
+    class PutTargetsFailure < StandardError; end
+
+    attr_reader :cluster, :region, :schedule_rule_name
+
+    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
+    )
+      @cluster = cluster
+      @rule_name = rule_name
+      @schedule_expression = schedule_expression
+      @enabled = enabled
+      @description = description
+      @target_id = target_id || task_definition_name
+      @task_definition_name = task_definition_name
+      @task_count = task_count || 1
+      @revision = revision
+      @role_arn = role_arn
+      @region = region || EcsDeploy.config.default_region || ENV["AWS_DEFAULT_REGION"]
+
+      @client = Aws::ECS::Client.new(region: @region)
+      @cloud_watch_events = Aws::CloudWatchEvents::Client.new(region: @region)
+    end
+
+    def deploy
+      put_rule
+      put_targets
+    end
+
+    private
+
+    def cluster_arn
+      cl = @client.describe_clusters(clusters: [@cluster]).clusters[0]
+      if cl
+        cl.cluster_arn
+      end
+    end
+
+    def task_definition_arn
+      suffix = @revision ? ":#{@revision}" : ""
+      name = "#{@task_definition_name}#{suffix}"
+      @client.describe_task_definition(task_definition: name).task_definition.task_definition_arn
+    end
+
+    def put_rule
+      res = @cloud_watch_events.put_rule(
+        name: @rule_name,
+        schedule_expression: @schedule_expression,
+        state: @enabled ? "ENABLED" : "DISABLED",
+        description: @description,
+      )
+      EcsDeploy.logger.info "create cloudwatch event rule [#{res.rule_arn}] [#{@region}] [#{Paint['OK', :green]}]"
+    end
+
+    def put_targets
+      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,
+            },
+          }
+        ]
+      )
+      if res.failed_entry_count.zero?
+        EcsDeploy.logger.info "create cloudwatch event target [#{@target_id}] [#{@region}] [#{Paint['OK', :green]}]"
+      else
+        res.failed_entries.each do |entry|
+          EcsDeploy.logger.error "failed to create cloudwatch event target [#{@region}] target_id=#{entry.target_id} error_code=#{entry.error_code} error_message=#{entry.error_message}"
+        end
+        raise PutTargetsFailure
+      end
+    end
+  end
+end

data/lib/ecs_deploy/service.rb

@@ -3,6 +3,8 @@ require 'timeout'
 module EcsDeploy
   class Service
     CHECK_INTERVAL = 5
+    MAX_DESCRIBE_SERVICES = 10
+
     attr_reader :cluster, :region, :service_name
 
     def initialize(
@@ -36,7 +38,7 @@ module EcsDeploy
         task_definition: task_definition_name_with_revision,
         deployment_configuration: @deployment_configuration,
       }
-      if res.services.empty?
+      if res.services.select{ |s| s.status == 'ACTIVE' }.empty?
         service_options.merge!({
           service_name: @service_name,
           desired_count: @desired_count.to_i,
@@ -74,10 +76,11 @@ module EcsDeploy
     def self.wait_all_running(services)
       services.group_by { |s| [s.cluster, s.region] }.each do |(cl, region), ss|
         client = Aws::ECS::Client.new(region: region)
-        service_names = ss.map(&:service_name)
-        client.wait_until(:services_stable, cluster: cl, services: service_names) do |w|
-          w.before_attempt do
-            EcsDeploy.logger.info "wait service stable [#{service_names.join(", ")}]"
+        ss.map(&:service_name).each_slice(MAX_DESCRIBE_SERVICES) do |chunked_service_names|
+          client.wait_until(:services_stable, cluster: cl, services: chunked_service_names) do |w|
+            w.before_attempt do
+              EcsDeploy.logger.info "wait service stable [#{chunked_service_names.join(", ")}]"
+            end
           end
         end
       end

data/lib/ecs_deploy/task_definition.rb

@@ -11,7 +11,7 @@ module EcsDeploy
 
     def initialize(
       task_definition_name:, region: nil,
-      volumes: [], container_definitions: [],
+      network_mode: "bridge", volumes: [], container_definitions: [], placement_constraints: [],
       task_role_arn: nil
     )
       @task_definition_name = task_definition_name
@@ -28,6 +28,8 @@ module EcsDeploy
         cd
       end
       @volumes = volumes
+      @network_mode = network_mode
+      @placement_constraints = placement_constraints
 
       @client = Aws::ECS::Client.new(region: @region)
     end
@@ -43,13 +45,16 @@ module EcsDeploy
     end
 
     def register
-      @client.register_task_definition({
+      res = @client.register_task_definition({
         family: @task_definition_name,
+        network_mode: @network_mode,
         container_definitions: @container_definitions,
         volumes: @volumes,
+        placement_constraints: @placement_constraints,
         task_role_arn: @task_role_arn,
       })
       EcsDeploy.logger.info "register task definition [#{@task_definition_name}] [#{@region}] [#{Paint['OK', :green]}]"
+      res.task_definition
     end
 
     def run(info)

data/lib/ecs_deploy/version.rb

@@ -1,3 +1,3 @@
 module EcsDeploy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-30 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - lib/ecs_deploy/auto_scaler.rb
 - lib/ecs_deploy/capistrano.rb
 - lib/ecs_deploy/configuration.rb
+- lib/ecs_deploy/scheduled_task.rb
 - lib/ecs_deploy/service.rb
 - lib/ecs_deploy/task_definition.rb
 - lib/ecs_deploy/version.rb
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: AWS ECS deploy helper