simplygenius-atmos 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b47aaaf544e268b0d3a9a9d6a69d8165f165ef9e9e500753ec8c87787228b4
-  data.tar.gz: 673992076c584283ee340d683a5a0c5aa8d9c9b0c4203cac7c96250480a012a1
+  metadata.gz: 967259ac48e43b57455a18b59e4aa5ce3e8f3c45ce4497a069668d8539191c7d
+  data.tar.gz: 61cc1ca6c174588587b1982f5e6de1ba08c59690610503bffd1a05ee40e9d4bc
 SHA512:
-  metadata.gz: a4a7fc7d2c74988b22482c4252023fb4ecd1f0216bb8f28b0e802b5ee7a4532a4fa6f995cca60f11e7015545d20566463d577f3cb656240563436490a4c70237
-  data.tar.gz: 2396303b7e6ce14afc455597477be362f3ea77a3540d6187ec743efe2a2f48dcc8ab5f2fc7a2175da3ad2e5addeeb72f6b1dabaeb2ebc9d2a85262ad8a70cdd8
+  metadata.gz: 150ea6f5147379574f36df0fc62d8102d9be7e3cab4254c3df9b78d0734b0916f91b715d59b976eeaf8a0643e889b0817b23f5ede32ebfaac11101587f9f7ff7
+  data.tar.gz: cb82a1291212a3b6d2e6cf7642dfc15653f4a5525438041655dee5d95a6e66890c50c40b9d2bcd5381af5939742019b0bf858c14c2f9d4eaf44a3faccaa7e751

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.9.4 (03/20/2019)
+------------------
+
+* allow deploying the same image to multiple services and make task vs service auto detected [9f841d7](https://github.com/simplygenius/atmos/commit/9f841d7)
+* fix link [deba98f](https://github.com/simplygenius/atmos/commit/deba98f)
+
 0.9.3 (02/12/2019)
 ------------------
 

data/README.md

@@ -62,7 +62,7 @@ The [terraform docs](https://www.terraform.io/docs/index.html) are excellent.
 
 ## Quickstart
 
-See the [screencast](https://simplygenius.wistia.com/projects/h595iz9tbq) for a detailed walkthrough (~1 hour) of the quickstart.  Or try the [condensed screencast](https://simplygenius.wistia.com/medias/2syql5mnud) if you just want to take a quick look (~7m)
+See the [screencast](https://simplygenius.wistia.com/medias/zamoxtlqe0) for a detailed walkthrough (~1 hour) of the quickstart.  Or try the [condensed screencast](https://simplygenius.wistia.com/medias/2syql5mnud) if you just want to take a quick look (~7m)
 
 [Create an AWS account](https://portal.aws.amazon.com/billing/signup)
 Setup root account access keys, make note of the numeric account id

data/lib/simplygenius/atmos/commands/container.rb

@@ -24,17 +24,14 @@ module SimplyGenius
           option ["-i", "--image"],
                  "IMAGE", "The local container image to deploy\nDefaults to service/task name"
 
-          option ["-t", "--task"],
-                 :flag, "Deploy as a task, not a service\n"
-
           option ["-v", "--revision"],
                  "REVISION", "Use as the remote image revision\n"
 
-          parameter "NAME",
-                    "The name of the service (or task) to deploy"
+          parameter "NAME ...",
+                    "The name of the service (or task) to deploy\nWhen multiple, the first is the primary, and\nthe rest get deployed with its image"
 
           def default_image
-            name
+            name_list.first
           end
 
           def execute
@@ -42,11 +39,14 @@ module SimplyGenius
               ClimateControl.modify(auth_env) do
                 mgr = Atmos.config.provider.container_manager
 
-                result = mgr.push(name, image, revision: revision)
-                if task?
-                  result = result.merge(mgr.deploy_task(name, result[:remote_image]))
-                else
-                  result = result.merge(mgr.deploy_service(cluster, name, result[:remote_image]))
+                primary_name = name_list.first
+
+                result = mgr.push(primary_name, image, revision: revision)
+
+                name_list.each do |name|
+                  resp = mgr.deploy(cluster, name, result[:remote_image])
+                  result[:task_definitions] ||= []
+                  result[:task_definitions] << resp[:task_definition]
                 end
 
                 logger.info "Container deployed:\n #{display result}"

data/lib/simplygenius/atmos/providers/aws/container_manager.rb

@@ -40,23 +40,23 @@ module SimplyGenius
             logger.info "Tagging local image '#{local_image}' with #{tags}"
             tags.each {|t| run("docker", "tag", local_image, "#{ecs_image}:#{t}") }
 
-            logger.info "Pushing tagged image to ECR repo"
+            logger.info "Pushing tagged image to ECR repo #{ecs_image}"
             tags.each {|t| run("docker", "push", "#{ecs_image}:#{t}") }
 
             result[:remote_image] = "#{ecs_image}:#{revision}"
             return result
           end
 
-          def deploy_task(task, remote_image)
+          def deploy_task(name, remote_image)
             result = {}
 
             ecs = ::Aws::ECS::Client.new
             resp = nil
 
-            resp = ecs.list_task_definitions(family_prefix: task, sort: 'DESC')
+            resp = ecs.list_task_definitions(family_prefix: name, sort: 'DESC')
             latest_defn_arn = resp.task_definition_arns.first
 
-            logger.info "Latest task definition: #{latest_defn_arn}"
+            logger.info "Current task definition for #{name}: #{latest_defn_arn}"
 
             resp = ecs.describe_task_definition(task_definition: latest_defn_arn)
             latest_defn = resp.task_definition
@@ -71,31 +71,28 @@ module SimplyGenius
             resp = ecs.register_task_definition(**new_defn)
             result[:task_definition] = resp.task_definition.task_definition_arn
 
-            logger.info "Updated task=#{task} to #{result[:task_definition]} with image #{remote_image}"
+            logger.info "Updated task=#{name} to #{result[:task_definition]} with image #{remote_image}"
 
             return result
           end
 
-          def deploy_service(cluster, service, remote_image)
-             result = {}
+          def deploy(cluster, name, remote_image)
+             result = deploy_task(name, remote_image)
+             new_taskdef = result[:task_definition]
 
+             # Only trigger restart if name is a service
              ecs = ::Aws::ECS::Client.new
-             resp = nil
-
-             # Get current task definition name from service
-             resp = ecs.describe_services(cluster: cluster, services: [service])
-             current_defn_arn = resp.services.first.task_definition
-             defn_name = current_defn_arn.split("/").last.split(":").first
-
-             logger.info "Current task definition (name=#{defn_name}): #{current_defn_arn}"
-             result = deploy_task(defn_name, remote_image)
-             new_taskdef = result[:task_definition]
+             resp = ecs.describe_services(cluster: cluster, services: [name])
 
-             logger.info "Updating service with new task definition: #{new_taskdef}"
+             if resp.services.size > 0
+               logger.info "Updating service with new task definition: #{new_taskdef}"
 
-             resp = ecs.update_service(cluster: cluster, service: service, task_definition: new_taskdef)
+               resp = ecs.update_service(cluster: cluster, service: name, task_definition: new_taskdef)
 
-             logger.info "Updated service=#{service} on cluster=#{cluster} to #{new_taskdef} with image #{remote_image}"
+               logger.info "Updated service=#{name} on cluster=#{cluster} to #{new_taskdef} with image #{remote_image}"
+             else
+               logger.info "#{name} is not a service"
+             end
 
              return result
           end

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler