ecs_helper 0.0.16 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8bb03ecaa4b2e1e89ee181b4ce253cdd8195a1cf74d0f3dca2210a836054084
-  data.tar.gz: dc22fb87a15d211095c310b7da626357112e547d3f8a736a12f0188f9c9d41e7
+  metadata.gz: d05ce978784d1c02d0f7efe1cc4ab9391e966cced3173da83d493c302986fd50
+  data.tar.gz: ce2fad2f9f61369ce063826779f11bb8c65396876ed1f90d7c6bf643fb135253
 SHA512:
-  metadata.gz: 2629aac57e9f59ad727ec38121a5a1893041e93941642fa198d764ff53503a9ff3cb76ae3e0f2973f9c67f5676c014c48ba37ecadb8215228fe1515a90cf3a80
-  data.tar.gz: b65082412c27def32ad767f1cb315e5f0f95306f4bc7a4d2f0f021d18776dc7abadbf74f413c0ed6cd8013b0b1f196f4297554fc556a29eceeca085b3949a272
+  metadata.gz: c6fed82da13e7462d2064620936d511005888393a66481f694523b841a02a90af566a83946366c4df5bddbc4e4107543bfaa5b442237a2bf923c67750643513c
+  data.tar.gz: e3d0eef470cc0fcf49ed895e53df0d692506c4f7178e8ab1225b1d239ddf21f987229a295cc5192a340d3b974c1fb3418c9bd8de1235845b9d13736e0b53479f

data/lib/ecs_helper/command/build_and_push.rb

@@ -24,17 +24,11 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     log("Options", options)
     log("Repository", repository)
     log("Auth Private", auth_private)
-    log("Auth Public", auth_public)
     should_cache? && log("Pull", pull)
     log("Build", build)
     log("Push", push)
   end
 
-  def auth_public
-    auth_cmd = Terrapin::CommandLine.new("aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws")
-    auth_cmd.run
-  end
-
   def auth_private
     auth_cmd = Terrapin::CommandLine.new("aws ecr get-login --no-include-email | sh")
     auth_cmd.run

data/lib/ecs_helper/command/deploy.rb

@@ -34,14 +34,14 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
     log("Service task definition", service_task_definition.task_definition_arn)
     log("Containers", task_definition_helper.pretty_container_definitions)
     log("New task definition", new_task_definition.task_definition_arn)
-    update_service(new_task_definition.task_definition_arn) && log("Update service", "Service task definition was updated")
+    update_service(new_task_definition.task_definition_arn, service_task_definition.task_definition_arn) && log("Update service", "Service task definition was updated")
     log("Waiting for deployment...")
     wait_for_deployment && log("Success", "Application was succesfully deployed", :cyan)
   end
 
-  def update_service(task_definition_arn)
+  def update_service(task_definition_arn, old_task_definition_arn)
     helper.update_service(cluster_arn, service_arn, task_definition_arn)
-    helper.client.deregister_task_definition(task_definition: task_definition_arn)
+    helper.client.deregister_task_definition(task_definition: old_task_definition_arn)
   end
 
   def wait_for_deployment(time = 0)

data/lib/ecs_helper/command/ecr_login.rb

@@ -17,12 +17,6 @@ class ECSHelper::Command::ECRLogin < ECSHelper::Command::Base
   def run
     log("Command", type)
     log("Auth Private", auth_private)
-    log("Auth Public", auth_public)
-  end
-
-  def auth_public
-    auth_cmd = Terrapin::CommandLine.new("aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws")
-    auth_cmd.run
   end
 
   def auth_private

data/lib/ecs_helper/common_helper.rb

@@ -1,6 +1,7 @@
 BRANCH_TO_ENV_MAPPING = {
   master: 'production',
   qa: 'qa',
+  uat: 'uat',
   staging: 'staging',
   demo: 'demo',
 }

data/lib/ecs_helper/logging.rb

@@ -8,9 +8,9 @@ module ECSHelper::Logging
     end
   end
 
-  def error(message)
+  def error(message, code = 1)
     puts "Error".red
     puts message
-    exit
+    exit code
   end
 end

data/lib/ecs_helper/task_definition_helper.rb

@@ -41,7 +41,7 @@ class ECSHelper::TaskDefinitionHelper
   end
 
   def container_definition_to_ecr(cd)
-    repo = repo_for(cd.name)
+    repo = repo_for(cd)
     is_ecr = cd.image.include?(ecr_base)
     image = repo && version_image(repo)
     should_update = is_ecr && repo && image
@@ -58,18 +58,9 @@ class ECSHelper::TaskDefinitionHelper
 
   private
 
-  def container_definition_to_ecr(cd)
-    repo = repo_for(cd.name)
-    is_ecr = cd.image.include?(ecr_base)
-    image = repo && version_image(repo)
-    should_update = is_ecr && repo && image
-    [repo, is_ecr, image, should_update]
-  end
-
-  def repo_for(name)
+  def repo_for(cd)
     repositories.find do |r|
-      uri = r.repository_uri
-      uri.include?(helper.application) && uri.include?(helper.project) && uri.include?(name)
+      cd.image.include?(r.repository_uri)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.20
 platform: ruby
 authors:
 - Artem Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs