aws_recon 0.2.28 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df2a508259a0c930a5bfa6c9c01965eeb1fe9955fb6dc48e812303a79062d85
-  data.tar.gz: 4118ae4e81b0361d8e6c5193eb4adeb69f7c6c0e37e2e8c13ed6e4357c4b377b
+  metadata.gz: '049b5ee7040e057fade76bdfaa07078ad216d95b134049ca5d0575bb540f5547'
+  data.tar.gz: f4e8d67b732aa5b15252bf2acbf1a2f31aa7cc2341d058c9ad9ffe51290d532e
 SHA512:
-  metadata.gz: 633d6e44f13ffb2d1cb34aad13cb0139db582e62fe195564f476d41ac267762d28a5f2c9baacc5fee97344d960fff19ef95fc21d72f2bdbf96f701c107107b4a
-  data.tar.gz: e61afaa923d73cf1d48708f8eff4ca5462cc24fd59a3227178356451cb31a1553a7ad9f5818d52da597171bfa49ef58b8259ff4e5a49ae89c1c3bd8f8a3feb4a
+  metadata.gz: 9ee4a95c41437dc33a6b9e7089ab76be8caf0055b06a50f60347258bbc1f487ddae10574c6b1b5f744a58ad91776af4555c3e67e8753cda7b59e6a27a4757665
+  data.tar.gz: 7bff1e16da379ec100973e0928c56b861c8c0fbf48705add34fe00e52e30da37655b93133516df78ac4c6b9fbcae3612ceb86c7baa5fa0ce5a2448e474d5cff3

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

@@ -32,7 +32,7 @@ class Shield < Mapper
       struct = OpenStruct.new
       struct.type = 'contact_list'
       struct.arn = "arn:aws:shield:#{@region}:#{@account}:contact_list"
-      struct.contacts = response.emergency_contact_list.map(&:to_h)
+      struct.contacts = response&.emergency_contact_list&.map(&:to_h)
 
       resources.push(struct.to_h)
     end

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.2.28"
+  VERSION = "0.2.33"
 end

data/readme.md

@@ -54,13 +54,13 @@ To run locally, first install the gem:
 
 ```
 $ gem install aws_recon
-Fetching aws_recon-0.2.26.gem
+Fetching aws_recon-0.2.28.gem
 Fetching aws-sdk-3.0.1.gem
 Fetching parallel-1.20.1.gem
 ...
 Successfully installed aws-sdk-3.0.1
 Successfully installed parallel-1.20.1
-Successfully installed aws_recon-0.2.26
+Successfully installed aws_recon-0.2.28
 ```
 
 Or add it to your Gemfile using `bundle`:
@@ -72,7 +72,7 @@ Resolving dependencies...
 ...
 Using aws-sdk 3.0.1
 Using parallel-1.20.1
-Using aws_recon 0.2.26
+Using aws_recon 0.2.28
 ```
 
 ## Usage
@@ -165,10 +165,13 @@ $ AWS_PROFILE=<profile> aws_recon -s S3,EC2 -r global,us-east-1,us-east-2
 $ AWS_PROFILE=<profile> aws_recon --services S3,EC2 --regions global,us-east-1,us-east-2
 ```
 
-Example [OpenCSPM](https://github.com/OpenCSPM/opencspm) formatted output.
+Example [OpenCSPM](https://github.com/OpenCSPM/opencspm) formatted (NDJSON) output.
 
 ```
-$ AWS_PROFILE=<profile> aws_recon -s S3,EC2 -r global,us-east-1,us-east-2 -f custom > output.json
+$ AWS_PROFILE=<profile> aws_recon -j \
+  -s S3,EC2 \
+  -r global,us-east-1,us-east-2 \
+  -f custom > output.json
 ```
 
 #### Errors
@@ -222,7 +225,7 @@ Most users will want to limit collection to relevant services and regions. Runni
 ```
 $ aws_recon -h
 
-AWS Recon - AWS Inventory Collector (0.2.26)
+AWS Recon - AWS Inventory Collector (0.2.28)
 
 Usage: aws_recon [options]
     -r, --regions [REGIONS]          Regions to scan, separated by comma (default: all)

metadata

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