swa 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d68962033d474157c7cadb13472a7caa52b276
-  data.tar.gz: f0b954064b850223718f06d2310269ce81534099
+  metadata.gz: 518a3bd32a4bf016d2001f1c218a11075bcb439f
+  data.tar.gz: 14cef26fd503b59396ae9eeb2eb950cd3823ff30
 SHA512:
-  metadata.gz: aac97d88b50058e49ce713e83628986e84e6756b5ca2f4a9804d9ee2fb81bfdb4e5199e3ced6395dbc86fb090bae020577c009f62b9057b6dbe46628f4c9800d
-  data.tar.gz: b909e0ff69d22933101c0a9e20eb4f580e6589a31992ecfb88e20cc71ccf109321ba2edb292e3da23eb3825494979406cd2f9a85bf20e28405f957389034f3f6
+  metadata.gz: 677537cc4f3c0acb8f93569eb27950b3b76db266b5dfe4a6233ca5990d97f09583a7725c5219a2bddb18d7c29dd8496d42965ffc9f565c81b6b81355e697c77a
+  data.tar.gz: 26d882e959cbd567c9533d2e97144aeeea21cae0e42ca3770f93b908e2cda20d2d815f9d17c45fa99ae9c34040b6c0bb9001128f6ef15a852c97682232b5c9b0

data/lib/swa/cli/collection_behaviour.rb

@@ -19,6 +19,14 @@ module Swa
 
         end
 
+        target.subcommand ["ids"], "Just print ids" do
+          def execute
+            collection.each do |i|
+              puts i.id
+            end
+          end
+        end
+
         target.subcommand ["data", "d"], "Full details" do
 
           parameter "[QUERY]", "JMESPath expression"

data/lib/swa/cli/ec2_command.rb

@@ -302,12 +302,34 @@ module Swa
         EOF
 
         option "--owned-by", "OWNER", "with specified owner", :default => "self"
+        option ["--volume", "--of"], "VOLUME-ID", "for specified volume"
+
+        option ["--started-after", "--after"], "WHEN", "earliest start-time"
+        option ["--started-before", "--before"], "WHEN", "latest start-time"
 
         include TagFilterOptions
         include CollectionBehaviour
 
         private
 
+        def volume=(volume_id)
+          add_filter("volume-id", volume_id)
+        end
+
+        def started_after=(datetime_string)
+          min_start_time = parse_datetime(datetime_string).max
+          selector.add do |image|
+            image.start_time > min_start_time
+          end
+        end
+
+        def started_before=(datetime_string)
+          max_start_time = parse_datetime(datetime_string).min
+          selector.add do |image|
+            image.start_time < max_start_time
+          end
+        end
+
         def snapshots
           query_options[:owner_ids] = [owned_by]
           query_for(:snapshots, Swa::EC2::Snapshot)

data/lib/swa/cli/elb_command.rb

@@ -0,0 +1,53 @@
+require "aws-sdk-resources"
+require "swa/cli/base_command"
+require "swa/cli/collection_behaviour"
+require "swa/cli/item_behaviour"
+require "swa/elb/load_balancer"
+
+module Swa
+  module CLI
+
+    class ElbCommand < BaseCommand
+
+      subcommand ["load-balancer", "lb"], "Show load-balancer" do
+
+        parameter "NAME", "ELB name"
+
+        include ItemBehaviour
+
+        private
+
+        def item
+          results = describe_load_balancers(:load_balancer_names => [name])
+          signal_error "No such ELB '#{name}'" unless results.any?
+          Swa::ELB::LoadBalancer.new(results.first)
+        end
+
+      end
+
+      subcommand ["load-balancers", "lbs"], "Show load-balancers" do
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          Swa::ELB::LoadBalancer.list(describe_load_balancers)
+        end
+
+      end
+
+      protected
+
+      def elb_client
+        ::Aws::ElasticLoadBalancing::Client.new(aws_config)
+      end
+
+      def describe_load_balancers(options = {})
+        elb_client.describe_load_balancers(options).load_balancer_descriptions
+      end
+
+    end
+
+  end
+end

data/lib/swa/cli/main_command.rb

@@ -1,6 +1,7 @@
 require "swa/cli/base_command"
 require "swa/cli/cloud_formation_command"
 require "swa/cli/ec2_command"
+require "swa/cli/elb_command"
 require "swa/cli/iam_command"
 require "swa/cli/kms_command"
 require "swa/cli/s3_command"
@@ -12,6 +13,7 @@ module Swa
 
       subcommand ["cf", "cloudformation"], "CloudFormation stuff", CloudFormationCommand
       subcommand "ec2", "EC2 stuff", Ec2Command
+      subcommand "elb", "elb stuff", ElbCommand
       subcommand "iam", "IAM stuff", IamCommand
       subcommand "kms", "KMS stuff", KmsCommand
       subcommand "s3", "S3 stuff", S3Command

data/lib/swa/cloud_formation/stack.rb

@@ -7,6 +7,10 @@ module Swa
 
     class Stack < Resource
 
