awful 0.0.82 → 0.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3bfda266144bf9fe2cf34ef36a17d153936a796
-  data.tar.gz: e348c95715fe5266f46d07901e1c1245ee57b8e8
+  metadata.gz: c30ff309aad62cd97f07ddb4d9f33a3264a1d942
+  data.tar.gz: 07c215651cd3249b9309b3174c3c5b5bc19f8507
 SHA512:
-  metadata.gz: d698f9e77df56dbe5b45e0fa498a93b86173b9d51d6c3e136e97122eb5d5136481aea6ee607d7e69ea718109540e78c6449fa40ccf25f2ae5e00284cf400d36c
-  data.tar.gz: 9d93b2e95fc2bdbff18aaac93f1b2e22ca2aa28207d982523c7d949a34dfe9690be6e1dcca01f7217fb8bc37d112ea1425a47d87c932820b7f3e367d4f4a22d7
+  metadata.gz: 6dcea4755931848808158251e79fa012a3ff660d4e8fd1bfb883739d569003ff3b096559a4143835a69865a2a119a49521121ff52a6130a532d208da67711a71
+  data.tar.gz: 22f850070078679aee2a7b0e028efb163f724a7c6a8d17bef825ae36c6f3254bc3cca904f0e23e4bd135f0703ca223fe75ad755443edf5ee8c756c8b094f7d7a

data/bin/dyn

@@ -2,6 +2,7 @@
 #-*- mode: ruby; -*-
 
 require 'awful'
+require 'awful/dynamodb_streams'
 require 'awful/dynamodb'
 
-Awful::DynamoDB.start(ARGV)
+Awful::DynamoDB.start(ARGV)

data/bin/lambda

@@ -2,6 +2,7 @@
 #-*- mode: ruby; -*-
 
 require 'awful'
+require 'awful/lambda_events'
 require 'awful/lambda'
 
-Awful::Lambda.start(ARGV)
+Awful::Lambda.start(ARGV)

data/lib/awful.rb

@@ -57,14 +57,14 @@ module Awful
         @dynamodb_simple ||= Aws::DynamoDB::Client.new(options)
       end
 
-      def dynamodb_streams
-        @dynamodb_streams ||= Aws::DynamoDBStreams::Client.new
-      end
-
       def s3
         @s3 ||= Aws::S3::Client.new
       end
 
+      def lambda
+        @lambda ||= Aws::Lambda::Client.new
+      end
+
       def support
         @support ||= Aws::Support::Client.new
       end
@@ -157,4 +157,4 @@ module Awful
 
     end
   end
-end
+end

data/lib/awful/dynamodb.rb

@@ -1,7 +1,5 @@
 module Awful
-
   class DynamoDB < Cli
-
     COLORS = {
       CREATING: :yellow,
       UPDATING: :yellow,
@@ -90,10 +88,10 @@ module Awful
       end
     end
 
-    desc 'stream_specification NAME', 'enable/disable streams on the table'
+    desc 'enable_streams NAME', 'enable/disable streams on the table'
     method_option :stream_view_type, aliases: '-t', default: 'NEW_IMAGE', desc: 'view type for the stream (NEW_IMAGE, OLD_IMAGE, NEW_AND_OLD_IMAGES, KEYS_ONLY)'
     method_option :disable,          aliases: '-d', default: false,       desc: 'disable the stream'
-    def stream_specification(name)
+    def enable_streams(name)
       stream_specification = {stream_enabled: !options[:disable]}
       stream_specification.merge!(stream_view_type: options[:stream_view_type].upcase) unless options[:disable]
       dynamodb.update_table(table_name: name, stream_specification: stream_specification)
@@ -237,6 +235,8 @@ module Awful
       p r
     end
 
+    ## see lambda_events.rb for subcommands
+    desc 'streams', 'subcommands for dynamodb streams'
+    subcommand 'streams', DynamodbStreams
   end
-
-end
+end

data/lib/awful/dynamodb_streams.rb

@@ -1,56 +1,54 @@
 module Awful
+  class DynamodbStreams < Cli
+    no_commands do
+      def streams
+        @streams ||= Aws::DynamoDBStreams::Client.new
+      end
+    end
 
-  class DynamoDBStreams < Cli
-
-    desc 'ls [PATTERN]', 'list dynamodb streams [matching PATTERN]'
+    desc 'ls [NAME]', 'list dynamodb streams [for table NAME]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(table_name = nil, exclusive_start_stream_arn = nil)
-      opts = {
+      response = streams.list_streams(
         table_name: table_name,
         exclusive_start_stream_arn: exclusive_start_stream_arn
-      }.reject{ |_,v| v.nil? }
+      )
 
-      r = dynamodb_streams.list_streams(opts)
+      streams = response.streams
 
-      streams = r.streams.tap do |list|
-        if options[:long]
-          print_table list.map{ |s| [s.stream_arn, s.table_name, s.stream_label] }
-        else
-          puts list.map(&:stream_arn)
-        end
+      ## output
+      if options[:long]
+        print_table streams.map{ |s| [s.table_name, s.stream_arn] }.sort
+      else
+        puts streams.map(&:stream_arn)
       end
 
       ## recurse if there is more data to fetch
-      if r.last_evaluated_stream_arn
-        streams += ls(table_name, r.last_evaluated_stream_arn)
-      end
-
+      streams += ls(table_name, response.last_evaluated_stream_arn) if response.last_evaluated_stream_arn
       streams
     end
 
     desc 'dump ARN', 'describe the stream with ARN as yaml'
     def dump(arn)
-      dynamodb_streams.describe_stream(stream_arn: arn).stream_description.tap do |stream|
+      streams.describe_stream(stream_arn: arn).stream_description.tap do |stream|
         puts YAML.dump(stringify_keys(stream.to_hash))
       end
     end
 
     desc 'shards ARN', 'list shards for stream with ARN'
     def shards(arn)
-      dynamodb_streams.describe_stream(stream_arn: arn).stream_description.shards.tap do |shards|
+      streams.describe_stream(stream_arn: arn).stream_description.shards.tap do |shards|
         puts shards.map(&:shard_id)
       end
     end
 
     desc 'get_records ARN SHARD_ID', 'get records for given stream and shard'
     def get_records(arn, shard_id)
-      iterator = dynamodb_streams.get_shard_iterator(stream_arn: arn, shard_id: shard_id, shard_iterator_type: 'TRIM_HORIZON').shard_iterator
+      iterator = streams.get_shard_iterator(stream_arn: arn, shard_id: shard_id, shard_iterator_type: 'TRIM_HORIZON').shard_iterator
 
-      dynamodb_streams.get_records(shard_iterator: iterator).records.tap do |records|
+      streams.get_records(shard_iterator: iterator).records.tap do |records|
         print_table records.map { |r| [r.event_id, r.event_name, r.dynamodb.sequence_number, r.dynamodb.size_bytes] }
       end
     end
-
   end
-
-end
+end

data/lib/awful/lambda.rb

@@ -2,14 +2,9 @@ require 'open-uri'
 require 'tempfile'
 
 module Awful
-
   class Lambda < Cli
 
     no_commands do
-      def lambda
-        @lambda ||= Aws::Lambda::Client.new
-      end
-
       ## return zip file contents, make it if necessary
       def zip_thing(thing)
         if File.directory?(thing)
@@ -112,25 +107,8 @@ module Awful
       end
     end
 
-    desc 'events NAME', 'list event source mappings for lambda function NAME'
-    method_option :long,   aliases: '-l', default: false, desc: 'Long listing'
-    method_option :create, aliases: '-c', default: nil,   desc: 'Create event source mapping with given ARN'
-    def events(name)
-      if options[:create]
-        lambda.create_event_source_mapping(function_name: name, event_source_arn: options[:create], starting_position: 'LATEST').tap do |response|
-          puts YAML.dump(stringify_keys(response.to_hash))
-        end
-      else # list
-        lambda.list_event_source_mappings(function_name: name).event_source_mappings.tap do |sources|
-          if options[:long]
-            print_table sources.map { |s| [s.event_source_arn, s.state, "Batch size: #{s.batch_size}, Last result: #{s.last_processing_result}", s.last_modified] }
-          else
-            puts sources.map(&:event_source_arn)
-          end
-        end
-      end
-    end
-
+    ## see lambda_events.rb for subcommands
+    desc 'events', 'subcommands for lambda event mappings'
+    subcommand 'events', LambdaEvents
   end
-
-end
+end

data/lib/awful/lambda_events.rb

@@ -0,0 +1,64 @@
+module Awful
+  class LambdaEvents < Cli
+    COLORS = {
+      OK:       :green,
+      PROBLEM:  :red,
+      Enabled:  :green,
+      Disabled: :red
+    }
+
+    no_commands do
+      def color(string)
+        set_color(string, COLORS.fetch(string.to_sym, :yellow))
+      end
+    end
+
+    desc 'ls [FUNCTION_NAME]', 'list event source mappings'
+    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    def ls(name = nil)
+      lambda.list_event_source_mappings(function_name: name).event_source_mappings.tap do |sources|
+        if options[:long]
+          print_table sources.map { |s|
+            [
+              s.uuid,
+              color(s.state),
+              "Batch size: #{s.batch_size}",
+              "Last result: #{color(s.last_processing_result.scan(/\w+/).first)}",
+              s.last_modified
+            ]
+          }
+        else
+          puts sources.map(&:uuid)
+        end
+      end
+    end
+
+    desc 'dump UUID', 'get config details for given mapping'
+    def dump(uuid)
+      lambda.get_event_source_mapping(uuid: uuid).tap do |details|
+        puts YAML.dump(stringify_keys(details.to_hash))
+      end
+    end
+
+    desc 'create FUNCTION_NAME EVENT_SOURCE_ARN', 'identify a stream as an event source for a lambda function'
+    method_option :enabled,           type: :boolean, default: true,           desc: 'Lambda should begin polling the event source'
+    method_option :batch_size,        type: :numeric, default: 1,              desc: 'The largest number of records that lambda will retrieve'
+    method_option :starting_position, type: :string,  default: 'TRIM_HORIZON', desc: 'Posn to start reading: TRIM_HORIZON, LATEST'
+    def create(name, src)
+      lambda.create_event_source_mapping(
+        function_name: name,
+        event_source_arn: src,
+        enabled: options[:enabled],
+        batch_size: options[:batch_size],
+        starting_position: options[:starting_position]
+      )
+    end
+
+    desc 'delete UUID', 'delete event source mapping with given id'
+    def delete(uuid)
+      if yes?("Really delete event source mapping #{uuid}?")
+        lambda.delete_event_source_mapping(uuid: uuid)
+      end
+    end
+  end
+end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.82'
+  VERSION = '0.0.83'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.82
+  version: 0.0.83
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - lib/awful/elb.rb
 - lib/awful/iam.rb
 - lib/awful/lambda.rb
+- lib/awful/lambda_events.rb
 - lib/awful/launch_config.rb
 - lib/awful/rds.rb
 - lib/awful/route53.rb