ecs_helper 0.0.26 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16ad520e81a6ee88b6cb3b67c8e68ee1cf0e724ea20d1fdd8595ffda8023be65
-  data.tar.gz: 6d1398b798ae584fbb163d6234f01b209abb00bdd33489ee75e5ec2aae1f9bcd
+  metadata.gz: 3d7135d95e971a93420416be037655008bcbdb414d1ff278a5d6f054f7cae45e
+  data.tar.gz: 315b1bc56e9ec94be1d4ab05aa2ae969d3d6a5acacebcd899dad2a4a5664b7d7
 SHA512:
-  metadata.gz: 44029c3fab73d9878376b1590bcba8a0f1ab39324a0aadac136f9736021514390fffec0c221d20769602c14934558221b1685eca8e1867a4f199e7790b5865b5
-  data.tar.gz: abda0b0495455d13034a82345d2ff5dc09349a08b80c4b641b41ad3117f37fe3a28e25469f4857275babcad65673587dbb76f6398602e8b7447095a6a5f99e8d
+  metadata.gz: 607ed56e8ec010436a4b7bacac2a87c1135718e4c77530111056e8d3e6076598074d366924220eab781c30226adfaeda0b2d0073e0e3d89f652e7770dcdebf07
+  data.tar.gz: e591908c48d43ad96a0045e342a55849f31203dedc6046162b0afef791fd30f9d9934b5afc6dce02d8407d8c07091eb9843d4311d7eeaf3c38c38b1f72ffd76c

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.25)
+    ecs_helper (0.0.30)
       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
@@ -24,7 +23,7 @@ GEM
       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)
@@ -38,6 +37,7 @@ GEM
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    bump (0.10.0)
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
@@ -46,7 +46,6 @@ GEM
       rexml
     hashdiff (1.0.1)
     jmespath (1.4.0)
-    json (2.5.1)
     method_source (1.0.0)
     minitest (5.14.4)
     minitest-power_assert (0.3.1)
@@ -95,10 +94,12 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  x86_64-linux-musl
+  x86_64-darwin-18
+  x86_64-linux
 
 DEPENDENCIES
   awesome_print
+  bump
   bundler (~> 2.2)
   ecs_helper!
   minitest
@@ -113,4 +114,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.22
+   2.2.27

data/Makefile

@@ -0,0 +1,30 @@
+.PHONY: test build bump-major bump-minor bump-patch help
+.DEFAULT_GOAL := test
+CURRENT_VERSION=$(shell bump current)
+NEXT_PATCH=$(shell bump show-next patch)
+NEXT_MINOR=$(shell bump show-next minor)
+NEXT_MAJOR=$(shell bump show-next major)
+GEM_VERSION=ecs_helper-${CURRENT_VERSION}.gem
+
+test: ## Run the unit tests
+	bundle exec rake --trace
+
+build: ## Build the ruby gem
+	gem build ecs_helper.gemspec
+
+push:
+	gem push ${GEM_VERSION}
+
+release:
+	bump set ${NEXT_PATCH}
+	make build
+	make push
+
+bump-major: ## Bump the major version (1.0.0 -> 2.0.0)
+	bump major
+
+bump-minor: ## Bump the minor version (0.1.0 -> 0.2.0)
+	bump minor
+
+bump-patch: ## Bump the patch version (0.0.1 -> 0.0.2)
+	bump patch

data/ecs_helper.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-minitest'
   s.add_development_dependency 'webmock'
+  s.add_development_dependency 'bump'
 
   s.add_development_dependency "bundler", "~> 2.2"
   s.add_development_dependency "rake"
@@ -38,7 +39,5 @@ 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/client.rb

@@ -56,6 +56,14 @@ class ECSHelper::Client
     ecs.describe_tasks(params).tasks
   end
 
+  def list_tasks(params = {})
+    ecs.list_tasks(params).task_arns
+  end
+
+  def execute_command(params = {})
+    ecs.execute_command(params)
+  end
+
   # ECR
   def private_repositories(params = {})
     ecr.describe_repositories(params).repositories

data/lib/ecs_helper/command/base.rb

@@ -22,6 +22,15 @@ class ECSHelper::Command::Base
     helper.project
   end
 
+  def check_bin(bin)
+    check_cmd = Terrapin::CommandLine.new("which #{bin}")
+    result = check_cmd.run
+    "success"
+  rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError => e
+    messages = ["#{bin} not found"]
+    raise ECSHelper::Error::BinNotFound.new(messages)
+  end
+
   def application
     helper.application
   end
@@ -29,20 +38,26 @@ class ECSHelper::Command::Base
   def validate
     required.each do |r|
       value = options[r]