+      def id
+        name
+      end
+
       def summary
         [
           pad(name, 44),

data/lib/swa/ec2/image.rb

@@ -8,6 +8,10 @@ module Swa
 
       include TaggedResource
 
+      def id
+        ami.image_id
+      end
+
       def summary
         [
           field(ami, :image_id),

data/lib/swa/ec2/instance.rb

@@ -9,6 +9,10 @@ module Swa
 
       include TaggedResource
 
+      def id
+        i.instance_id
+      end
+
       def summary
         [
           field(i, :instance_id),

data/lib/swa/ec2/key_pair.rb

@@ -5,6 +5,10 @@ module Swa
 
     class KeyPair < Resource
 
+      def id
+        name
+      end
+
       def summary
         [
           pad(name, 44),

data/lib/swa/ec2/security_group.rb

@@ -6,6 +6,10 @@ module Swa
 
     class SecurityGroup < Resource
 
+      def id
+        sg.group_id
+      end
+
       def summary
         [
           field(sg, :group_id),

data/lib/swa/ec2/snapshot.rb

@@ -8,17 +8,26 @@ module Swa
 
       include TaggedResource
 
+      def id
+        s.snapshot_id
+      end
+
       def summary
         [
           field(s, :snapshot_id),
           field(s, :volume_id),
-          sprintf("%5d", s.volume_size),
-          s.start_time.iso8601,
-          rpad(s.progress, 4),
-          quoted(s.description)
+          sprintf("%5d", volume_size),
+          start_time.iso8601,
+          rpad(progress, 4),
+          quoted(description)
         ].join("  ")
       end
 
+      delegate :description
+      delegate :progress
+      delegate :start_time
+      delegate :volume_size
+
       delegate :delete
 
       private

data/lib/swa/ec2/subnet.rb

@@ -8,6 +8,10 @@ module Swa
 
       include TaggedResource
 
+      def id
+        subnet.subnet_id
+      end
+
       def summary
         [
           field(subnet, :subnet_id),

data/lib/swa/ec2/volume.rb

@@ -8,6 +8,10 @@ module Swa
 
       include TaggedResource
 
+      def id
+        v.volume_id
+      end
+
       def summary
         [
           field(v, :volume_id),

data/lib/swa/ec2/vpc.rb

@@ -8,6 +8,10 @@ module Swa
 
       include TaggedResource
 
+      def id
+        vpc.vpc_id
+      end
+
       def summary
         [
           field(vpc, :vpc_id),

data/lib/swa/elb/load_balancer.rb

@@ -0,0 +1,24 @@
+require "swa/record"
+
+module Swa
+  module ELB
+
+    class LoadBalancer < Record
+
+      def summary
+        [
+          pad(name, 36),
+          scheme
+        ].join("  ")
+      end
+
+      def name
+        aws_record.load_balancer_name
+      end
+
+      delegate :scheme
+
+    end
+
+  end
+end

data/lib/swa/iam/group.rb

@@ -5,8 +5,18 @@ module Swa
 
     class Group < Resource
 
+      def id
+        group.group_id
+      end
+
+      def name
+        group.group_name
+      end
+
+      delegate :arn
+
       def summary
-        group.arn
+        arn
       end
 
       private

data/lib/swa/iam/policy.rb

@@ -6,6 +6,10 @@ module Swa
 
     class Policy < Resource
 
+      def id
+        policy.policy_id
+      end
+
       def summary
         [
           pad(policy.arn, 60),

data/lib/swa/iam/role.rb

@@ -5,6 +5,10 @@ module Swa
 
     class Role < Resource
 
+      def id
+        role.role_id
+      end
+
       def summary
         role.name
       end

data/lib/swa/iam/user.rb

@@ -5,6 +5,10 @@ module Swa
 
     class User < Resource
 
+      def id
+        user.user_id
+      end
+
       def summary
         user.name
       end

data/lib/swa/kms/alias.rb

@@ -5,6 +5,10 @@ module Swa
 
     class Alias < Record
 
+      def id
+        name
+      end
+
       def summary
         [
           pad(name, 36),

data/lib/swa/record.rb

@@ -19,6 +19,12 @@ module Swa
       camelize_keys(aws_record.to_h)
     end
 
+    extend Forwardable
+
+    def self.delegate(*methods)
+      def_delegators :aws_record, *methods
+    end
+
     private
 
     attr_reader :aws_record

data/lib/swa/s3/bucket.rb

@@ -6,10 +6,16 @@ module Swa
 
     class Bucket < Resource
 
+      def id
+        name
+      end
+
       def summary
-        bucket.name
+        name
       end
 
+      delegate :name
+
       def uri
         "s3://#{bucket.name}"
       end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ files:
 - lib/swa/cli/collection_behaviour.rb
 - lib/swa/cli/data_output.rb
 - lib/swa/cli/ec2_command.rb
+- lib/swa/cli/elb_command.rb
 - lib/swa/cli/filter_options.rb
 - lib/swa/cli/iam_command.rb
 - lib/swa/cli/item_behaviour.rb
@@ -164,6 +165,7 @@ files:
 - lib/swa/ec2/tagged_resource.rb
 - lib/swa/ec2/volume.rb
 - lib/swa/ec2/vpc.rb
+- lib/swa/elb/load_balancer.rb
 - lib/swa/iam/group.rb
 - lib/swa/iam/policy.rb
 - lib/swa/iam/role.rb
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: AWS, backwards