ecs_compose 0.1.0.pre9 → 0.1.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97bee1ba4d301b7508fda9f624e739a4ba411929
-  data.tar.gz: 104f5b9e4f4ea8c0da05b8b530157b49826d4e9c
+  metadata.gz: f3cd0b018b8b9b888c1122557c0a161334766b53
+  data.tar.gz: 16060721d639f8d4476873f03b41a34a18f68648
 SHA512:
-  metadata.gz: 5e2a62625471bebdfb4ebde7811543b5086ede67c28e6e5c0563420f9d353f155f71271503f95f4ce2b188361cd5246f1a50c692f84fd0f893749542445a4dea
-  data.tar.gz: 1a76b2dbdb523e95bff256958e25f476c20796b401951898bfeecba912f9888dba71507d4760662724981fc9b432d6adfbfcd53d688e957da0d0b10bd0f16c57
+  metadata.gz: b64b87966680476d655a08de539f3f7d9ff1e6bdb043bdca0e98fff3c8becbe3162c656818385da9e62a7970146c2e55b97e234995b683350b9894628e1974be
+  data.tar.gz: 089581fab759d2710fd2e74d913fec10dcdf1a6a0e8ca6fb182f019d8ceece2637f4929a01bbfafae6b73a81fdc1e8874b1047804d4c74136ce9a663fc800b20

data/exe/ecs-compose

@@ -11,7 +11,7 @@ Usage:
   ecs-compose --version
   ecs-compose [options] register [<task_def>...]
   ecs-compose [options] up [<service>...]
-  ecs-compose [options] run [-e <name>=<value>]... [--entrypoint <entrypoint>] <task> [--] [<arg>...]
+  ecs-compose [options] run [-e <name>=<value>]... [--entrypoint <entrypoint>] <task> [-- [<arg>...]]
   ecs-compose [options] json [<task_def>]
 
 Options:
@@ -27,7 +27,8 @@ Options:
                       docker-compose.yml file
   -e <name>=<value>   Set an environment variable
   --entrypoint <entrypoint>
-                      Override the container's regular entrypoint
+                      Override the container's regular entrypoint (NOT CURRENTLY
+                      SUPPORTED BY ECS)
 
 Commands:
   register  Registers the specified ECS task definitions (defaults to all)
@@ -72,7 +73,7 @@ class App
   def command_register
     available = manifest.task_definitions
     chosen = all_or_specified(available, options.fetch('<task_def>'))
-    chosen.each {|td| td.register }
+    chosen.each {|td| puts(td.register) }
   end
 
   def command_up
@@ -82,6 +83,12 @@ class App
   end
 
   def command_run
+    # Work around docopt lossage.
+    dashes = options.fetch('--')
+    if dashes && dashes != '--'
+      fatal_err "The '--' option to run is mandatory for now"
+    end
+
     available = manifest.task_definitions.select {|td| td.type == :task }
     task_name = options.fetch('<task>')
     task = available.find {|td| td.name == task_name } or

data/lib/ecs_compose/ecs.rb

@@ -47,5 +47,15 @@ module EcsCompose
           "--service", service,
           "--task-definition", task_definition)
     end
+
+    # Run a one-off task.  Sample args: `"migrator:1"`.  The overrides may
+    # be specified in the JSON format used by `aws ecs run-task`.
+    def self.run_task(task_definition, overrides_json: nil)
+      extra_args = []
+      extra_args.concat(["--overrides", overrides_json]) if overrides_json
+      run("run-task",
+          "--task-definition", task_definition,
+          *extra_args)
+    end
   end
 end

data/lib/ecs_compose/json_generator.rb

@@ -86,6 +86,42 @@ module EcsCompose
       JSON.generate(generate())
     end
 
+    # Generate an `--overrides` value for use with with `aws ecs run-task`
+    # as a raw Ruby hash.
+    def generate_override(environment: {}, entrypoint: nil, command: nil)
+      # Right now, we only support overriding for single-container tasks, so
+      # find our single container if we have it.
+      if @yaml.length != 1
+        raise "Can only override task attributes for single-container tasks"
+      end
+      name = @yaml.keys.first
+      container_overrides = { "name" => name }
+
+      # Apply any environment overrides.
+      if environment && !environment.empty?
+        container_overrides["environment"] = environment.map do |k, v|
+          { "name" => k, "value" => v }
+        end
+      end
+
+      # Apply any other overrides.
+      container_overrides["command"] = command if command
+      # TODO: This may not actually be supported by AWS yet.
+      container_overrides["entryPoint"] = entrypoint if entrypoint
+
+      # Return nil if we haven't generated any actual overrides.
+      if container_overrides.length > 1
+        { "containerOverrides" => [ container_overrides ] }
+      else
+        nil
+      end
+    end
+
+    # Like generate, but return serialized JSON.
+    def generate_override_json(**args)
+      JSON.generate(generate_override(**args))
+    end
+
     protected
 
     # Parse a Docker-style `mem_limit` and convert to megabytes.

data/lib/ecs_compose/task_definition.rb

@@ -18,25 +18,25 @@ module EcsCompose
 
     # Register this task definition with ECS.  Will create the task
     # definition if it doesn't exist, and add a new version of the task.
+    # Returns a string of the form `"name:revision"` identifying the task
+    # we registered.
     def register
-      EcsCompose::Ecs.register_task_definition(to_json)
+      reg = EcsCompose::Ecs.register_task_definition(to_json)
+        .fetch("taskDefinition")
+      "#{reg.fetch('family')}:#{reg.fetch('revision')}"
     end
 
     # Register this task definition with ECS, and update the corresponding
     # service.
     def update
-      reg = register["taskDefinition"]
-      task_def = "#{reg.fetch('family')}:#{reg.fetch('revision')}"
-      EcsCompose::Ecs.update_service(name, task_def)
+      EcsCompose::Ecs.update_service(name, register)
     end
 
     # Run this task definition as a one-shot ECS task, with the specified
     # overrides.
-    def run(environment: {}, entrypoint: nil, command: nil)
-      puts "environment: #{environment.inspect}"
-      puts "entrypoint: #{entrypoint.inspect}"
-      puts "command: #{command.inspect}"
-      raise "Not yet implemented"
+    def run(**args)
+      overrides_json = json_generator.generate_override_json(**args)
+      EcsCompose::Ecs.run_task(register, overrides_json: overrides_json)
     end
 
     # Generate ECS task definition JSON for this instance.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre9
+  version: 0.1.0.pre10
 platform: ruby
 authors:
 - Eric Kidd