bjn_inventory 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c369f7e212b129cc8ac7a5250d52871f2deacc8
-  data.tar.gz: 21598b6ea85a9a682ae56f9225427d77c87b189d
+  metadata.gz: 21424b757dc88cdcc3a45e9b73048cdc6ab89aca
+  data.tar.gz: 29ccd6111924efa1aad46597613d314672e2b56e
 SHA512:
-  metadata.gz: f9a44ce178222496e27deeb2d5f4ac243d16f281380e88acfd138ece48e906f4cc62bd5ebeaffe3ca695a18144daf0f6acf365725011982ea96ca9001ccd5f30
-  data.tar.gz: 14822ee517b05531ffb82397316658d9794f13482639d3135d909dc63826058ec396393bdb225518ba23868253d135f81288283544b1b32410e4c5bd72553f8b
+  metadata.gz: a80b616041802f4627d4226f667dbf6f9cf5ed016a4754ac9cdde94b67eb01f6e01f55ce7586ad9e5f1b694a49879e15318459d991c88b914b20bbe1f85199ae
+  data.tar.gz: 2bb3e6f0181a5808c51201431a7b0ed3294550567062903b7c583c68b6ab1f016daa43e18faf3c0f1edafa78b3ae65cfe519ba29a7c75260afd868a0cc817624

data/bin/aws-elb-source

@@ -11,7 +11,7 @@ parser = Trollop::Parser.new do
     banner <<-USAGE.gsub(/^\s{8}/,'')
         Usage:
           aws-elb-source [options]
-          Download entries corresponding to classic elastic loadbalancers (not application load balancers)
+          Download entries corresponding to classic, application, and network elastic loadbalancers
     USAGE
 
     opt :region, "Specify region (default is all regions)", type: :string, multi: true

data/bjn_inventory.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'jsonpath', "~> 0.7.2"
-  spec.add_dependency 'trollop'
-  spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'trollop', "~> 2.0"
+  spec.add_dependency 'aws-sdk', "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec_junit_formatter"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0"
 end

data/lib/bjn_inventory/source_command/aws_elb.rb

@@ -39,7 +39,7 @@ module BjnInventory
                 Aws::EC2::Client.new(opts)
             end
 
-            def new_client(region=nil)
+            def new_classic_client(region=nil)
                 opts = {
                     region: (region || @regions.first)
                 }
@@ -47,36 +47,79 @@ module BjnInventory
                 Aws::ElasticLoadBalancing::Client.new(opts)
             end
 
+            def new_client(region=nil)
+                opts = {
+                    region: (region || @regions.first)
+                }
+                opts.update({profile: @profile}) if @profile
+                Aws::ElasticLoadBalancingV2::Client.new(opts)
+            end
+
             def retrieve_entries(override_client=nil)
                 entries = @regions.map do |region|
-                    client = override_client || @client || new_client(region)
-                    _retrieve_entries([], client)
+                    if override_client || @client
+                        client = override_client || @client
+                        logger.debug "client: #{client.class.to_s}"
+                        all_lbs = _retrieve_entries([], client)
+                    else
+                        logger.debug "region: #{region}"
+                        classic_lbs = _retrieve_entries([], new_classic_client(region))
+                        v2_lbs = _retrieve_entries([], new_client(region))
+                        all_lbs = classic_lbs + v2_lbs
+                    end
                 end.flatten
             end
 
             def _retrieve_entries(current, client, marker=nil)
-                logger.debug "Describing load balancers (page #{marker})"
+                logger.debug "client: #{client.class.to_s}"
+                logger.debug "Describing load balancers (page #{marker || 0})"
                 chunk_result = client.describe_load_balancers(marker: marker, page_size: @page_size)
                 logger.debug "... described"
-                marker = chunk_result.next_marker
+                new_marker = chunk_result.next_marker
+                if client.class.to_s.include?('Aws::ElasticLoadBalancing::Client')
+                    chunk_list = _retrieve_classic_entries(current, client, chunk_result)
+                else
+                    chunk_list = _retrieve_v2_entries(current, client, chunk_result)
+                end
+                if new_marker
+                    return _retrieve_entries(current + chunk_list, client, new_marker)
+                else
+                    return current + chunk_list
+                end
+            end
+
+            def _retrieve_classic_entries(current, client, chunk_result)
                 if chunk_result.load_balancer_descriptions.length > 0
                     chunk = Hash[chunk_result.load_balancer_descriptions.map { |lb| [lb.load_balancer_name, lb.to_h] }]
                     logger.debug "Describing load balancer tags"
                     # Amazon only allows 20 names to be submitted
                     chunk_tags = Hash[client.describe_tags(load_balancer_names: chunk.keys).tag_descriptions.map do |lbtags|
-                                          [lbtags.load_balancer_name, { tags: lbtags.to_h[:tags] }]
-                                      end]
+                        [lbtags.load_balancer_name, { tags: lbtags.to_h[:tags] }]
+                    end]
                     logger.debug "... described"
                     chunk_list = chunk.map { |lbname, lb| lb.merge(chunk_tags[lbname]) }
                 else
                     chunk_list = [ ]
                 end
                 chunk_list = @filters.select(chunk_list)
-                if marker
-                    return _retrieve_entries(current + chunk_list, client, marker)
+                return chunk_list
+            end
+
+            def _retrieve_v2_entries(current, client, chunk_result)
+                if chunk_result.load_balancers.length > 0
+                    chunk = Hash[chunk_result.load_balancers.map { |lb| [lb.load_balancer_arn, lb.to_h] }]
+                    logger.debug "Describing load balancer tags"
+                    # Amazon only allows 20 names to be submitted
+                    chunk_tags = Hash[client.describe_tags(resource_arns: chunk.keys).tag_descriptions.map do |lbtags|
+                        [lbtags.resource_arn, { tags: lbtags.to_h[:tags] }]
+                    end]
+                    logger.debug "... described"
+                    chunk_list = chunk.map { |lbname, lb| lb.merge(chunk_tags[lbname]) }
                 else
-                    return current + chunk_list
+                    chunk_list = [ ]
                 end
+                chunk_list = @filters.select(chunk_list)
+                return chunk_list
             end
 
         end

data/lib/bjn_inventory/version.rb

@@ -1,3 +1,3 @@
 module BjnInventory
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bjn_inventory
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Brinkley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonpath
@@ -28,30 +28,30 @@ dependencies:
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: