ecs_helper 0.0.30 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d7135d95e971a93420416be037655008bcbdb414d1ff278a5d6f054f7cae45e
-  data.tar.gz: 315b1bc56e9ec94be1d4ab05aa2ae969d3d6a5acacebcd899dad2a4a5664b7d7
+  metadata.gz: 6a88fdb1673cb2abe2e271e6004fd278b0c5d92bf630ab70fcf7a94c5e0730ce
+  data.tar.gz: '0278428fd13fc8bc2dcca2b054041787f85c06b1adb94523b09db83a8c160bfe'
 SHA512:
-  metadata.gz: 607ed56e8ec010436a4b7bacac2a87c1135718e4c77530111056e8d3e6076598074d366924220eab781c30226adfaeda0b2d0073e0e3d89f652e7770dcdebf07
-  data.tar.gz: e591908c48d43ad96a0045e342a55849f31203dedc6046162b0afef791fd30f9d9934b5afc6dce02d8407d8c07091eb9843d4311d7eeaf3c38c38b1f72ffd76c
+  metadata.gz: 52bb0aba871028e742a3ff98323d807f136ce19c2c55d3451ed429b31f32cc64d13b6e88bf4c0b8aa3cbfb61ea41a36b4014ae11a3bbae54ea4af5a223d069a3
+  data.tar.gz: be2a51106a033db704cc57f44539670616e55e12ba6a3f1a62ae1220708d296e6c3e671687889a559c75841788cdb543aaaffce07d432524a5e89e6988534846

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.30)
+    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)
       aws-sdk-ssm (~> 1.0.0.rc7)
       colorize (~> 0.8, >= 0.8)
+      json (~> 2.5, >= 2.5)
       terrapin (~> 0.6, >= 0.6)
 
 GEM
@@ -17,8 +18,8 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.503.0)
-    aws-sdk-core (3.121.0)
+    aws-partitions (1.516.0)
+    aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -29,7 +30,7 @@ GEM
     aws-sdk-ecrpublic (1.6.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.85.0)
+    aws-sdk-ecs (1.86.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ssm (1.0.0)
@@ -46,6 +47,7 @@ GEM
       rexml
     hashdiff (1.0.1)
     jmespath (1.4.0)
+    json (2.6.0)
     method_source (1.0.0)
     minitest (5.14.4)
     minitest-power_assert (0.3.1)
@@ -94,6 +96,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  aarch64-linux
   x86_64-darwin-18
   x86_64-linux
 

data/ecs_helper.gemspec

@@ -39,5 +39,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'aws-sdk-ecs', '~> 1.80', '>= 1.80'
   s.add_runtime_dependency 'aws-sdk-ssm', '~> 1.0.0.rc7'
   s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8'
+  s.add_runtime_dependency 'json', '~> 2.5', '>= 2.5'
   s.add_runtime_dependency 'terrapin', '~> 0.6', '>= 0.6'
 end

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/exec.rb

@@ -45,37 +45,20 @@ class ECSHelper::Command::Exec < ECSHelper::Command::Base
   def check_aws_cli
     check_bin('aws')
     check_aws_cli_version
-    "success"
   end
 
-
-  def check_aws_cli_version
-    check_cmd = Terrapin::CommandLine.new("aws --version")
-    result = check_cmd.run
-    version = parse_version(result)
-    if version === "1"
-      messages = [
-        "Exec command requires aws cli v2".light_white,
-        cmd_option_parser[0].help
-      ]
-      raise ECSHelper::Error::CommandValidationError.new(messages)
-    end
+  def printable?
+    true
   end
 
   def run
-    log("Command", type)
-    log("Cluster", cluster_arn)
-    log("Service", service_arn)
-    log("Task", task_arn)
-    log("Options", options)
-    log("Check session-manager-plugin ", check_session_manager_plugin)
-    log("Check aws cli version", check_aws_cli)
-    exec
+    check_session_manager_plugin
+    check_aws_cli
+    exec_command
   end
 
-  def exec
-    exec_cmd = Terrapin::CommandLine.new("aws ecs execute-command --cluster #{cluster_arn} --task #{task_arn} --container #{helper.options[:container]} --command #{helper.options[:command]} --interactive")
-    exec_cmd.run
+  def exec_command
+    "aws ecs execute-command --cluster #{cluster_arn} --task #{task_arn} --container #{helper.options[:container]} --command #{helper.options[:command]} --interactive"
   end
 
   private

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.30'
+  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.30
+  version: 0.0.34
 platform: ruby
 authors:
 - Artem Petrov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -196,60 +196,60 @@ dependencies:
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.42'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.42'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.42'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecrpublic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.80'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.80'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.80'
 - !ruby/object:Gem::Dependency
@@ -270,40 +270,60 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 description: A simple gem which make CI CD process easier for AWS ECS service
@@ -350,7 +370,7 @@ homepage: https://github.com/artempartos/ecs_helper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -365,8 +385,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: ECSHelper
 test_files: []