awsutils 2.1.2 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b349fef53bb0e69ba94c897c44395410dba6710
-  data.tar.gz: e1e33dfd6b6c52810309e0b33304268495521ec2
+  metadata.gz: 95f34da34fad24fe442ee18a0b59ba3b6785e6b8
+  data.tar.gz: f809b1fdee1e38c522ecfd888da1497e20c01d54
 SHA512:
-  metadata.gz: ef0b74c2dbbc588ff444ce4f2993cacc71fbb436889bd0f1cc0a82be835e8db2aeba32eac11d5bf6500811cccfc8e1094efc29e1f6e489a325a429725d83282f
-  data.tar.gz: ee242a063408d1712c690fa1d8329c55f692789da9d737945213fd891652e35d8f258c5f3710973304d16a6d60c884af65f96eea08c52919ef5bbb6143381b3d
+  metadata.gz: 0653f177362210ad4875cc64bb1722bac7f0095041c8e2c219779e6873141eff533bd45af70d0fff93f7d9b405dbdbaf02c7862f86efd346bd6c1e10f3f333ec
+  data.tar.gz: ce754a5256133a11d5a3ca311af86ee4a2c2990af2a88272b06f00ce136b7824b981e67554c4b4d374922795b7bd31c631246fe644c928db03fbe9a92b5e51a3

data/.rubocop.yml

@@ -0,0 +1,5 @@
+LineLength:
+  Max: 100
+
+MethodLength:
+  Max: 50

data/awsutils.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'facets', '~> 2.9'
   spec.add_dependency 'rainbow', '~> 2.0'
-  spec.add_dependency 'fog-aws', '~> 0.10.0'
+  spec.add_dependency 'fog-aws', '~> 0.11.0'
   spec.add_dependency 'trollop'
   spec.add_dependency 'aws-sdk'
 end

data/bin/awslogs

@@ -10,5 +10,4 @@
 require 'awsutils/version'
 require 'awsutils/awslogs'
 
-awslogs = AwsUtils::AwsLogs.new
-awslogs.print_events
+AwsUtils::AwsLogs.new.run

data/lib/awsutils/awslogs.rb

@@ -2,23 +2,59 @@ require 'trollop'
 require 'aws-sdk'
 require 'time'
 
+class LogGroupNotFoundError < StandardError; end
+class MultipleGroupsError < StandardError; end
+class TooManyEventsError < StandardError; end
+class TooManyStreamsError < StandardError; end
+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
+
+    def run
+      print_events
+    rescue TooManyEventsError
+      puts "Too many log events to process (MAX: #{MAX_EVENTS}). " \
+           'Please try filtering the output with -f'
+      exit 3
+    rescue TooManyStreamsError
+      puts "Too many streams to process (MAX: #{MAX_STREAMS}). " \
+           'Please try filtering the output with -s'
+      exit 3
+    rescue LogGroupNotFoundError
+      puts "No log groups found starting with #{opts[:group]}"
+      exit 1
+    rescue NoStreamsError
+      puts 'Streams filter did not return any streams'
+      exit 1
+    rescue MultipleGroupsError => e
+      puts e.message
+      exit 2
+    end
+
+    private
 
     def opts
       @opts ||= Trollop.options do
+        opt :age,
+            'Max age in seconds',
+            short: 'a',
+            type: Integer
         opt :group,
             'Log group (e.g. /aws/lambda/sf-updater)',
             required: true,
-            type: :string,
+            type: String,
             short: 'g'
         opt :filter_pattern,
             'See: http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/FilterAndPatternSyntax.html',
+            type: String,
             short: 'f'
         opt :streams_prefix,
             'E.g. 2016/08',
-            default: Time.now.strftime('%Y/%m/%d'),
+            type: String,
             short: 's'
         opt :timestamp,
             'Include the timestamp from the event metadata in the output',
@@ -42,16 +78,30 @@ module AwsUtils
       end
     end
 
+    def log_group_name
+      @log_group ||= begin
+        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
+        raise MultipleGroupsError, err_msg
+      end
+    end
+
     def chunk_events(streams_chunk, token = nil)
       parameters = {
-        log_group_name: opts[:group],
+        log_group_name: log_group_name,
         log_stream_names: streams_chunk,
+        start_time: max_age_ts,
         next_token: token
       }
       parameters[:filter_pattern] = opts[:filter_pattern] if opts[:filter_pattern]
       response = cloudwatchlogs.filter_log_events parameters
       collector = response.events
       collector += chunk_events(streams_chunk, response.next_token) if response.next_token
+      raise TooManyEventsError if collector.count > MAX_EVENTS
       collector
     end
 
@@ -76,6 +126,7 @@ module AwsUtils
           print "#{ev.log_stream_name}: " if opts[:show_stream_name]
           print Time.at(ev.timestamp / 1e3).iso8601(3) + ' ' if opts[:timestamp]
           print ev.message
+          print "\n" if ev.message[-1] != "\n"
           next
         end
 
@@ -101,16 +152,28 @@ module AwsUtils
     end
 
     def streams(token = nil)
-      response = cloudwatchlogs.describe_log_streams(
-        log_group_name: opts[:group],
-        log_stream_name_prefix: opts[:streams_prefix],
+      parameters = {
+        log_group_name: log_group_name,
         next_token: token
-      )
-      collector = response.log_streams.map(&:log_stream_name)
+      }
+      parameters[:log_stream_name_prefix] = opts[:streams_prefix] if opts[:streams_prefix]
+      response = cloudwatchlogs.describe_log_streams parameters
+      collector =
+        response
+        .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
       collector += streams(response.next_token) if response.next_token
+      fail 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
+
     def cloudwatchlogs
       @cloudwatchlogs ||= Aws::CloudWatchLogs::Client.new
     end

data/lib/awsutils/version.rb

@@ -1,3 +1,3 @@
 module AwsUtils
-  VERSION = '2.1.2'
+  VERSION = '2.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsutils
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.6
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A set of tools for interacting with AWS (summary)