ecs_helper 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 871394ee1f21e808a91e123a5affccb713a0e7f44fcbb1d308bcc849eb97e992
-  data.tar.gz: bd42356f7c7984047d85e41810fd12a9aa5a0ef95e63fdab370c38ff20278117
+  metadata.gz: 6a88fdb1673cb2abe2e271e6004fd278b0c5d92bf630ab70fcf7a94c5e0730ce
+  data.tar.gz: '0278428fd13fc8bc2dcca2b054041787f85c06b1adb94523b09db83a8c160bfe'
 SHA512:
-  metadata.gz: 709ccc270f6143206e63d4f55b2ea68b556f8929407e0a44cf9bfd626595b39973a76ade7376072371bb17b965ee56e8340650fc44f22467c15fe4dbd28512c8
-  data.tar.gz: d7a5f1635642a612a3abe7c3c85887a91475c37fbe3f2bb2d15e8b793d39f7dff29018a55b85e12db43ca5a31ad36fcb3fdd539909bdc0ddce84a95c22eaa7d9
+  metadata.gz: 52bb0aba871028e742a3ff98323d807f136ce19c2c55d3451ed429b31f32cc64d13b6e88bf4c0b8aa3cbfb61ea41a36b4014ae11a3bbae54ea4af5a223d069a3
+  data.tar.gz: be2a51106a033db704cc57f44539670616e55e12ba6a3f1a62ae1220708d296e6c3e671687889a559c75841788cdb543aaaffce07d432524a5e89e6988534846

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.33)
+    ecs_helper (0.0.34)
       aws-sdk-ecr (~> 1.42, >= 1.42)
       aws-sdk-ecrpublic (~> 1.3, >= 1.3)
       aws-sdk-ecs (~> 1.80, >= 1.80)
@@ -18,7 +18,7 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.515.0)
+    aws-partitions (1.516.0)
     aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

data/lib/ecs_helper/command/build_and_push.rb

@@ -24,7 +24,6 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
       end
       opts.on('-c', '--cache', 'Cache image before build, default false') { options[:cache] = true }
       opts.on('--build-arg=VALUE', 'Pass --build-arg to the build command') { |o| options[:build_args] << o }
-      opts.on('-e', '--env-prefix', 'Add environment name as a prefix to the version tag, default false') { options[:env_prefix] = true }
     end
     [parser, options]
   end
@@ -91,11 +90,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
   end
 
   def version_tag
-    if options[:env_prefix]
-      "#{repository}:#{helper.environment}-#{helper.version}"
-    else
-      "#{repository}:#{helper.version}"
-    end
+    "#{repository}:#{helper.version}"
   end
 
   def project

data/lib/ecs_helper/command/deploy.rb

@@ -70,10 +70,10 @@ class ECSHelper::Command::Deploy < ECSHelper::Command::Base
   end
 
   def timeout
-    options[:timeout] || DEFAULT_TIMEOUT
+    (options[:timeout] || DEFAULT_TIMEOUT).to_i
   end
 
   def service
     helper.client.describe_service(cluster_arn, service_arn)
   end
-end
+end

data/lib/ecs_helper/command/run_command.rb

@@ -124,7 +124,7 @@ class ECSHelper::Command::RunCommand < ECSHelper::Command::Base
   end
 
   def timeout
-    options[:timeout] || DEFAULT_TIMEOUT
+    (options[:timeout] || DEFAULT_TIMEOUT).to_i
   end
 
   def service
@@ -142,4 +142,4 @@ class ECSHelper::Command::RunCommand < ECSHelper::Command::Base
   def container_name
     options[:container_name]
   end
-end
+end

data/lib/ecs_helper/common_helper.rb

@@ -8,6 +8,7 @@ BRANCH_TO_ENV_MAPPING = {
 
 class ECSHelper::CommonHelper
   attr_accessor :helper, :branch, :version, :env
+
   def initialize(helper)
     @helper = helper
   end
@@ -17,11 +18,18 @@ class ECSHelper::CommonHelper
   end
 
   def version
-    @version ||= ENV["CI_COMMIT_SHA"] || `git rev-parse HEAD`.strip
+    @version ||=
+      begin
+        if deployable_branch? && use_image_tag_env_prefix?
+          "#{environment}-#{commit_sha}"
+        else
+          commit_sha
+        end
+      end
   end
 
   def environment
-    @env ||= helper.options[:environment] || ENV["ENVIRONMENT"] || BRANCH_TO_ENV_MAPPING[branch.to_sym] || raise(StandardError.new("Environment not detected"))
+    @env ||= helper.options[:environment] || ENV["ENVIRONMENT"] || env_from_branch || raise(StandardError.new("Environment not detected"))
   end
 
   def project
@@ -31,4 +39,23 @@ class ECSHelper::CommonHelper
   def application
     ENV["APPLICATION"]
   end
-end
+
+  private
+
+  def env_from_branch
+    BRANCH_TO_ENV_MAPPING[branch.to_sym]
+  end
+
+  def deployable_branch?
+    !env_from_branch.nil?
+  end
+
+  def commit_sha
+    ENV["CI_COMMIT_SHA"] || `git rev-parse HEAD`.strip
+  end
+
+  def use_image_tag_env_prefix?
+    !ENV['USE_IMAGE_TAG_ENV_PREFIX'].nil?
+  end
+
+end

data/lib/ecs_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ECSHelper
-  VERSION = '0.0.33'
+  VERSION = '0.0.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Artem Petrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print