ecs_helper 0.0.29 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9360d89edeb8333e9caf152cb45a4a1d6042c3f614ab0d6d5d45e8d6bcd6e61
-  data.tar.gz: b3d2c66d829a1cf4b35e0d9dd476427287770fd14beb4e28729cc263d58ec878
+  metadata.gz: 871394ee1f21e808a91e123a5affccb713a0e7f44fcbb1d308bcc849eb97e992
+  data.tar.gz: bd42356f7c7984047d85e41810fd12a9aa5a0ef95e63fdab370c38ff20278117
 SHA512:
-  metadata.gz: 20bc088dc9e4f3cbd8d04d83354faa39e3e319abcfe10335e0444fda5d755c32e883854f32a072c93f96129e98ba13b7d5dd53187a0b81dfc2cdcd3bc5bb8075
-  data.tar.gz: b588b0c7003c7e08afd46ce196b04cae8756c0c7b2ba3aafabbbc20c9a9e99ef319fc952d14f23a4bd9b19291714d20843149d86bb50371f689218868d5de4f3
+  metadata.gz: 709ccc270f6143206e63d4f55b2ea68b556f8929407e0a44cf9bfd626595b39973a76ade7376072371bb17b965ee56e8340650fc44f22467c15fe4dbd28512c8
+  data.tar.gz: d7a5f1635642a612a3abe7c3c85887a91475c37fbe3f2bb2d15e8b793d39f7dff29018a55b85e12db43ca5a31ad36fcb3fdd539909bdc0ddce84a95c22eaa7d9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.29)
+    ecs_helper (0.0.33)
       aws-sdk-ecr (~> 1.42, >= 1.42)
       aws-sdk-ecrpublic (~> 1.3, >= 1.3)
       aws-sdk-ecs (~> 1.80, >= 1.80)
@@ -18,19 +18,19 @@ 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.515.0)
+    aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ecr (1.46.0)
+    aws-sdk-ecr (1.47.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
     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)
@@ -47,7 +47,7 @@ GEM
       rexml
     hashdiff (1.0.1)
     jmespath (1.4.0)
-    json (2.5.1)
+    json (2.6.0)
     method_source (1.0.0)
     minitest (5.14.4)
     minitest-power_assert (0.3.1)
@@ -96,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

@@ -41,5 +41,4 @@ Gem::Specification.new do |s|
   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/build_and_push.rb

@@ -24,6 +24,7 @@ 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
@@ -90,7 +91,11 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
   end
 
   def version_tag
-    "#{repository}:#{helper.version}"
+    if options[:env_prefix]
+      "#{repository}:#{helper.environment}-#{helper.version}"
+    else
+      "#{repository}:#{helper.version}"
+    end
   end
 
   def project

data/lib/ecs_helper/command/check_exec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'terrapin'
+
+class ECSHelper::Command::CheckExec < ECSHelper::Command::Base
+  def cmd_option_parser
+    options = { command: 'bash -c' }
+    parser = ::OptionParser.new do |opts|
+      opts.banner = 'Usage: ecs_helper check_exec'
+      opts.on('-p VALUE', '--project VALUE', "Set project name, if not specified will look at ENV['PROJECT'], will be used to detect cluster") do |p| options[:project] = processEqual(p) end
+      opts.on('-a VALUE', '--application VALUE', "Set application name, if not specified will look at ENV['APPLICATION'], will be used to detect service and task definition") do |a| options[:application] = processEqual(a) end
+    end
+    [parser, options]
+  end
+
+  def check_exec_bin
+    check_bin('check-ecs-exec')
+  end
+
+  def check_exec
+    exec_cmd = Terrapin::CommandLine.new("check-ecs-exec #{cluster_arn} #{task_arn}")
+    exec_cmd.run
+  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 bin", check_exec_bin)
+    check_exec
+  end
+
+  private
+
+  def cluster_arn
+    helper.current_cluster
+  end
+
+  def service_arn
+    helper.current_service
+  end
+
+  def task_arn
+    @task_arn ||= helper.client.list_tasks({cluster: cluster_arn, service_name: service_arn, desired_status: "RUNNING"})[0]
+  end
+end

data/lib/ecs_helper/command/exec.rb

@@ -4,7 +4,7 @@ require 'terrapin'
 
 class ECSHelper::Command::Exec < ECSHelper::Command::Base
   def cmd_option_parser
-    options = { command: 'bash -c' }
+    options = { command: '/bin/bash' }
     parser = ::OptionParser.new do |opts|
       opts.banner = 'Usage: ecs_helper exec [options]. require session-manager-plugin and aws cli v2'
       opts.on('-p VALUE', '--project VALUE',
@@ -15,8 +15,8 @@ class ECSHelper::Command::Exec < ECSHelper::Command::Base
               "Set application name, if not specified will look at ENV['APPLICATION'], will be used to detect service and task definition") do |a|
         options[:application] = processEqual(a)
       end
-      opts.on('-c', '--container VALUE', 'Cache image before build, default false') { |c| options[:container] = c }
-      opts.on('--command VALUE', 'Command to execute') { |c| options[:command] = c }
+      opts.on('-c', '--container VALUE', 'Cache image before build, default false') { |c| options[:container] = processEqual(c) }
+      opts.on('--command VALUE', 'Command to execute') { |c| options[:command] = processEqual(c) }
     end
     [parser, options]
   end
@@ -45,38 +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")
-    # --region us-east-1
-    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.rb

@@ -6,6 +6,7 @@ class ECSHelper::Command
   autoload :ExportImages, 'ecs_helper/command/export_images'
   autoload :ECRLogin, 'ecs_helper/command/ecr_login'
   autoload :Exec, 'ecs_helper/command/exec'
+  autoload :CheckExec, 'ecs_helper/command/check_exec'
   autoload :RunCommand, 'ecs_helper/command/run_command'
   autoload :ExportEnvSecrets, 'ecs_helper/command/export_env_secrets'
 
@@ -17,6 +18,7 @@ class ECSHelper::Command
     "run_command" => RunCommand,
     "export_env_secrets" => ExportEnvSecrets,
     "exec" => Exec,
+    "check_exec" => CheckExec,
   }
   AVAILABLE_COMMANDS = CMD_MAPPING.keys
 

data/lib/ecs_helper/version.rb

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

data/lib/ecs_helper.rb

@@ -6,6 +6,8 @@ class ECSHelper
   extend Forwardable
   attr_accessor :options, :client, :command, :parser, :cluster_helper, :service_helper, :common_helper
 
+
+  autoload :VERSION, 'ecs_helper/version'
   autoload :Client, 'ecs_helper/client'
   autoload :CommonHelper, 'ecs_helper/common_helper'
   autoload :ClusterHelper, 'ecs_helper/cluster_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.33
 platform: ruby
 authors:
 - Artem Petrov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-10-14 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,60 +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: '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
@@ -349,6 +349,7 @@ files:
 - lib/ecs_helper/command.rb
 - lib/ecs_helper/command/base.rb
 - lib/ecs_helper/command/build_and_push.rb
+- lib/ecs_helper/command/check_exec.rb
 - lib/ecs_helper/command/deploy.rb
 - lib/ecs_helper/command/ecr_login.rb
 - lib/ecs_helper/command/exec.rb
@@ -369,7 +370,7 @@ homepage: https://github.com/artempartos/ecs_helper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -384,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: []