aws-tools 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca067a22cebe6f3a1fce85ce9feed048ff268a45
-  data.tar.gz: 1ec0ba2eb6779f228be4e08f47e4d3209afa00f9
+  metadata.gz: fe9c961919c43463f06cc1889bfd5917100ae167
+  data.tar.gz: 1c5cb8dd18202554e8ed82c103e70d1ceb2d38eb
 SHA512:
-  metadata.gz: e641830b7260a47d7eeaa45c265f7957f13f8a4d5538021cab4bec00b6c054c705e7513862ec793c30af2e25774fcf2e7497884718b82de4f8b70f91dd212d5e
-  data.tar.gz: 945cd6a46e045496e1924e1a4c0387564252422a85170a1b09cd7cddb2317c76bc7a0b71d6a5772d01d2505b08015228ae73ae3d9402892bf3ad5b209cd29d01
+  metadata.gz: d7cbf2c410b658c8baf08c4b536471dce71672fdbfaf8da4691086583b9c83fbdada17b7e381b62e956b5dc665bf41eb4d37a5f46386271d25e139b141ec659a
+  data.tar.gz: 48a385a11f632b8cfa5b74079d2afc26083f3ac1b2b8aea65e8ed8f3a936092b19f11d879a235d81e094bc30046e09513dfdc1e48693ccce232717ea4c09a0e9

data/bin/aws_manager.rb

@@ -43,7 +43,7 @@ def locate_instance_choice(instances, instance_id, options={})
     puts "There are no instances matching criteria"
     return nil
   elsif instances.length == 1
-    instances[0]
+    instances
   else
     if !instance_id.nil?
       instance = nil
@@ -62,22 +62,24 @@ def locate_instance_choice(instances, instance_id, options={})
           instance = instances[instance_id.to_i]
         end
       end
-      return instance
+      return [instance]
     else
       if selection_filter == :first
-        return instances[0]
+        return [instances[0]]
       elsif selection_filter == :oldest
           oldest = instances[0]
           instances.each do |i|
             oldest = i if i._instance[:launch_time] < oldest._instance[:launch_time]
           end
-          return oldest
+          return [oldest]
       elsif selection_filter == :newest
         newest = instances[0]
         instances.each do |i|
           newest = i if i._instance[:launch_time] > newest._instance[:launch_time]
         end
-        return newest
+        return [newest]
+      elsif selection_filter == :all
+        return instances
       else
         puts "Error, there are multiple instances that match these tags.  Please choose one:"
         puts "index: private_ip / public_ip / instance_id / launch_time"
@@ -85,7 +87,7 @@ def locate_instance_choice(instances, instance_id, options={})
           puts "#{i}: #{instances[i]._instance[:private_ip_address]} / #{instances[i]._instance[:public_ip_address]} / #{instances[i]._instance[:instance_id]} / #{instances[i]._instance[:launch_time]}"
         end
         ans = STDIN.gets.chomp().to_i
-        return instances[ans]
+        return [instances[ans]]
       end
     end
     nil
@@ -95,14 +97,14 @@ end
 def syntax
   puts "Syntax:"
   puts "   EC2 Instance commands:"
-  puts "        aws_manager.rb --region region run_instance <instance template file> "
+  puts "        aws_manager.rb --region region [--max n] run_instance <instance template file> "
   puts "        aws_manager.rb --region region [--mount volume:device] run_instance <instance template file> "
-  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest] connect [id]"
-  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest] start [id]"
-  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest] [--keep-one] stop [id]"
-  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest] get_instance_status [id]"
-  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest] get_instance_ip [id]"
-  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest] [--keep-one] terminate_instance [id]"
+  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest|all] connect [id]"
+  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest|all] start [id]"
+  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest|all] [--keep-one] stop [id]"
+  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest|all] get_instance_status [id]"
+  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest|all] get_instance_ip [id]"
+  puts "        aws_manager.rb --region region [--environment environment] [--purpose purpose] [--choose first|oldest|newest|all ] [--keep-one] terminate_instance [id]"
   puts "   CW commands:"
   puts "        aws_manager.rb --region region put_cw_metric csv_metric"
   puts "   S3 commands:"
@@ -130,7 +132,7 @@ def syntax
 end
 def main
   syntax if ARGV.length <= 0
-  params = ARGV.getopts("hr:e:p:fkc:m:", "choose:", "mount:", "keep-one", "help", "region:", "environment:", "purpose:")
+  params = ARGV.getopts("hr:e:p:fkc:m:", "choose:", "max:", "mount:", "keep-one", "help", "region:", "environment:", "purpose:")
   syntax if params['h'] or params['help']
   purpose = params['p'] || params['purpose']
   environment = params['e'] || params['environment']
@@ -138,8 +140,9 @@ def main
   keep_one = params['k'] || params['keep-one']
   selection_criteria = params['c'] || params['choose']
   mount = params['m'] || params['mount']
+  max = params['x'] || params['max']
   selection_criteria = selection_criteria.downcase.to_sym if selection_criteria
-  syntax if selection_criteria and !([:first,:oldest, :newest].include?(selection_criteria))
+  syntax if selection_criteria and !([:first,:oldest, :newest, :all].include?(selection_criteria))
   syntax if ARGV.length <= 0
   command = ARGV.shift
   save_cl = ARGV.dup
@@ -156,14 +159,20 @@ def main
       puts "Error, there are less than 2 instances, and keep_one flag set.  Exiting."
       exit
     end
-    instance = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['running']),name, {:selection_filter => selection_criteria})
-    instance.stop(wait=true)
+    instances = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['running']),name, {:selection_filter => selection_criteria})
+    instances.each do |instance|
+      instance.stop(wait=true)
+    end if instances and instances.length > 0
   elsif command == 'start'
-    instance = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['stopped']),name, {:selection_filter => selection_criteria})
-    instance.start(wait=true)
+    instances = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['stopped']),name, {:selection_filter => selection_criteria})
+    instances.each do |instance|
+      instance.start(wait=true)
+    end if instances and instances.length > 0
   elsif command == 'connect'
-    instance = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['running']),name, {:selection_filter => selection_criteria})
-    instance.connect
+    instances = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['running']),name, {:selection_filter => selection_criteria})
+    instances.each do |instance|
+      instance.connect
+    end if instances and instances.length > 0
   elsif command == 'create_db'
     options = YAML::load File.read(name) if File.exists? name
     instance = region.create_db_instance(options)
@@ -180,11 +189,15 @@ def main
     instances = region.find_db_instances({:environment => environment, :purpose => purpose, :instance_id => name})
     puts instances[0].status
   elsif command == 'get_instance_status'
-    instance = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), []), name, {:selection_filter => selection_criteria})
-    puts instance.state
+    instances = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), []), name, {:selection_filter => selection_criteria})
+    instances.each do |instance|
+      puts instance.state
+    end if instances and instances.length > 0
   elsif command == 'get_instance_ip'
-    instance = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), []), name, {:selection_filter => selection_criteria})
-    puts instance.public_ip
+    instances = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), []), name, {:selection_filter => selection_criteria})
+    instances.each do |instance|
+      puts instance.public_ip
+    end if instances and instances.length > 0
   elsif command == 'purge_db_snapshots'
     instances = region.find_db_instances({:environment => environment, :purpose => purpose, :instance_id => name})
     instances[0].purge_db_snapshots
@@ -205,22 +218,29 @@ def main
       exit
     end
     image_options = YAML.load(ERB.new(File.read(instance_template)).result)
-    instance = region.create_instance(image_options)
-    if mount
-      (vol,dev) = mount.split(":")
-      instance.mount(vol, dev)
+    ninstances = filter_instances(region.find_instances({environment: image_options[:tags][:environment], purpose: image_options[:tags][:purpose]  }), ['running', 'starting', 'pending']).length
+    if max and max.to_i > ninstances
+      instance = region.create_instance(image_options)
+      if mount
+        (vol,dev) = mount.split(":")
+        instance.mount(vol, dev)
+      end
+    else
+      puts "Maximum number of instances already established: #{ninstances}"
     end
   elsif command == 'terminate_instance'
     if keep_one and filter_instances(region.find_instances({environment: environment, purpose: purpose  }), ['running']).length < 2
       puts "There are less than 2 instances, and keep_one flag set.  Exiting."
       exit
     end
-    instance = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), []), name, {:selection_filter => selection_criteria})
-    if instance.nil?
-      puts "No instances matching criteria found #{{environment: environment, purpose: purpose, selection_filter: selection_criteria}.inspect}"
-    else
-      instance.terminate
-    end
+    instances = locate_instance_choice(filter_instances(region.find_instances({environment: environment, purpose: purpose  }), []), name, {:selection_filter => selection_criteria})
+    instances.each do |instance|
+      if instance.nil?
+        puts "No instances matching criteria found #{{environment: environment, purpose: purpose, selection_filter: selection_criteria}.inspect}"
+      else
+        instance.terminate
+      end 
+    end if instances and instances.length > 0
   elsif command == 'sns'
     instance = region.create_sns_instance
     instance.publish save_cl[0], save_cl[1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kevin Connors