hako 0.15.3 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6541f521311e717989be14fa03aa01cfaebdccc4
-  data.tar.gz: e41e27d8e2c03fa455572219e4c8145557ba7d78
+  metadata.gz: 7c78bf9739661a4f8020dadce5cd49efd68092f0
+  data.tar.gz: 731b2f7faec9a00225048cbbcfa3c3223326d15b
 SHA512:
-  metadata.gz: 655551f7212f9cbcc4f3bcc588e77a10010cd9e799355fc6c0ecdf0bf1313622b7cb809e6c130d667a5ccb61537f06d32b997ac0b7febe44ad6ec149803201a7
-  data.tar.gz: df72b0768cbb2b2dd88aa85d9e830d393fd5aa9bad6168e5beedadf2c00beeadc7fd5184016534a3d0b40f13be7d260269da0218eaf57596a508c946fa036b7e
+  metadata.gz: e7725a47c69273f2604a0039ec74a0a5d4d4a2c785642287689b6cec0ba58dc9ab790d1c659372de27fd1e34f18a878486b1abd5adb37e70ba4ec954683f893e
+  data.tar.gz: 511a77047f7c97c91114ab1dfad3b90828c1cdaf991c3476cf92eafc344197767b4109873b34ef8913e0e43c6c92e54d2657fcf85db4f978fa5af3ded2563a05

data/examples/hello.yml

@@ -3,6 +3,7 @@ scheduler:
   region: ap-northeast-1
   cluster: eagletmt
   desired_count: 2
+  task_role_arn: HelloRole
 app:
   image: ryotarai/hello-sinatra
   memory: 128

data/hako.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_dependency 'aws-sdk', '>= 2.1.0'
+  spec.add_dependency 'aws-sdk', '>= 2.3.22'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/hako/cli.rb

@@ -224,14 +224,15 @@ module Hako
     end
 
     class Remove
-      def run
+      def run(argv)
         parse!(argv)
         require 'hako/application'
         require 'hako/commander'
-        Commander.new(Application.new(@yaml_path)).remove
+        Commander.new(Application.new(@yaml_path)).remove(dry_run: @dry_run)
       end
 
       def parse!(argv)
+        @dry_run = false
         parser.parse!(argv)
         @yaml_path = argv.first
 
@@ -245,6 +246,7 @@ module Hako
         @parser ||= OptionParser.new do |opts|
           opts.banner = 'hako remove FILE'
           opts.version = VERSION
+          opts.on('-n', '--dry-run', 'Enable dry-run mode') { @dry_run = true }
         end
       end
     end

data/lib/hako/commander.rb

@@ -59,13 +59,14 @@ module Hako
 
     # @return [nil]
     def status
-      load_scheduler(@app.yaml['scheduler'], []).status
+      load_scheduler(@app.yaml['scheduler'], [], dry_run: false).status
     end
 
+    # @param [Boolean] dry_run
     # @return [nil]
-    def remove
+    def remove(dry_run:)
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
-      load_scheduler(@app.yaml['scheduler'], scripts).remove
+      load_scheduler(@app.yaml['scheduler'], scripts, dry_run: dry_run).remove
       scripts.each(&:after_remove)
     end
 
@@ -114,7 +115,7 @@ module Hako
     # @param [Boolean] force
     # @param [Boolean] dry_run
     # @return [Scheduler]
-    def load_scheduler(yaml, scripts, volumes: [], force: false, dry_run: false)
+    def load_scheduler(yaml, scripts, volumes: [], force: false, dry_run:)
       Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml, volumes: volumes, scripts: scripts, force: force, dry_run: dry_run)
     end
 

data/lib/hako/schedulers/ecs.rb

@@ -19,6 +19,7 @@ module Hako
         @desired_count = options.fetch('desired_count', nil)
         @region = options.fetch('region') { validation_error!('region must be set') }
         @role = options.fetch('role', nil)
+        @task_role_arn = options.fetch('task_role_arn', nil)
         @ecs_elb_options = options.fetch('elb', nil)
         @started_at = nil
         @container_instance_arn = nil
@@ -189,8 +190,14 @@ module Hako
       def remove
         service = describe_service
         if service
-          ecs_client.delete_service(cluster: @cluster, service: @app_id)
-          Hako.logger.info "#{service.service_arn} is deleted"
+          if @dry_run
+            Hako.logger.info "ecs_client.update_service(cluster: #{@cluster}, service: #{@app_id}, desired_count: 0)"
+            Hako.logger.info "ecs_client.delete_service(cluster: #{@cluster}, service: #{@app_id})"
+          else
+            ecs_client.update_service(cluster: @cluster, service: @app_id, desired_count: 0)
+            ecs_client.delete_service(cluster: @cluster, service: @app_id)
+            Hako.logger.info "#{service.service_arn} is deleted"
+          end
         else
           puts "Service #{@app_id} doesn't exist"
         end
@@ -212,7 +219,7 @@ module Hako
 
       # @return [EcsElb]
       def ecs_elb_client
-        @ecs_elb_client ||= EcsElb.new(@app_id, Aws::ElasticLoadBalancing::Client.new(region: @region), @ecs_elb_options)
+        @ecs_elb_client ||= EcsElb.new(@app_id, Aws::ElasticLoadBalancing::Client.new(region: @region), @ecs_elb_options, dry_run: @dry_run)
       end
 
       # @return [Aws::ECS::Types::Service, nil]
@@ -284,6 +291,9 @@ module Hako
           container_definitions[c.name] = c
         end
 
+        if task_definition.task_role_arn != @task_role_arn
+          return true
+        end
         if different_volumes?(task_definition.volumes)
           return true
         end
@@ -328,6 +338,7 @@ module Hako
         if task_definition_changed?(@app_id, definitions)
           ecs_client.register_task_definition(
             family: @app_id,
+            task_role_arn: @task_role_arn,
             container_definitions: definitions,
             volumes: volumes_definition,
           ).task_definition
@@ -351,6 +362,7 @@ module Hako
         if task_definition_changed?(family, definitions)
           ecs_client.register_task_definition(
             family: "#{@app_id}-oneshot",
+            task_role_arn: @task_role_arn,
             container_definitions: definitions,
             volumes: volumes_definition,
           ).task_definition

data/lib/hako/schedulers/ecs_elb.rb

@@ -8,10 +8,12 @@ module Hako
       # @param [String] app_id
       # @param [Aws::ElasticLoadBalancing::Client] elb
       # @param [Hash] elb_config
-      def initialize(app_id, elb, elb_config)
+      # @param [Boolean] dry_run
+      def initialize(app_id, elb, elb_config, dry_run:)
         @app_id = app_id
         @elb = elb
         @elb_config = elb_config
+        @dry_run = dry_run
       end
 
       # @return [Aws::ElasticLoadBalancing::Types::LoadBalancerDescription]
@@ -49,8 +51,12 @@ module Hako
       # @return [nil]
       def destroy
         if exist?
-          @elb.delete_load_balancer(load_balancer_name: name)
-          Hako.logger.info "Deleted ELB #{name}"
+          if @dry_run
+            Hako.logger.info("@elb.delete_load_balancer(load_balancer_name: #{name})")
+          else
+            @elb.delete_load_balancer(load_balancer_name: name)
+            Hako.logger.info "Deleted ELB #{name}"
+          end
         else
           Hako.logger.info "ELB #{name} doesn't exist"
         end

data/lib/hako/script.rb

@@ -37,6 +37,9 @@ module Hako
     def oneshot_finished(_containers)
     end
 
+    def after_remove
+    end
+
     private
 
     # @param [Hash] _options

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.15.3'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-07-14 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.1.0
+        version: 2.3.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.22
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement