awsutils 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aade832f94a08899c4528262137fad5b5afdf141e1d7b427ccf7d38d05741326
-  data.tar.gz: 5d9e8063ab2851a637c664a7728230b6e4f3289d3567d8b7659f693c2bbd5b6f
+  metadata.gz: a6f564f3cde800c7bfba2e62dc78787b57f668dc03645ea7ff011f96012c96a4
+  data.tar.gz: f217eb9001d9b6e95c9d13b5bb30b1119451c73791926b2631beb0171d2b28bc
 SHA512:
-  metadata.gz: c0dd07b2e0918f1c0feb0e66b569c3f3161897c0fba73836f23907a5f09b585cae59801a1755bab9e81abd156f513caeff48001e462a22e58f90fa58b44ad73c
-  data.tar.gz: 7b649d4a58f98b8205dd94f7de44cf24e8b08021cf48b3e350ae048225d4f6a8cf43f653714cb9d4016e3c5a82d4f577107b12aafb572514d1d63e5b1ecb32ac
+  metadata.gz: 570c344850a9a697e6cae3ad60f8e7d80cb0c03250dca2c308dd2690b18f5e58e49339a94ec29b8caf918e4ebca2416bc3e0849919aeac2ffdb6f4902ca666db
+  data.tar.gz: c5de2f469b296d8ced025a93897a47043ab68d01e5bc659ce5f6ccfb3f9afe4de6b5e533bb75f24699ac7c2d0973cd19b27d7394124bfd75fb86a25c95adb5ae

data/.rubocop.yml

@@ -1,5 +1,17 @@
-LineLength:
+Style/Documentation:
+  Enabled: false
+
+Metrics/ClassLength:
+  Max: 250
+
+Metrics/BlockLength:
+  Max: 50
+
+Metrics/LineLength:
   Max: 120
 
+Metrics/AbcSize:
+  Max: 30
+
 MethodLength:
   Max: 50

data/README.md

@@ -24,6 +24,10 @@ awslogs
 -------
 Dumps logs from CloudWatch Logs for easy grepping (see `awslogs --help` for details).
 
+ec2latestimage
+--------------
+Show a list of Ubuntu AMIs owned by your account.
+
 ec2listmachines
 ---------------
 Show a list of all EC2 instances in your account.

data/Rakefile

@@ -6,4 +6,4 @@ RuboCop::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/awsutils.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'awsutils/version'
 
@@ -8,33 +7,39 @@ Gem::Specification.new do |spec|
   spec.version       = AwsUtils::VERSION
   spec.authors       = ['Eric Herot']
   spec.email         = ['eric.rubygems@herot.com']
-  spec.description   = %q{A set of tools for interacting with AWS}
-  spec.summary       = %q{A set of tools for interacting with AWS (summary)}
+  spec.description   = 'A set of tools for interacting with AWS'
+  spec.summary       = 'A set of tools for interacting with AWS (summary)'
   spec.homepage      = 'http://github.com/evertrue/awsutils'
   spec.license       = 'MIT'
   spec.metadata      = {
     'bug_tracker_uri' => 'https://github.com/evertrue/awsutils/issues',
-    'changelog_uri'   => 'https://github.com/evertrue/awsutils/releases',
+    'changelog_uri' => 'https://github.com/evertrue/awsutils/releases',
     'source_code_uri' => 'https://github.com/evertrue/awsutils'
   }
 
   spec.files         = `git ls-files`.split($RS)
-  spec.executables    = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'byebug'
 
   spec.add_dependency 'awesome_print', '~> 1'
+  spec.add_dependency 'aws-sdk-cloudwatchlogs', '~> 1'
+  spec.add_dependency 'aws-sdk-ec2', '~> 1'
+  spec.add_dependency 'aws-sdk-elasticloadbalancing', '~> 1'
+  spec.add_dependency 'aws-sdk-elasticloadbalancingv2', '~> 1'
+  spec.add_dependency 'aws-sdk-route53', '~> 1'
+  spec.add_dependency 'colorize', '~> 0.8.1'
   spec.add_dependency 'facets', '~> 2.9'
-  spec.add_dependency 'rainbow', '~> 2.0'
   spec.add_dependency 'fog-aws', '~> 0.11.0'
+  spec.add_dependency 'highline', '~> 2.0'
   spec.add_dependency 'optimist', '~> 3.0'
-  spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'rainbow', '~> 2.0'
 end

data/bin/ec2addsg

@@ -11,4 +11,4 @@ require 'awsutils/version'
 require 'awsutils/ec2addsg'
 
 sg = AwsUtils::Ec2AddSecurityGroup.new
-sg.run
+sg.run

data/bin/ec2delsg

@@ -10,5 +10,5 @@ require 'rubygems'
 require 'awsutils/version'
 require 'awsutils/ec2delsg'
 
-sg = AwsUtils::Ec2DeleteSecurityGroup.new( ARGV )
-sg.run
+sg = AwsUtils::Ec2DeleteSecurityGroup.new(ARGV)
+sg.run

data/bin/ec2info

@@ -10,4 +10,4 @@ require 'rubygems'
 require 'awsutils/version'
 require 'awsutils/ec2info'
 
-AwsUtils::Ec2Info.new
+AwsUtils::Ec2Info.new

data/bin/ec2listmachines

@@ -10,4 +10,4 @@ require 'rubygems'
 require 'awsutils/version'
 require 'awsutils/ec2listmachines'
 
-AwsUtils::Ec2ListMachines.new
+AwsUtils::Ec2ListMachines.new.run

data/lib/awsutils/awslogs.rb

@@ -1,5 +1,5 @@
 require 'optimist'
-require 'aws-sdk'
+require 'aws-sdk-cloudwatchlogs'
 require 'time'
 
 class LogGroupNotFoundError < StandardError; end
@@ -10,9 +10,9 @@ class NoStreamsError < StandardError; end
 
 module AwsUtils
   class AwsLogs
-    LOG_LEVELS = %w(TRACE DEBUG INFO NOTICE WARNING ERROR FATAL).freeze
-    MAX_EVENTS = 100000.freeze
-    MAX_STREAMS = 100.freeze
+    LOG_LEVELS = %w[TRACE DEBUG INFO NOTICE WARNING ERROR FATAL].freeze
+    MAX_EVENTS = 100_000
+    MAX_STREAMS = 100
 
     def run
       print_events
@@ -83,6 +83,7 @@ module AwsUtils
         r = cloudwatchlogs.describe_log_groups log_group_name_prefix: opts[:group]
         return r.log_groups.first.log_group_name if r.log_groups.count == 1
         raise LogGroupNotFoundError if r.log_groups.empty?
+
         err_msg = "Group filter #{opts[:group]} found multiple groups:\n\n"
         err_msg += r.log_groups.map(&:log_group_name).join("\n")
         err_msg += "\nMore than 50 log groups returned. Only showed the first 50." if r.next_token
@@ -102,6 +103,7 @@ module AwsUtils
       collector = response.events
       collector += chunk_events(streams_chunk, response.next_token) if response.next_token
       raise TooManyEventsError if collector.count > MAX_EVENTS
+
       collector
     end
 
@@ -117,12 +119,14 @@ module AwsUtils
 
     def filtered_log_events
       return log_events unless opts[:request_id]
