ecs_compose 0.1.0.pre12 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9631893f24b9aefdc6fba876721e9cdfb52b2635
-  data.tar.gz: 5aea13e1e6d140ead8708fa72d3480fa630e4020
+  metadata.gz: a2272a942dcbab9f8fcac63a3dbc542c68fd86ac
+  data.tar.gz: 3f001cc3617347d0f5481a30dc75562763ae0990
 SHA512:
-  metadata.gz: 3ddee4ff7648921d0015e29e4aa6190814da7a5119170821509ff42402f8c43b353d80aed6679012afc3151ebb05c1554d5aed3d8e7384289b2e75fc82e5b3ae
-  data.tar.gz: d4638ac13bcf415d2cf4e19c7568e9d3636b335a2ee355a99a42be8e63243018d2d46ebf11e83dc416dbe667d2cdfe7dcf20ca99292dce9709a0d41e8ed8f412
+  metadata.gz: 7f4b853b2e3260adb594529a9bdd21c7999358beac5c0828ab1ecc09c70e8301bae844459ec9d24adf3764832895d55f95b0a9b0689eb45a07a6ad86e7f2406a
+  data.tar.gz: 68d28497bb0ee507e6749a22ccad039eb1e737c2d77e489ef798c710e516747676279d31b7e700bdfaa6678b24cbc8a0d2a9da12837b34fc855bc8fb8b40120d

data/lib/ecs_compose/deployment_error.rb

@@ -0,0 +1,18 @@
+module EcsCompose
+  # Common superclass of TaskError and ServiceError.
+  class DeploymentError < RuntimeError
+    #:nodoc:
+    def self.failure_error(failure)
+      "#{failure.fetch("reason")} (resource: #{failure.fetch("arn")})"
+    end
+
+    attr_reader :messages
+
+    # Create a new task error with one or more messages.
+    def initialize(messages)
+      message = (["ECS deployment errors occurred:"] + messages).join("\n- ")
+      super(message)
+      @messages = messages
+    end
+  end
+end

data/lib/ecs_compose/ecs.rb

@@ -76,6 +76,12 @@ module EcsCompose
           "--tasks", *arns)
     end
 
+    # Describe a set of services as JSON.
+    def self.describe_services(services)
+      run("describe-services",
+          "--services", *services)
+    end
+
     # Describe a set of tasks as JSON.
     def self.describe_tasks(arns)
       run("describe-tasks",

data/lib/ecs_compose/service_error.rb

@@ -0,0 +1,30 @@
+module EcsCompose
+  # We raise this error if `aws ecs describe-services` indicates that a
+  # service has failed to stablize.
+  class ServiceError < DeploymentError
+    # Raise an error if any of the described services failed to stabilize.
+    def self.fail_if_not_stabilized(service_descriptions)
+      failures = service_descriptions.fetch("failures")
+      services = service_descriptions.fetch("services")
+
+      errs1 = failures.map {|f| failure_error(f) }
+
+      errs2 = services.select do |s|
+        s.fetch("deployments").length != 1
+      end.map do |s|
+        "#{s.fetch("serviceName")}: multiple versions still deployed (see AWS console for details)"
+      end
+
+      errs3 = services.select do |s|
+        s.fetch("desiredCount") != s.fetch("runningCount")
+      end.map do |s|
+        "#{s.fetch("serviceName")}: #{s.fetch("desiredCount")} instances desired, #{s.fetch("runningCount")} running (see AWS console for details)"
+      end
+
+      errs = errs1 + errs2 + errs3
+      unless errs.empty?
+        raise new(errs)
+      end
+    end
+  end
+end

data/lib/ecs_compose/task_definition.rb

@@ -36,7 +36,11 @@ module EcsCompose
     # Wait for a set of services to reach a steady state.
     def self.wait_for_services(service_names)
       Ecs.wait_services_stable(service_names)
-      # TODO: Check for errors during stabilization.
+      # TODO: We never actually get here if the services don't stabilize,
+      # because wait_services_stable will fail with `Waiter ServicesStable
+      # failed: Max attempts`.  But we're keeping this code until we
+      # implement event polling and our own version of waiting.
+      ServiceError.fail_if_not_stabilized(Ecs.describe_services(service_names))
     end
 
     # Run this task definition as a one-shot ECS task, with the specified

data/lib/ecs_compose/task_error.rb

@@ -1,7 +1,8 @@
 module EcsCompose
   # We raise this error if `aws ecs describe-tasks` indicates that a
   # process has failed.
-  class TaskError < RuntimeError
+  class TaskError < DeploymentError
+    # Raise an error if any of the descriped tasks failed.
     def self.fail_on_errors(task_descriptions)
       errs1 = task_descriptions.fetch("failures").map {|f| failure_error(f) }
       errs2 = task_descriptions.fetch("tasks").map do |task|
@@ -28,18 +29,5 @@ module EcsCompose
       end
     end
 
-    #:nodoc:
-    def self.failure_error(failure)
-      "#{failure.fetch("reason")} (resource: #{failure.fetch("arn")})"
-    end
-
-    attr_reader :messages
-
-    # Create a new task error with one or more messages.
-    def initialize(messages)
-      message = (["Errors running tasks:"] + messages).join("\n- ")
-      super(message)
-      @messages = messages
-    end
   end
 end

data/lib/ecs_compose.rb

@@ -1,6 +1,8 @@
 require "ecs_compose/version"
 require "ecs_compose/json_generator"
 require "ecs_compose/ecs"
+require "ecs_compose/deployment_error"
+require "ecs_compose/service_error"
 require "ecs_compose/task_error"
 require "ecs_compose/task_definition"
 require "ecs_compose/manifest"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre12
+  version: 0.1.0.pre13
 platform: ruby
 authors:
 - Eric Kidd
@@ -104,9 +104,11 @@ files:
 - exe/ecs-compose
 - go-publish.sh
 - lib/ecs_compose.rb
+- lib/ecs_compose/deployment_error.rb
 - lib/ecs_compose/ecs.rb
 - lib/ecs_compose/json_generator.rb
 - lib/ecs_compose/manifest.rb
+- lib/ecs_compose/service_error.rb
 - lib/ecs_compose/task_definition.rb
 - lib/ecs_compose/task_error.rb
 - lib/ecs_compose/version.rb