ecs_cmd 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ed292f74e7e2f9b9b155dbe9db89e0718cb901a
-  data.tar.gz: 2f62f4c6195d6c439a94a9a2525334522c1fb660
+SHA256:
+  metadata.gz: f215ab372a26cb580e3cc8c6ba5e1a2dc6f3fe946f4543652f7aa2ecf3ea0298
+  data.tar.gz: 473a4ccf2769d52faf13fc5787d82805ef6fb719bd1ddf5611755825ba685e72
 SHA512:
-  metadata.gz: 7bcf5c0fed809384394df6d7219c97ce0c5558fcb7d619d244999b51f93fc47a8e73bf3b3fa44b0d87979a06e2fdc93b07a129e8ff7947c8d258a210f9d8fc99
-  data.tar.gz: 72a546275e4e2608d82acaef6365a638224d4c0c538d4f4cf6ae71686a33d2fa0ed7ee3c25dc4aa5ff0e4963d88fffb91941a55b32e0ad231ef567f0ecd82ff9
+  metadata.gz: c36537549d61e3aa8c7474b0a25509fb90e41e825cef8d94d80227e8a5eb355ed4062bcbe1f28ef60f0090e4f93cf4526084df078af50c64395621f01786ec52
+  data.tar.gz: a3b25ffbf9a11d7018ef537b54361d4c1ede8c8f6eaf4294bad1db7fc417a02969f5c7de8b7604cb0c51d7ca35e6bb7ef4f0301044e7549416c24398f9e97344

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
+env: 
+  - GLI_DEBUG=true
 rvm:
   - 2.4.3
   - 2.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecs_cmd (0.1.0)
+    ecs_cmd (0.1.1)
       aws-sdk
       gli (= 2.17.1)
       terminal-table
@@ -609,4 +609,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

data/README.md

@@ -1,6 +1,6 @@
 # Ecs-Cmd
 
-[![Build Status](https://travis-ci.org/dschaaff/ecs-cmd.svg?branch=master)](https://travis-ci.org/dschaaff/ecs-cmd)
+[![Build Status](https://travis-ci.org/dschaaff/ecs-cmd.svg?branch=master)](https://travis-ci.org/dschaaff/ecs-cmd) [![Gem Version](https://badge.fury.io/rb/ecs_cmd.svg)](https://badge.fury.io/rb/ecs_cmd)
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ecs_cmd`. To experiment with that code, run `bin/console` for an interactive prompt.
 

data/bin/ecs-cmd

@@ -10,76 +10,68 @@ version EcsCmd::VERSION
 subcommand_option_handling :normal
 arguments :strict
 
-desc 'Describe some switch here'
-switch [:s,:switch]
-
 desc 'Set the aws region'
 default_value 'us-east-1'
 arg_name 'region'
-flag [:r,:region]
+flag %i[r region]
 
-desc 'Get Info '
+desc 'Get Info on Clusters and Services'
 command :get do |c|
   c.command :clusters do |clusters|
     clusters.desc 'list ecs clusters'
-    clusters.action do |global_options,options,args|
+    clusters.action do |global_options, _options, _args|
       clust = EcsCmd::Clusters.new(global_options[:region])
       clust.list_clusters
     end
   end
 
-  c.arg_name '<cluster>'
   c.command :services do |services|
+    services.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
     services.desc 'list services in a given ecs cluster'
-    services.action do |global_options, options, args|
+    services.action do |global_options, options, _args|
       serv = EcsCmd::Services.new(global_options[:region])
-      serv.list_services(args[0])
+      serv.list_services(options[:cluster])
     end
   end
 
-  c.arg_name '<service> <cluster'
+  c.arg_name '<service>'
   c.command :service do |service|
+    service.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
+    service.flag %i[s service], desc: 'service name', arg_name: 'service', required: true
     service.default_desc 'get info about an ecs service'
-    service.action do |global_options, options, args|
-      EcsCmd::Service.new(args[1],args[0], global_options[:region]).list_service
-    end
-    service.arg_name '<service> <cluster>'
-    service.desc 'get event stream for ecs service'
-    service.command :events do |events|
-      events.desc 'list events for service'
-      events.action do |global_options, options, args|
-        EcsCmd::Service.new(args[1],args[0], global_options[:region]).events
-      end
-    end
-    service.arg_name '<service> <cluster> task_definition'
-    service.desc 'get json task definition for service'
-    service.command :task_definition do |task_definition|
-      task_definition.desc 'get the current task definition for the service'
-      task_definition.action do |global_options, options, args|
-        EcsCmd::TaskDefinition.new(EcsCmd::Service.new(args[1],args[0], global_options[:region]).task_definition).print_json
+    service.switch %i[e events], desc: 'get ecs events', default_value: false
+    service.switch %i[t task_definition], desc: 'get current task definition for service', default_value: false
+    service.action do |global_options, options|
+      if options[:events] == true
+        EcsCmd::Service.new(options[:cluster], options[:service], global_options[:region]).events
+      elsif options[:task_definition] == true
+        task_def = EcsCmd::Service.new(options[:cluster], options[:service], global_options[:region]).task_definition
+        EcsCmd::TaskDefinition.new(task_def, global_options[:region]).print_json
+      else
+        EcsCmd::Service.new(options[:cluster], options[:service], global_options[:region]).list_service
       end
     end
   end
 end
 
-# desc 'Add description here'
-# arg_name 'Describe arguments here'
-# command :get do |c|
-#   c.action do |global_options, options, args|
-#     if args[0] == 'task_definition'
-#       task = EcsCmd::TaskDefinition.new(args[1])
-#       puts JSON.pretty_generate(JSON[task.json])
-#     elsif
-#       puts "not implemented"
-#     end
-#   end
-# end
-
-desc 'Describe add here'
+desc 'Run a One Off Task On an ECS Cluster'
 arg_name 'Describe arguments to add here'
-command :add do |c|
-  c.action do |global_options,options,args|
-    puts "add command ran"
+command :'run-task' do |c|
+  c.flag %i[c cluster], desc: 'cluster name', arg_name: 'cluster', required: true
+  c.flag %i[n container-name], desc: 'container name', arg_name: 'container name', required: false
+  c.flag %i[t task-definition], desc: 'the task definition to use for task', required: true
+  c.flag %i[i image], desc: 'docker image to use for task', arg_name: 'image', required: false
+  c.flag %i[d command], desc: 'override task definition command', arg_name: 'command'
+  c.action do |global_options, options, _args|
+    command = options[:d].tokenize
+    if options[:i]
+      puts "generating new task definition with image #{options[:i]}"
+      new_task = EcsCmd::TaskDefinition.new(options[:t], global_options[:region]).update_image(options[:i])
+      puts "registered task definition #{new_task}"
+      EcsCmd::RunTask.new(global_options[:region], options[:c], new_task, options[:n], command).run
+    else
+      EcsCmd::RunTask.new(global_options[:region], options[:c], options[:t], options[:n], command).run
+    end
   end
 end
 
@@ -91,7 +83,7 @@ end
 #   end
 # end
 
-pre do |global,command,options,args|
+pre do |_global, _command, _options, _args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the
   # chosen command
@@ -100,13 +92,13 @@ pre do |global,command,options,args|
   true
 end
 
-post do |global,command,options,args|
+post do |global, command, options, args|
   # Post logic here
   # Use skips_post before a command to skip this
   # block on that command only
 end
 
-on_error do |exception|
+on_error do |_exception|
   # Error logic here
   # return false to skip default error handling
   true

data/lib/ecs_cmd.rb

@@ -1,9 +1,12 @@
 require 'ecs_cmd/version'
 require 'ecs_cmd/clusters.rb'
+require 'ecs_cmd/run_task.rb'
 require 'ecs_cmd/services.rb'
 require 'ecs_cmd/service.rb'
 require 'ecs_cmd/task_definition.rb'
+require 'ecs_cmd/utils.rb'
 
-module EcsCmd
-  # Your code goes here...
-end
+# module EcsCmd
+#   # Your code goes here..
+  
+# end

data/lib/ecs_cmd/run_task.rb

@@ -0,0 +1,39 @@
+require 'aws-sdk'
+require 'terminal-table'
+
+module EcsCmd
+  class RunTask
+    def initialize(region, cluster, task_def, container_name = nil, command = [])
+      @client = Aws::ECS::Client.new(region: region)
+      @cluster = cluster
+      @container_name = container_name
+      @task_def = task_def
+      @command = command
+    end
+
+    # simply run the task
+    def run
+      puts 'running task...'
+      resp = if @container_name
+               @client.run_task(cluster: @cluster, task_definition: @task_def, overrides: {
+                                  container_overrides: [{
+                                    name: @container_name, command: @command
+                                  }]
+                                })
+             else
+               @client.run_task(cluster: @cluster, task_definition: @task_def)
+             end
+      task_arn = resp[0][0]['task_arn']
+      result =
+        begin
+          puts 'waiting for task to complete...'
+          @client.wait_until(:tasks_stopped, cluster: @cluster, tasks: [task_arn])
+        rescue Aws::Waiters::Errors::WaiterFailed => error
+          puts "failed waiting for task to run: #{error.message}"
+        end
+      puts "task ended with exit code #{result[0][0]['containers'][0]['exit_code']}"
+      # return exit code
+      raise 'task appears to have failed, check container logs' if result[0][0]['containers'][0]['exit_code'] != 0
+    end
+  end
+end

data/lib/ecs_cmd/task_definition.rb

@@ -1,18 +1,36 @@
 require 'aws-sdk'
 require 'terminal-table'
+require 'ecs_cmd/utils'
 
 module EcsCmd
   class TaskDefinition
- 
-    def initialize(task_definition)
-      @client = Aws::ECS::Client.new(region: 'us-east-1')
+    def initialize(task_definition, region)
+      @client = Aws::ECS::Client.new(region: region)
       @task_def = @client.describe_task_definition(task_definition: task_definition)[0]
     end
 
 
-    def container_defintions
+    def container_definitions
       @task_def['container_definitions']
     end
+    
+    def images
+      self.container_definitions.each do |e|
+        puts e['image']
+      end
+    end
+
+    def family
+      @task_def['family']
+    end
+
+    def revision
+      @task_def['revision']
+    end
+
+    def volumes
+      @task_def['volumes']
+    end
 
     def hash
       @task_def.to_hash
@@ -21,10 +39,29 @@ module EcsCmd
     def json
       hash.to_json
     end
+    
+    def task_role_arn
+      @task_def['task_role_arn']
+    end
+ 
+    def update_image(image)
+      @new_task_def = @task_def.to_hash
+      @new_task_def[:container_definitions].each do |e, i=image|
+        if Utils.parse_image_name(e[:image]) == Utils.parse_image_name(i)
+          e[:image] = image
+        end
+      end
+      @new_task_def
+      resp = register_task_definition(@new_task_def[:family], @new_task_def[:container_definitions], @new_task_def[:volumes], @new_task_def[:task_role_arn])
+      resp.task_definition.task_definition_arn
+    end
+
+    def register_task_definition(family, container_definitions, volumes, task_role_arn)
+      @client.register_task_definition(family: family, container_definitions: container_definitions, volumes: volumes, task_role_arn: task_role_arn)
+    end
 
     def print_json
       puts JSON.pretty_generate(JSON[json])
-      
     end
 
   end

data/lib/ecs_cmd/utils.rb

@@ -0,0 +1,24 @@
+module EcsCmd
+  module Utils
+    def self.parse_image_name(image)
+      regex = /^([a-zA-Z0-9\.\-]+):?([0-9]+)?\/([a-zA-Z0-9\._\-]+)(\/[\/a-zA-Z0-9\._\-]+)?:?([a-zA-Z0-9\._\-]+)?$/
+      raise 'invalid image supplied, please verify correct image format' unless regex.match(image)
+      if regex.match(image)[4].nil? || regex.match(image)[4] == false
+        regex.match(image)[3]
+      else
+        regex.match(image)[4].gsub(/\//, '')
+      end
+    end
+
+    def self.parse_image_tag(image); end
+  end
+end
+
+class String
+  def tokenize
+    self.
+      split(/\s(?=(?:[^'"]|'[^']*'|"[^"]*")*$)/).
+      select {|s| not s.empty? }.
+      map {|s| s.gsub(/(^ +)|( +$)|(^["']+)|(["']+$)/,'')}
+  end
+end

data/lib/ecs_cmd/version.rb

@@ -1,3 +1,3 @@
 module EcsCmd
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_cmd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Schaaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -132,9 +132,11 @@ files:
 - ecs_cmd.gemspec
 - lib/ecs_cmd.rb
 - lib/ecs_cmd/clusters.rb
+- lib/ecs_cmd/run_task.rb
 - lib/ecs_cmd/service.rb
 - lib/ecs_cmd/services.rb
 - lib/ecs_cmd/task_definition.rb
+- lib/ecs_cmd/utils.rb
 - lib/ecs_cmd/version.rb
 homepage: https://danielschaaff.com
 licenses:
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: AWS ECS CLI Utility