+
       log_events.select { |event| event.message =~ /\b#{opts[:request_id]}\b/ }
     end
 
     def print_events
       filtered_log_events.each do |ev|
-        if ev.message !~ /^\[(INFO|DEBUG|WARNING|ERROR|NOTICE)\]/ # Check if the message is in the standard format
+        # Check if the message is in the standard format
+        if ev.message !~ /^\[(INFO|DEBUG|WARNING|ERROR|NOTICE)\]/
           print "#{ev.log_stream_name}: " if opts[:show_stream_name]
           print Time.at(ev.timestamp / 1e3).iso8601(3) + ' ' if opts[:timestamp]
           print ev.message
@@ -148,6 +152,7 @@ module AwsUtils
 
     def show_logentry?(level)
       return true unless LOG_LEVELS.include? level
+
       LOG_LEVELS.index(level.upcase) >= LOG_LEVELS.index(opts[:log_level].upcase)
     end
 
@@ -163,14 +168,17 @@ module AwsUtils
         .log_streams
         .select { |s| s.last_event_timestamp && s.last_event_timestamp > max_age_ts }
         .map(&:log_stream_name)
-      fail NoStreamsError if token.nil? && collector.count == 0
+      raise NoStreamsError if token.nil? && collector.count.zero?
+
       collector += streams(response.next_token) if response.next_token
-      fail TooManyStreamsError if collector.count > MAX_STREAMS
+      raise TooManyStreamsError if collector.count > MAX_STREAMS
+
       collector
     end
 
     def max_age_ts
       return 0 unless opts[:age]
+
       (Time.at(Time.now - opts[:age]).to_f * 1_000).to_i
     end
 

data/lib/awsutils/ec2addsg.rb

@@ -9,7 +9,7 @@ module AwsUtils
       @g_obj ||= begin
         connection.security_groups.new(
           name: @opts[:security_group],
-          description: "#{@opts[:description]}",
+          description: @opts[:description].to_s,
           vpc_id: @opts[:vpc_id]
         )
       end
@@ -18,12 +18,12 @@ module AwsUtils
     def generate_rule_hash(rule)
       if rule['source']
         if rule['dest']
-          fail 'One of the predefined rules has both a source ' \
+          raise 'One of the predefined rules has both a source ' \
             'and a destination already defined: ' + rule.inspect
         end
         if rule['source'] !~ /\./ &&
            !current_groups.include?(rule['source'])
-          fail "Group #{rule['source']} specified as part of rule: " \
+          raise "Group #{rule['source']} specified as part of rule: " \
                "#{rule.inspect} does not exist"
         end
       end
@@ -31,7 +31,7 @@ module AwsUtils
       if !rule['dest']
         rule['dest'] = @new_group_id
       elsif !current_groups.include?(rule['dest'])
-        fail "Group #{rule['dest']} specified as part of rule: " \
+        raise "Group #{rule['dest']} specified as part of rule: " \
              "#{rule.inspect} does not exist"
       end
 
@@ -46,7 +46,7 @@ module AwsUtils
 
       if rule['source'] =~ /\./
         ip_permissions['Groups'] = []
-        ip_permissions['IpRanges'] = [ 'CidrIp' => rule['source'] ]
+        ip_permissions['IpRanges'] = ['CidrIp' => rule['source']]
       elsif rule['source']
         ip_permissions['Groups'] = [
           {
@@ -114,7 +114,7 @@ module AwsUtils
         rules.select { |rule| rule['dest'] }.each do |rule|
           add_rule_to_other_group(rule)
         end
-      rescue => e
+      rescue StandardError => e
         connection.delete_security_group(nil, g_obj.group_id)
         raise e
       end
@@ -133,13 +133,13 @@ module AwsUtils
 
       if @opts[:environment]
         if !rules_data['env']
-          fail "Environment #{@opts[:environment]} not present in rules file" \
+          raise "Environment #{@opts[:environment]} not present in rules file" \
                " (#{@opts[:base_rules_file]})."
         else
           rules_env_data = rules_data['env'][@opts[:environment]]
         end
       elsif rules_data.class != Array
-        fail 'base_rules_file is an environment-keyed file but you did ' \
+        raise 'base_rules_file is an environment-keyed file but you did ' \
           'not specify an environment.'
       else
         rules_env_data = rules_data
@@ -165,7 +165,7 @@ module AwsUtils
     end
 
     def parse_opts
-      fail 'AWS_OWNER_ID is not set!' unless ENV['AWS_OWNER_ID']
+      raise 'AWS_OWNER_ID is not set!' unless ENV['AWS_OWNER_ID']
 
       @opts = Optimist.options do
         opt :security_group,

data/lib/awsutils/ec2delsg.rb

@@ -3,68 +3,58 @@
 require 'awsutils/ec2sg'
 
 module AwsUtils
-
   class Ec2DeleteSecurityGroup < Ec2SecurityGroup
-
     def references
-
       @references ||= begin
-
         references = []
 
         connection.security_groups.each do |group|
           group.ip_permissions.each do |ip_perm|
-            ip_perm["groups"].each do |src_grp|
-              if src_grp["groupName"] == @opts[:security_group]
-
-                options = {
-                  "IpPermissions" => [
-                    {
-                      "FromPort" => ip_perm["fromPort"],
-                      "Groups" => [
-                        {
-                          "GroupName" => @opts[:security_group],
-                          "UserId" => @opts[:owner_group_id]
-                        }
-                      ],
-                      "IpProtocol" => ip_perm["ipProtocol"],
-                      "IpRanges" => [],
-                      "ToPort" => ip_perm["toPort"]
-                    }
-                  ]
-                }
-
-                references << {
-                  "group_name" => group.name,
-                  "options" => options
-                }
-
-              end # if src_grp["groupName"] == @opts[:security_group]
-            end # ip_perm["groups"].each do |src_grp|
-          end # group.ip_permissions.each do |ip_perm|
-        end # connection.security_groups.each do |group|
+            ip_perm['groups'].each do |src_grp|
+              next unless src_grp['groupName'] == @opts[:security_group]
+
+              options = {
+                'IpPermissions' => [
+                  {
+                    'FromPort' => ip_perm['fromPort'],
+                    'Groups' => [
+                      {
+                        'GroupName' => @opts[:security_group],
+                        'UserId' => @opts[:owner_group_id]
+                      }
+                    ],
+                    'IpProtocol' => ip_perm['ipProtocol'],
+                    'IpRanges' => [],
+                    'ToPort' => ip_perm['toPort']
+                  }
+                ]
+              }
+
+              references << {
+                'group_name' => group.name,
+                'options' => options
+              }
+            end
+          end
+        end
 
         references
-      end # @references ||= begin
-    end # def references
+      end
+    end
 
     def delete_group_refs
-
       references.each do |ref|
+        puts 'Removing rule: ' + ref.inspect
 
-        puts "Removing rule: " + ref.inspect
-
-        connection.revoke_security_group_ingress( 
-                                                 ref["group_name"],
-                                                 ref["options"]
-                                               )
-
+        connection.revoke_security_group_ingress(
+          ref['group_name'],
+          ref['options']
+        )
       end
-
     end
 
-    def initialize( args )
-      @opts = Ec2SecurityGroup.parse_opts( args )
+    def initialize(args)
+      @opts = Ec2SecurityGroup.parse_opts(args)
     end
 
     def name
@@ -72,25 +62,21 @@ module AwsUtils
     end
 
     def run
-
-      if ! exist?
-        puts "Specified group does not exist."
+      unless exist?
+        puts 'Specified group does not exist.'
         exit 1
       end
 
       if assigned?
-        puts "Group is still assigned to one or more instances."
+        puts 'Group is still assigned to one or more instances.'
         exit 1
       end
 
       delete_group_refs
 
       puts "Deleting group #{@opts[:security_group]}."
-      connection.delete_security_group( nil, 
-                                       connection.security_groups.get(@opts[:security_group]).group_id )
-
+      connection.delete_security_group(nil,
+                                       connection.security_groups.get(@opts[:security_group]).group_id)
     end
-
   end
-
 end

data/lib/awsutils/ec2info.rb

@@ -14,7 +14,7 @@ class String
   def title_case
     underscore.split('_').map do |word|
       # Recognize certain special cases (e.g. acronyms)
-      if %w(iam ebs id dns vpc).include? word.downcase
+      if %w[iam ebs id dns vpc].include? word.downcase
         word.upcase
       elsif word.casecmp('ids').zero?
         'IDs'
@@ -51,7 +51,7 @@ module AwsUtils
     # TODO: Naming/MemoizedInstanceVariableName: Memoized variable @instance_ids does
     # not match method name instances.
     def instances
-      @instance_ids ||= begin
+      @instances ||= begin
         if $DEBUG
           puts 'Entering instance_ids'
           puts "Search Term: #{search_terms.inspect}"
@@ -65,6 +65,7 @@ module AwsUtils
               next unless server.tags.key?('Name') \
                 && (server.tags['Name'] != '') \
                 && (/#{search_term}/i =~ server.tags['Name'])
+
               m << server.id
             end
           end
@@ -75,7 +76,7 @@ module AwsUtils
           exit 1
         end
 
-        puts "Found instances: #{results.inspect}" if $DEBUG
+        puts "Found instances: #{instance_ids.inspect}" if $DEBUG
 
         ec2.servers.all 'instance-id' => instance_ids
       end
@@ -131,17 +132,14 @@ module AwsUtils
              'ID',
              'Group',
              'Flavor',
-             'State'
-            )
-
-      instance_ids.each do |instance_id|
-        inst = ec2.servers.get(instance_id)
+             'State')
 
+      instances.each do |inst|
         s_color = get_state_color(inst.state)
         f_color = get_flavor_color(inst.flavor_id)
 
         printf(
-          "%-50s %-11s %-12s %-13s #{f_color}%-10s#{reset_color} #{s_color}%s#{reset_color}",
+          "%-50s %-11s %-12s %-13s #{f_color}%-10s#{reset_color} #{s_color}%s#{reset_color}\n",
           inst.tags['Name'],
           inst.availability_zone,
           inst.id,
@@ -157,16 +155,15 @@ module AwsUtils
       reset_color = "\033[0m"
 
       print "#{key_color}#{key.to_s.title_case}:#{reset_color} "
-      case
-      when value.respond_to?(:to_sym)
+      if value.respond_to?(:to_sym)
         puts value
-      when value.respond_to?(:key?)
+      elsif value.respond_to?(:key?)
         puts
         value.each { |k, v| printkv "  #{k}", v }
-      when (
-        value.respond_to?(:join) &&
-        value.reject { |item| item.respond_to?(:to_sym) }.empty? # If value only contains strings, do this
-      )
+      # If value only contains strings, do this
+      elsif value.respond_to?(:join) &&
+            value.reject { |item| item.respond_to?(:to_sym) }.empty?
+
         value.join(', ')
       else
         puts value.inspect
@@ -246,9 +243,7 @@ module AwsUtils
 
               end
 
-              if vol != instance.block_device_mapping.last
-                puts "\t---------------------------------------"
-              end
+              puts "\t---------------------------------------" if vol != instance.block_device_mapping.last
             end
 
           when :client_token
@@ -262,6 +257,7 @@ module AwsUtils
               group = ec2.security_groups.get(group_id)
 
               next unless group
+
               puts "#{key_color}Security Group:#{reset_color} #{group.name}"
               puts "\t#{key_color}Description:#{reset_color} #{group.description}"
               puts "\t#{key_color}ID:#{reset_color} #{group.group_id}"
@@ -285,17 +281,11 @@ module AwsUtils
 
             puts "\t#{key_color}Name:#{reset_color} #{image_obj.name}" if defined?(image_obj.name)
 
-            if defined?(image_obj.description)
-              puts "\t#{key_color}Description:#{reset_color} #{image_obj.description}"
-            end
+            puts "\t#{key_color}Description:#{reset_color} #{image_obj.description}" if defined?(image_obj.description)
 
-            if defined?(image_obj.location)
-              puts "\t#{key_color}Location:#{reset_color} #{image_obj.location}"
-            end
+            puts "\t#{key_color}Location:#{reset_color} #{image_obj.location}" if defined?(image_obj.location)
 
-            if defined?(image_obj.architecture)
-              puts "\t#{key_color}Arch:#{reset_color} #{image_obj.architecture}"
-            end
+            puts "\t#{key_color}Arch:#{reset_color} #{image_obj.architecture}" if defined?(image_obj.architecture)
 
             if defined?(image_obj.tags) && (image_obj.tags != {})
               puts "\t#{key_color}Tags:#{reset_color}"
@@ -323,7 +313,7 @@ module AwsUtils
             puts "#{key_color}State:#{reset_color} #{state_color}#{instance.state}#{reset_color}"
           when :state_reason
             if instance.state_reason.any?
-              puts "#{key_color}State Reason Code:#{reset_color} #{instance.state_reason["Code"]}"
+              puts "#{key_color}State Reason Code:#{reset_color} #{instance.state_reason['Code']}"
             elsif $DEBUG
               puts "#{key_color}State Reason Code:#{reset_color} N/A"
             end