ecs_compose 0.1.0.pre14 → 0.1.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 258ad2a5c72320cfcddc857c2ef3bb65b514191b
-  data.tar.gz: ddde11787a6c3b444715af2f5139c2e27a00e631
+  metadata.gz: 3dc8bf5ed177981cdbfc662042cd9e67a5e2c9b1
+  data.tar.gz: 8d297607c1bdb1fc442832e1c64c8bf896cc053a
 SHA512:
-  metadata.gz: ddf8db17be5df23a2afa7cd5b968efbc8cdcada1e7321f3d345c528509e431ce06cca31fd140c0b2ff7cd3edacc5b4bf6b8e255a13d83b4dbc8902a100e27b7c
-  data.tar.gz: aa1d015f363ed9590c42b75decd8d479b25cd22eb8d5379bd62b5cdc2dfc9c43328e501445ba78f407d4e0daf2457613509c5deba635772bdfd290444afdb61e
+  metadata.gz: d7b7e7285cd236537a5869df7274b55f964ab16eb753b087dd58a6b00a871c2212bbf324e143830a42f587f03262a8a612727ab745af060515392cf7277566f0
+  data.tar.gz: ee6b648d01d48a55cb93cf7a2f2574510c33ad97acb5d13b993aeb02312643c5537ca45840e14ace98c5c2b5a15bea279c1ddd88baee5c09de59a3d99a9d01e3

data/exe/ecs-compose

@@ -26,6 +26,7 @@ Options:
   -i, --file-info (task:<name> | service:<name>)
                       Specify the task type and task name for a
                       docker-compose.yml file
+  --cluster <cluster> ECS cluster to use [default: default]
   -e <name>=<value>   Set an environment variable
   --entrypoint <entrypoint>
                       Override the container's regular entrypoint (NOT CURRENTLY
@@ -47,10 +48,12 @@ class App
   DEFAULT_FILE = "docker-compose.yml"
   DEFAULT_MANIFEST = "deploy/DEPLOY-MANIFEST.yml"
 
-  attr_reader :options, :manifest
+  attr_reader :options, :cluster, :manifest
 
   def initialize
     @options = Docopt::docopt(USAGE, version: EcsCompose::VERSION)
+    # Docopt.rb does not actually support [default: ...] correctly!
+    @cluster = EcsCompose::Cluster.new(options.fetch('--cluster') || "default")
     @manifest = load_manifest()
 
     # Uncomment to dump the docopt parser output, which can be non-obvious.
@@ -81,8 +84,8 @@ class App
   def command_up
     available = manifest.task_definitions.select {|td| td.type == :service }
     chosen = all_or_specified(available, options.fetch('<service>'))
-    services = chosen.map {|td| td.update }
-    EcsCompose::TaskDefinition.wait_for_services(services)
+    services = chosen.map {|td| td.update(cluster) }
+    EcsCompose::TaskDefinition.wait_for_services(cluster, services)
   end
 
   def command_run
@@ -107,10 +110,11 @@ class App
     command = options.fetch('<arg>')
     command = nil if command.empty?
 
-    arn = task.run(environment: env,
+    arn = task.run(cluster,
+                   environment: env,
                    entrypoint: options.fetch('--entrypoint').flatten[0],
                    command: command)
-    EcsCompose::TaskDefinition.wait_for_tasks([arn])
+    EcsCompose::TaskDefinition.wait_for_tasks(cluster, [arn])
   end
 
   def command_scale
@@ -132,9 +136,9 @@ class App
     service_names = scales.map do |name, count|
       service = available.find {|td| td.name == name } or
         raise "Unknown service: #{name}"
-      service.scale(count)
+      service.scale(cluster, count)
     end
-    EcsCompose::TaskDefinition.wait_for_services(service_names)
+    EcsCompose::TaskDefinition.wait_for_services(cluster, service_names)
   end
 
   def command_json

data/lib/ecs_compose/cluster.rb

@@ -0,0 +1,9 @@
+module EcsCompose
+  class Cluster
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+  end
+end

data/lib/ecs_compose/ecs.rb

@@ -47,51 +47,58 @@ module EcsCompose
 
     # Update the specified service.  Sample args: `"frontend"`,
     # `"frontend:7"`.
-    def self.update_service(service, task_definition)
+    def self.update_service(cluster, service, task_definition)
       run("update-service",
+          "--cluster", cluster,
           "--service", service,
           "--task-definition", task_definition)
     end
 
     # Update the specified service.  Sample args: `"frontend"`, `3`.
-    def self.update_service_desired_count(service, desired_count)
+    def self.update_service_desired_count(cluster, service, desired_count)
       run("update-service",
+          "--cluster", cluster,
           "--service", service,
           "--desired-count", desired_count.to_s)
     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)
+    def self.run_task(cluster, task_definition, overrides_json: nil)
       extra_args = []
       extra_args.concat(["--overrides", overrides_json]) if overrides_json
       run("run-task",
+          "--cluster", cluster,
           "--task-definition", task_definition,
           *extra_args)
     end
 
     # Wait until all of the specified services have reached a stable state.
     # Returns nil.
-    def self.wait_services_stable(services)
+    def self.wait_services_stable(cluster, services)
       run("wait", "services-stable",
+          "--cluster", cluster,
           "--services", *services)
     end
 
     # Wait until all of the specified tasks have stopped.  Returns nil.
-    def self.wait_tasks_stopped(arns)
+    def self.wait_tasks_stopped(cluster, arns)
       run("wait", "tasks-stopped",
+          "--cluster", cluster,
           "--tasks", *arns)
     end
 
     # Describe a set of services as JSON.
-    def self.describe_services(services)
+    def self.describe_services(cluster, services)
       run("describe-services",
+          "--cluster", cluster,
           "--services", *services)
     end
 
     # Describe a set of tasks as JSON.
-    def self.describe_tasks(arns)
+    def self.describe_tasks(cluster, arns)
       run("describe-tasks",
+          "--cluster", cluster,
           "--tasks", *arns)
     end
   end

data/lib/ecs_compose/task_definition.rb

@@ -28,39 +28,41 @@ module EcsCompose
 
     # Register this task definition with ECS, and update the corresponding
     # service.
-    def update
-      Ecs.update_service(name, register)
+    def update(cluster)
+      Ecs.update_service(cluster.name, name, register)
       name
     end
 
     # Set the number of running copies of a service we want to have.
-    def scale(count)
-      Ecs.update_service_desired_count(name, count)
+    def scale(cluster, count)
+      Ecs.update_service_desired_count(cluster.name, name, count)
       name
     end
 
     # Wait for a set of services to reach a steady state.
-    def self.wait_for_services(service_names)
-      Ecs.wait_services_stable(service_names)
+    def self.wait_for_services(cluster, service_names)
+      Ecs.wait_services_stable(cluster.name, service_names)
       # 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))
+      descriptions = Ecs.describe_services(cluster.name, service_names)
+      ServiceError.fail_if_not_stabilized(descriptions)
     end
 
     # Run this task definition as a one-shot ECS task, with the specified
     # overrides.
-    def run(**args)
+    def run(cluster, **args)
       overrides_json = json_generator.generate_override_json(**args)
-      info = Ecs.run_task(register, overrides_json: overrides_json)
+      info = Ecs.run_task(cluster.name, register,
+                          overrides_json: overrides_json)
       info.fetch("tasks")[0].fetch("taskArn")
     end
 
     # Wait for a set of tasks to finish, and raise an error if they fail.
-    def self.wait_for_tasks(task_arns)
-      Ecs.wait_tasks_stopped(task_arns)
-      TaskError.fail_on_errors(Ecs.describe_tasks(task_arns))
+    def self.wait_for_tasks(cluster, task_arns)
+      Ecs.wait_tasks_stopped(cluster.name, task_arns)
+      TaskError.fail_on_errors(Ecs.describe_tasks(cluster.name, task_arns))
     end
 
     # Generate ECS task definition JSON for this instance.

data/lib/ecs_compose.rb

@@ -4,6 +4,7 @@ require "ecs_compose/ecs"
 require "ecs_compose/deployment_error"
 require "ecs_compose/service_error"
 require "ecs_compose/task_error"
+require "ecs_compose/cluster"
 require "ecs_compose/task_definition"
 require "ecs_compose/manifest"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre14
+  version: 0.1.0.pre15
 platform: ruby
 authors:
 - Eric Kidd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -104,6 +104,7 @@ files:
 - exe/ecs-compose
 - go-publish.sh
 - lib/ecs_compose.rb
+- lib/ecs_compose/cluster.rb
 - lib/ecs_compose/deployment_error.rb
 - lib/ecs_compose/ecs.rb
 - lib/ecs_compose/json_generator.rb