aws_recon 0.2.30 → 0.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818784fdc3d39b16bc30cafd043aec9396f3a8bb0e1fb62b696deb40a861d953
-  data.tar.gz: ebd7c961414a16e7cfeb60e8f3f871051bfd0705cc7a5408cc8fdd054d5f7925
+  metadata.gz: e0e56eb0ec39b06ea92cbf5ea236dc2049ffe349b8081b1e31ea83280f987298
+  data.tar.gz: 1639da4ecc67a230b36ce9c4bb3eb38012b57a02c0fc33850916063ec9bb8fd5
 SHA512:
-  metadata.gz: 52fc427274d6ac70c8565eb139681a3c0e0b243db9ee1acaced741fcc688496ce383629755d6e3aa49ec1bfdf47891adce77b88a2a095f000245461ea2508f0d
-  data.tar.gz: e6f4fe0b53ea000b766c94f8eaafa7dddf33086916419ae14fd65db7218ecb853d85d94e546c1be086ec48d4837b5fa64708326f7c2e8517a04602ff7b4dd9e7
+  metadata.gz: a941be401c91901d2309dc11bebd494dae518ea3f8ac23896919e78223fce30acd211b2b05ae406994502a44d53e3870d1dc93b107189813c70a794e2199c490
+  data.tar.gz: 9b7d77b54ea0818084451c7d339b0c5d1244e0c45ad0a5665458470a5e5225ef05301aed61f0d93085429f2f2251382d15f98c4d66310b093d197fb858558b80

data/lib/aws_recon/collectors/configservice.rb

@@ -43,7 +43,7 @@ class ConfigService < Mapper
       response.configuration_recorders.each do |recorder|
         struct = OpenStruct.new(recorder.to_h)
         struct.type = 'configuration_recorder'
-        struct.arn = "arn:aws:config:#{@region}:configuration_recorder/#{recorder.name}"
+        struct.arn = "arn:aws:config:#{@region}:#{@account}:configuration_recorder/#{recorder.name}"
 
         # describe_configuration_recorder_status (only accepts one recorder)
         @client.describe_configuration_recorder_status({ configuration_recorder_names: [recorder.name] }).each do |response|

data/lib/aws_recon/collectors/ec2.rb

@@ -55,8 +55,8 @@ class EC2 < Mapper
         log(response.context.operation_name, page)
 
         # reservations
-        response.reservations.each_with_index do |reservation, page|
-          log(response.context.operation_name, 'reservations', page)
+        response.reservations.each_with_index do |reservation, rpage|
+          log(response.context.operation_name, 'reservations', rpage)
 
           # instances
           reservation.instances.each do |instance|

data/lib/aws_recon/collectors/elasticloadbalancing.rb

@@ -20,6 +20,7 @@ class ElasticLoadBalancing < Mapper
         struct = OpenStruct.new(elb.to_h)
         struct.type = 'load_balancer'
         struct.arn = elb.dns_name
+        struct.load_balancer_version = 'v1'
 
         # describe_load_balancer_policies
         struct.policies = @client

data/lib/aws_recon/collectors/elasticloadbalancingv2.rb

@@ -20,6 +20,8 @@ class ElasticLoadBalancingV2 < Mapper
         struct = OpenStruct.new(elb.to_h)
         struct.type = 'load_balancer'
         struct.arn = elb.load_balancer_arn
+        struct.load_balancer_version = 'v2'
+        struct.load_balancer_type = elb.type
         struct.listeners = []
         struct.target_groups = []
 

data/lib/aws_recon/collectors/guardduty.rb

@@ -22,7 +22,7 @@ class GuardDuty < Mapper
         # get_detector
         struct = OpenStruct.new(@client.get_detector({ detector_id: detector }).to_h)
         struct.type = 'detector'
-        struct.arn = "arn:aws:guardduty:#{@region}:detector/#{detector}"
+        struct.arn = "arn:aws:guardduty:#{@region}:#{@account}:detector/#{detector}"
 
         # get_findings_statistics (only active findings)
         struct.findings_statistics = @client.get_findings_statistics({

data/lib/aws_recon/collectors/iam.rb

@@ -85,7 +85,7 @@ class IAM < Mapper
                                            create_date: p.create_date
                                          }
                                        end
-                                      end
+                                     end
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/rds.rb

@@ -67,6 +67,24 @@ class RDS < Mapper
       end
     end
 
+    #
+    # describe_db_cluster_snapshots
+    #
+    @client.describe_db_cluster_snapshots.each_with_index do |response, page|
+      log(response.context.operation_name, page)
+
+      response.db_cluster_snapshots.each do |snapshot|
+        log(response.context.operation_name, snapshot.db_cluster_snapshot_identifier)
+
+        struct = OpenStruct.new(snapshot.to_h)
+        struct.type = 'db_cluster_snapshot'
+        struct.arn = snapshot.db_cluster_snapshot_arn
+        struct.parent_id = snapshot.db_cluster_identifier
+
+        resources.push(struct.to_h)
+      end
+    end
+
     #
     # describe_db_engine_versions
     #

data/lib/aws_recon/collectors/route53.rb

@@ -19,7 +19,7 @@ class Route53 < Mapper
       response.hosted_zones.each do |zone|
         struct = OpenStruct.new(zone.to_h)
         struct.type = 'zone'
-        struct.arn = zone.id
+        struct.arn = "aws:route53:#{@region}:#{@account}:zone/#{zone.name}"
         struct.logging_config = @client
                                 .list_query_logging_configs({ hosted_zone_id: zone.id })
                                 .query_logging_configs.first.to_h

data/lib/aws_recon/collectors/ses.rb

@@ -19,7 +19,7 @@ class SES < Mapper
       response.identities.each do |identity|
         struct = OpenStruct.new
         struct.type = 'identity'
-        struct.arn = "aws:ses:#{@region}::identity/#{identity}"
+        struct.arn = "aws:ses:#{@region}:#{@account}:identity/#{identity}"
 
         # get_identity_dkim_attributes
         struct.dkim_attributes = @client.get_identity_dkim_attributes({ identities: [identity] }).dkim_attributes[identity].to_h

data/lib/aws_recon/collectors/ssm.rb

@@ -35,7 +35,7 @@ class SSM < Mapper
         struct = OpenStruct.new(parameter.to_h)
         struct.string_type = parameter.type
         struct.type = 'parameter'
-        struct.arn = "arn:aws:#{@service}:#{@region}::parameter:#{parameter.name}"
+        struct.arn = "arn:aws:#{@service}:#{@region}:#{@account}:parameter:#{parameter.name}"
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.2.30"
+  VERSION = "0.2.35"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.35
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk