ecs_compose 0.1.0.pre10 → 0.1.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3cd0b018b8b9b888c1122557c0a161334766b53
-  data.tar.gz: 16060721d639f8d4476873f03b41a34a18f68648
+  metadata.gz: d921f9b7cfc815df0f612407f5c4b6a5eb36a242
+  data.tar.gz: 517f89b2d4b32570307fb789370270b24a211882
 SHA512:
-  metadata.gz: b64b87966680476d655a08de539f3f7d9ff1e6bdb043bdca0e98fff3c8becbe3162c656818385da9e62a7970146c2e55b97e234995b683350b9894628e1974be
-  data.tar.gz: 089581fab759d2710fd2e74d913fec10dcdf1a6a0e8ca6fb182f019d8ceece2637f4929a01bbfafae6b73a81fdc1e8874b1047804d4c74136ce9a663fc800b20
+  metadata.gz: 850739a8d7a033f072c3b8a764a967d428cc28d7402ac69fc002d57e57bb5414cb260945c655023388fa96a5f2b11a75aa3243f99607716db4c7944bc626490f
+  data.tar.gz: 90a241bc97e878262a503e6310ff30fc8a4bf2b31bb15c05c9f1ee5e690250386b95ad2b4750ae8d7704ea3ff5ce100e6c6ce5180fe534253cf30521aa3dc775

data/exe/ecs-compose

@@ -186,6 +186,9 @@ end
 # Run our application.
 begin
   App.new.run
+rescue EcsCompose::TaskError => e
+  puts e.message.red
+  exit(1)
 rescue Docopt::Exit => e
   puts e.message
   exit(1)

data/lib/ecs_compose/ecs.rb

@@ -18,12 +18,16 @@ module EcsCompose
     # Run `aws ecs` with the specified arguments.
     def self.run(*args)
       command = ["aws", "ecs"] + args + ["--output", "json"]
-      puts "→ #{command.join(' ').blue}"
+      STDERR.puts "→ #{command.join(' ').blue}"
       stdout, status = Open3.capture2(*command)
       if status != 0
         raise "Error running: #{command.inspect}"
       end
-      JSON.parse(stdout)
+      if stdout.empty?
+        nil
+      else
+        JSON.parse(stdout)
+      end
     end
 
     # Register the specified task definition (passed as JSON data).
@@ -57,5 +61,15 @@ module EcsCompose
           "--task-definition", task_definition,
           *extra_args)
     end
+
+    def self.wait_tasks_stopped(*arns)
+      run("wait", "tasks-stopped",
+          "--tasks", arns.join(" "))
+    end
+
+    def self.describe_tasks(*arns)
+      run("describe-tasks",
+          "--tasks", arns.join(" "))
+    end
   end
 end

data/lib/ecs_compose/json_generator.rb

@@ -36,7 +36,9 @@ module EcsCompose
           json = {
             "name" => name,
             "image" => fields.fetch("image"),
-            # Default to a tiny guaranteed CPU share.
+            # Default to a tiny guaranteed CPU share.  Currently, 2 is the
+            # smallest meaningful value, and various ECS tools will round
+            # smaller numbers up.
             "cpu" => fields["cpu_shares"] || 2,
             "memory" => mem_limit_to_mb(fields.fetch("mem_limit")),
             "links" => fields["links"] || [],

data/lib/ecs_compose/task_definition.rb

@@ -21,7 +21,7 @@ module EcsCompose
     # Returns a string of the form `"name:revision"` identifying the task
     # we registered.
     def register
-      reg = EcsCompose::Ecs.register_task_definition(to_json)
+      reg = Ecs.register_task_definition(to_json)
         .fetch("taskDefinition")
       "#{reg.fetch('family')}:#{reg.fetch('revision')}"
     end
@@ -29,14 +29,20 @@ module EcsCompose
     # Register this task definition with ECS, and update the corresponding
     # service.
     def update
-      EcsCompose::Ecs.update_service(name, register)
+      Ecs.update_service(name, register)
     end
 
     # Run this task definition as a one-shot ECS task, with the specified
     # overrides.
     def run(**args)
       overrides_json = json_generator.generate_override_json(**args)
-      EcsCompose::Ecs.run_task(register, overrides_json: overrides_json)
+      info = Ecs.run_task(register, overrides_json: overrides_json)
+      arn = info.fetch("tasks")[0].fetch("taskArn")
+      #STDERR.puts("Running as: #{arn}")
+
+      # Wait until the task has finished running and check for errors.
+      Ecs.wait_tasks_stopped(arn)
+      TaskError.fail_on_errors(Ecs.describe_tasks(arn))
     end
 
     # Generate ECS task definition JSON for this instance.
@@ -48,7 +54,7 @@ module EcsCompose
 
     # Return a JSON generator for this task.
     def json_generator
-      @json_generator ||= EcsCompose::JsonGenerator.new(name, yaml)
+      @json_generator ||= JsonGenerator.new(name, yaml)
     end
   end
 end

data/lib/ecs_compose/task_error.rb

@@ -0,0 +1,45 @@
+module EcsCompose
+  # We raise this error if `aws ecs describe-tasks` indicates that a
+  # process has failed.
+  class TaskError < RuntimeError
+    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|
+        task.fetch("containers").map do |container|
+          container_error(container)
+        end
+      end.flatten.compact
+      errs = errs1 + errs2
+      unless errs.empty?
+        raise new(errs)
+      end
+    end
+
+    #:nodoc:
+    def self.container_error(container)
+      exit_code = container.fetch("exitCode")
+      name = container.fetch("name")
+      if exit_code == 0
+        nil
+      elsif container.has_key?("reason")
+        "#{name}: #{container.fetch("reason")}"
+      else
+        "#{name}: exited with code #{exit_code}"
+      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,7 @@
 require "ecs_compose/version"
 require "ecs_compose/json_generator"
 require "ecs_compose/ecs"
+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.pre10
+  version: 0.1.0.pre11
 platform: ruby
 authors:
 - Eric Kidd
@@ -108,6 +108,7 @@ files:
 - lib/ecs_compose/json_generator.rb
 - lib/ecs_compose/manifest.rb
 - lib/ecs_compose/task_definition.rb
+- lib/ecs_compose/task_error.rb
 - lib/ecs_compose/version.rb
 - publish.sh
 homepage: https://github.com/faradayio/ecs_compose