-      unless value
-        puts "'#{r}' required for command '#{type}'".light_white
-        puts option_parser.help
-        exit
+      if value.nil?
+        messages = [
+          "'#{r}' required for command '#{type}'".light_white,
+          option_parser.help
+        ]
+        raise ECSHelper::Error::CommandValidationError.new(messages)
       end
     end
   end
 
-  private
-
   def required
     []
   end
 
+  def printable?
+    false
+  end
+
+  private
+
   def processEqual(value)
     value.start_with?('=') ? value[1..-1] : value
   end

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

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'terrapin'
+
+class ECSHelper::Command::Exec < ECSHelper::Command::Base
+  def cmd_option_parser
+    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',
+              "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
+      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
+
+  def required
+    [:container]
+  end
+
+  def check_session_manager_plugin
+    check_bin('session-manager-plugin')
+  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
+  end
+
+  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
+  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
+  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
+  end
+
+  private
+
+  def parse_version(string)
+    string.split('/')[1][0]
+  end
+
+  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/export_env_secrets.rb

@@ -18,6 +18,10 @@ class ECSHelper::Command::ExportEnvSecrets < ECSHelper::Command::Base
     []
   end
 
+  def printable?
+    true
+  end
+
   def run
     return log("No ENV secrets to export. Please pass ENV variables names using -n") if options[:env_vars].empty?
     export_values
@@ -42,5 +46,6 @@ class ECSHelper::Command::ExportEnvSecrets < ECSHelper::Command::Base
     rescue Aws::SSM::Errors::ParameterNotFound
       next
     end).join(' ')
+    variables
   end
 end

data/lib/ecs_helper/command/export_images.rb

@@ -14,6 +14,10 @@ class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
     []
   end
 
+  def printable?
+    true
+  end
+
   def run
     export_images
   end

data/lib/ecs_helper/command.rb

@@ -5,6 +5,8 @@ class ECSHelper::Command
   autoload :Deploy, 'ecs_helper/command/deploy'
   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'
 
@@ -15,6 +17,8 @@ class ECSHelper::Command
     "ecr_login" => ECRLogin,
     "run_command" => RunCommand,
     "export_env_secrets" => ExportEnvSecrets,
+    "exec" => Exec,
+    "check_exec" => CheckExec,
   }
   AVAILABLE_COMMANDS = CMD_MAPPING.keys
 
@@ -43,7 +47,9 @@ class ECSHelper::Command
 
   def run
     command.validate
-    command.run
+    result = command.run
+    puts result if command.printable?
+    result
   end
 end
 

data/lib/ecs_helper/error/bin_not_found.rb

@@ -0,0 +1,2 @@
+class ECSHelper::Error::BinNotFound < ECSHelper::Error::Base
+end

data/lib/ecs_helper/error/command_validation_error.rb

@@ -0,0 +1,2 @@
+class ECSHelper::Error::CommandValidationError < ECSHelper::Error::Base
+end

data/lib/ecs_helper/error.rb

@@ -3,4 +3,6 @@
 class ECSHelper::Error
   autoload :Base, 'ecs_helper/error/base'
   autoload :CommandNotFound, 'ecs_helper/error/command_not_found'
+  autoload :CommandValidationError, 'ecs_helper/error/command_validation_error'
+  autoload :BinNotFound, 'ecs_helper/error/bin_not_found'
 end

data/lib/ecs_helper/logging.rb

@@ -1,6 +1,6 @@
 module ECSHelper::Logging
   def console(message)
-    puts message if ENV["SKIP_LOGS"].nil?
+    puts message if ENV["SKIP_LOGS"] != 'true'
   end
 
   def log(title, message = nil, color = "light_white")

data/lib/ecs_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ECSHelper
-  VERSION = '0.0.26'
+  VERSION = '0.0.30'
 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.26
+  version: 0.0.30
 platform: ruby
 authors:
 - Artem Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -272,26 +286,6 @@ dependencies:
     - - "~>"
       - !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
@@ -323,6 +317,7 @@ files:
 - Dockerfile
 - Gemfile
 - Gemfile.lock
+- Makefile
 - Rakefile
 - bin/console
 - bin/ecs_helper
@@ -334,15 +329,19 @@ 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
 - lib/ecs_helper/command/export_env_secrets.rb
 - lib/ecs_helper/command/export_images.rb
 - lib/ecs_helper/command/run_command.rb
 - lib/ecs_helper/common_helper.rb
 - lib/ecs_helper/error.rb
 - lib/ecs_helper/error/base.rb
+- lib/ecs_helper/error/bin_not_found.rb
 - lib/ecs_helper/error/command_not_found.rb
+- lib/ecs_helper/error/command_validation_error.rb
 - lib/ecs_helper/logging.rb
 - lib/ecs_helper/service_helper.rb
 - lib/ecs_helper/task_definition_helper.rb