deployme 0.1.7.1 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f67f8952d4472988ebc74e81e1d152bf9fc706efb5fb335f31598f6d688857db
-  data.tar.gz: e9f0914f227cadc9b7911725508f67a3c6e4c97f565494c2c4f33ca254a4ca90
+  metadata.gz: d88a687ff8a42bb4bf51888ea7a1c06a71fcc1ab1e643e27a37e4428fa6b1f8e
+  data.tar.gz: cb118e9220e28dc1bf457f589d1d7cd8db6b2b3f0f4633beddf56a20ced5f722
 SHA512:
-  metadata.gz: b7a52660ca38c8e2f49dea1b60a9e16d3bb01dcfcb59a72b681f2be92f64342e30925afed2fe5a9b7a230530e659efbc41aeeb850756599adb3863ef3a8e888a
-  data.tar.gz: 2329b6c0ecab4f980b1befa3488d36bdd02ab75e24b97c14d691767ccace4dbbea2cf6a634cd92b7fe63f767cd51fcb6c08cdb628b4222eef133b17c0635d9d4
+  metadata.gz: 4e0aaa3ddf5da73656bdfce837c08816739fa987c9149178adebf7078958ce59240d37749e3db05fa0f756ed9bbe6693a572f538eca1bfb19d9ca8f396e55d97
+  data.tar.gz: 5f04ced6a281f9520ef1ffefb50ef6556ff8f582adf3f36dccd8bd86b3956bddc68dcc741c8083d0eb1c700e1daca9601b76634b2bee8336dd0679ac6ce9a5fe

data/lib/core_ext/aws_ecs_client.rb

@@ -2,9 +2,11 @@ require 'aws-sdk-ecs'
 
 class Aws::ECS::Client # rubocop:disable Style/ClassAndModuleChildren
   def upsert_service(options)
-    send(:update_service, options)
-  rescue Aws::ECS::Errors::ServiceNotFoundException, Aws::ECS::Errors::ServiceNotActiveException
-    options[:service_name] = options.delete(:service)
-    send(:create_service, options)
+    if describe_services(cluster: options[:cluster], services: [options[:service]]).services.count.zero?
+      options[:service_name] = options.delete(:service)
+      send(:create_service, options)
+    else
+      send(:update_service, options)
+    end
   end
 end

data/lib/deployme/providers/ecs.rb

@@ -5,7 +5,7 @@ module Deployme
     class Ecs < Provider
       def self.options(parser)
         parser.on('--ecs-image=IMAGE_TAG', String, 'Image tag to use for deployment') { |options, value| options.ecs_image = value }
-        parser.on('--ecs-cluster=NAME', String, 'ECS Cluster name to deploy to')   { |options, value| options.ecs_cluster = value }
+        parser.on('--ecs-cluster=NAME', String, 'ECS Cluster name to deploy to') { |options, value| options.ecs_cluster = value }
       end
 
       def execute
@@ -30,7 +30,7 @@ module Deployme
       end
 
       def register_services
-        config[:services].each do |service|
+        services = config[:services].map do |service|
           logger.info "Registering Service #{service[:name]}"
           task_definition = task_definitions[service[:task_family].to_sym]
 
@@ -43,6 +43,18 @@ module Deployme
           )
 
           logger.info "Success: #{response.service.status}"
+          response.service.service_arn
+        end
+
+        begin
+          client.wait_until(:services_stable, cluster: options.ecs_cluster, services: services) do |w|
+            w.before_wait do
+              logger.info 'Waiting for services to stable...'
+            end
+          end
+        rescue Aws::Waiters::Errors::WaiterFailed => error
+          logger.error "failed waiting for service: #{error.message}"
+          exit(1)
         end
       end
 

data/lib/deployme/version.rb

@@ -1,3 +1,3 @@
 module Deployme
-  VERSION = '0.1.7.1'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deployme
 version: !ruby/object:Gem::Version
-  version: 0.1.7.1
+  version: 0.1.8
 platform: ruby
 authors:
 - Mikko Kokkonen