hako 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee95e37d80652b4fab57fff012c2b40e0b8ee5d2
-  data.tar.gz: 30ddde0b682e1dc63d1119c1de91c7bb2dc3dacf
+  metadata.gz: 1a1f4be2a7a0950001e3c6dbcbb4f76e88460b7b
+  data.tar.gz: d43f1b995730e81462c597377d03a7ccb3ce9e6d
 SHA512:
-  metadata.gz: 59d03d5f2422b3fb21dcc20db36cc850a49ac6fab2af338b94db6946a6a0b01fa8d2ffdb2252a7e8b12be245de4899e391182d082d07a54d4e43ed150f8e2e6a
-  data.tar.gz: d8cc1d44728b3c9a64287a9e82d6633fb24bca4ff3a638a1b540251d5df02d05dd3c4be0849c4d8c5ac0bfce6be5a5d5a06b54c95abcde33dc162a6af435bb92
+  metadata.gz: 1597c0176b534aec392c471f8aa51eb6eee9fcd608801a6e2f2d5ff68b96c36bf757d5685483b1faa010cda23cb229fe3fa89549da2a7eff59cacb692c1a6650
+  data.tar.gz: ddcc12d26dd752be52164fb862f410843fd21ab0ed03fa6431486fbe36805fd7ea0a989f075081cd65f732afc440b1afc2ed3f35afd5dde60d82ce6aed6bbfaf

data/lib/hako/schedulers/ecs.rb

@@ -211,6 +211,9 @@ module Hako
             ecs_client.delete_service(cluster: @cluster, service: @app_id)
             Hako.logger.info "#{service.service_arn} is deleted"
           end
+          if @autoscaling
+            @autoscaling.remove(service)
+          end
         else
           puts "Service #{@app_id} doesn't exist"
         end

data/lib/hako/schedulers/ecs_autoscaling.rb

@@ -22,7 +22,7 @@ module Hako
       # @param [Aws::ECS::Types::Service] service
       # @return [nil]
       def apply(service)
-        resource_id = "service/#{service.cluster_arn.slice(%r{[^/]+\z}, 0)}/#{service.service_name}"
+        resource_id = service_resource_id(service)
         service_namespace = 'ecs'
         scalable_dimension = 'ecs:service:DesiredCount'
 
@@ -77,6 +77,24 @@ module Hako
         nil
       end
 
+      # @param [Aws::ECS::Types::Service] service
+      # @return [nil]
+      def remove(service)
+        resource_id = service_resource_id(service)
+        service_namespace = 'ecs'
+        scalable_dimension = 'ecs:service:DesiredCount'
+
+        Hako.logger.info("Deregister scalable target #{resource_id} and its policies")
+        unless @dry_run
+          begin
+            autoscaling_client.deregister_scalable_target(service_namespace: service_namespace, resource_id: resource_id, scalable_dimension: scalable_dimension)
+          rescue Aws::ApplicationAutoScaling::Errors::ObjectNotFoundException => e
+            Hako.logger.warn(e)
+          end
+        end
+        nil
+      end
+
       private
 
       # @param [Hash] options
@@ -96,6 +114,12 @@ module Hako
         @cw_client ||= Aws::CloudWatch::Client.new
       end
 
+      # @param [Aws::ECS::Types::Service] service
+      # @return [String]
+      def service_resource_id(service)
+        "service/#{service.cluster_arn.slice(%r{[^/]+\z}, 0)}/#{service.service_name}"
+      end
+
       class Policy
         attr_reader :alarms, :cooldown, :adjustment_type, :scaling_adjustment, :metric_interval_lower_bound, :metric_interval_upper_bound, :metric_aggregation_type
 

data/lib/hako/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Kohei Suzuki