aws_recon 0.2.29 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a607b768fb5220d5db2fb904b74a06669ac5f3b966260bd401cc63eed5fc0c66
-  data.tar.gz: 4798d7b5d6ee9ec3353a2cb0d5a00d284102030b46b2a0a66637d0741a439f9f
+  metadata.gz: 9097aec2d8a54e8604fd3859277dddfb4c124d4ff5e2637896f07300e8453a69
+  data.tar.gz: af2804e4ef46dce207506e3bae4123b4a6fe5279e5ede5751427e0b3cd12db64
 SHA512:
-  metadata.gz: 4846c6ec9026d462b18a9ccecd0efa628d61b06431568c80d11c6b845fba94b964f564fb3ad018cfc2c3786ba57a7faf6080aba6617905d6fb3003b53ad21034
-  data.tar.gz: 4de17a7300f269790a9406788943c8260617022914a3b0c9e84e2f3a1b8557552a7ada8b4f0681442a9cba70784f2309c4a395b4fc4e4e4755dc73fdbaa52cb0
+  metadata.gz: 51d6793e2bf680f0915f4edec1b9741c147d6e393a3ecb08b3bc8b01e0a664bd6a4bfb55644f7bff94b83cca8c1315bccbeffa417a392bd958e93000135ffda7
+  data.tar.gz: e8df00ba291a752e0573892e6aaf513ec72176416fdef2fb4553e09fa13af6f12684034b3198e5a9529f8a2baf06ea658b4bb92961eadd6163aef46390b9d344

data/lib/aws_recon/collectors/cloudtrail.rb

@@ -24,7 +24,7 @@ class CloudTrail < Mapper
                  end
 
         struct = OpenStruct.new(trail.to_h)
-        struct.tags = client.list_tags({ resource_id_list: [trail.trail_arn] }).resource_tag_list.first.tags_list
+        struct.tags = client.list_tags({ resource_id_list: [trail.trail_arn] }).resource_tag_list.first.tags_list.map(&:to_h)
         struct.type = 'cloud_trail'
         struct.event_selectors = client.get_event_selectors({ trail_name: trail.name }).to_h
         struct.status = client.get_trail_status({ name: trail.name }).to_h

data/lib/aws_recon/collectors/cloudwatch.rb

@@ -28,6 +28,7 @@ class CloudWatch < Mapper
         struct = OpenStruct.new(alarm.to_h)
         struct.type = 'metric_alarm'
         struct.arn = alarm.alarm_arn
+        struct.state_reason_data = alarm.state_reason_data&.parse_policy
 
         resources.push(struct.to_h)
       end

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/elasticsearch.rb

@@ -22,6 +22,7 @@ class ElasticsearchService < Mapper
         # describe_elasticsearch_domains
         struct = OpenStruct.new(@client.describe_elasticsearch_domain({ domain_name: domain.domain_name }).domain_status.to_h)
         struct.type = 'domain'
+        struct.access_policies = struct.access_policies&.parse_policy
 
         resources.push(struct.to_h)
       end

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/kms.rb

@@ -51,7 +51,7 @@ class KMS < Mapper
         log(response.context.operation_name, 'get_key_policy')
         struct.policy = @client
                         .get_key_policy({ key_id: key.key_id, policy_name: 'default' })
-                        .policy
+                        .policy.parse_policy
 
         # list_aliases
         log(response.context.operation_name, 'list_aliases')

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/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/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.2.29"
+  VERSION = "0.2.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.2.34
 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