ecs_compose 0.1.0.pre22 → 0.1.0.pre23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80275b619f65f41b6ee381a7de76901d691c78c5
-  data.tar.gz: 3488a74fe16c5a9bb737c805463b013dc4e74fbb
+  metadata.gz: 44652fed3e1b8e9b49392f9d042291e8cbc9ed67
+  data.tar.gz: 017482c7d7f0937820b20e243562de13e4a742be
 SHA512:
-  metadata.gz: bd401ef52fde780548729ea6c8b20f2777b38739b89487953253372924cf39315ac0f0fc88639a80a31a5c95547f319ac7cf1cff6b43b637c5e817bc6e517c6a
-  data.tar.gz: 6d6723fb23c8192f480c1f7e224987196d22faf73c16b354876221c87ad10bbf3eb2e02e5a9adc6320cce242ae96a6c8f8ba9d6d3efaac7e8f981ed169dd97c7
+  metadata.gz: 38cf507deb32f24f41bde413dde811af98dac5e82bd58cb8b955d4483f65ec9da18399ae7cad0823c5c12e033cd9a2c91f1ded5d5268ed4eb1f3cc4fde6d70c2
+  data.tar.gz: 48962ba33465cecbd19e8bb01bc1c767c202b3a51da743296751eb15b74cdf9a684534f753699f4c915f4c7805143551da18620e52fb1c8a0103d4ffbfa05a41

data/lib/ecs_compose/compare.rb

@@ -0,0 +1,44 @@
+module EcsCompose
+  # Utilities for comparing ECS task definition JSON, which we need to do
+  # to determine whether or not a running service needs to be deployed.
+  module Compare
+
+    # Recursively sort all arrays contained in `val`, in order to normalize
+    # things like environment variables in different orders.
+    def self.sort_recursively(val)
+      case val
+      when Array
+        val.sort_by do |item|
+          if item.instance_of?(Hash)
+            item.to_a.sort
+          else 
+            item
+          end
+        end.map {|item| sort_recursively(item) }
+      when Hash
+        newval = {}
+        val.each do |k, v|
+          newval[k] = sort_recursively(v)
+        end
+        newval
+      else
+        val
+      end
+    end
+
+    # Do two task definitions match after normalization?
+    def self.task_definitions_match?(td1, td2)
+      normalize_task_definition(td1) == normalize_task_definition(td2)
+    end
+
+    protected
+
+    # Sort and strip out things we expect to change.
+    def self.normalize_task_definition(td)
+      td = sort_recursively(td)
+      td.delete("taskDefinitionArn")
+      td.delete("revision")
+      td
+    end
+  end
+end

data/lib/ecs_compose/ecs.rb

@@ -45,6 +45,12 @@ module EcsCompose
       end
     end
 
+    # Export the JSON describing an existing task.
+    def self.describe_task_definition(name)
+      run('describe-task-definition',
+          '--task-definition', name)
+    end
+
     # Update the specified service.  Sample args: `"frontend"`,
     # `"frontend:7"`.
     def self.update_service(cluster, service, task_definition)

data/lib/ecs_compose/task_definition.rb

@@ -16,14 +16,21 @@ module EcsCompose
       @yaml = yaml
     end
 
-    # 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.
+    # Register this task definition with ECS if it isn't already
+    # registered.  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, or an existing
+    # task with the same properties.
     def register
-      reg = Ecs.register_task_definition(to_json)
-        .fetch("taskDefinition")
-      "#{reg.fetch('family')}:#{reg.fetch('revision')}"
+      existing = Ecs.describe_task_definition(@name).fetch("taskDefinition")
+      new = register_new.fetch("taskDefinition")
+      use =
+        if Compare.task_definitions_match?(existing, new)
+          existing
+        else
+          new
+        end
+      "#{use.fetch('family')}:#{use.fetch('revision')}"
     end
 
     # Register this task definition with ECS, and update the corresponding
@@ -73,6 +80,11 @@ module EcsCompose
 
     protected
 
+    # Always register a task.  Called by our public `register` API.
+    def register_new
+      Ecs.register_task_definition(to_json)
+    end
+
     # Return a JSON generator for this task.
     def json_generator
       @json_generator ||= JsonGenerator.new(name, yaml)

data/lib/ecs_compose.rb

@@ -7,6 +7,7 @@ require "ecs_compose/task_error"
 require "ecs_compose/cluster"
 require "ecs_compose/task_definition"
 require "ecs_compose/manifest"
+require "ecs_compose/compare"
 
 module EcsCompose
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre22
+  version: 0.1.0.pre23
 platform: ruby
 authors:
 - Eric Kidd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -105,6 +105,7 @@ files:
 - go-publish.sh
 - lib/ecs_compose.rb
 - lib/ecs_compose/cluster.rb
+- lib/ecs_compose/compare.rb
 - lib/ecs_compose/deployment_error.rb
 - lib/ecs_compose/ecs.rb
 - lib/ecs_compose/json_generator.rb