aws_recon 0.2.26 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94ce0b14c283d62b106df80e56dc8340c4acc37970381cf95294d337d55ceda
-  data.tar.gz: 8e4fb54d9907493f94dfe4a3d73afcb396d8c101c309e8acacac6b527076be81
+  metadata.gz: 1057bb503b9bb209296e646212a72f4f18d974143455396f97635c0f584cb548
+  data.tar.gz: c77f77f73d77451771f8a8589b68a3787b3084fb54cfe97a6e2833c9c32d96bf
 SHA512:
-  metadata.gz: '0283ab12e7885d2462f24038648b5a326978a88465a92869fb8dcd617dde52789383d48a343c017050fc1c321ce72c40466a116b8d2bf3adc861fea2c4307e35'
-  data.tar.gz: e325e70dee2f236d77c0bb72e257a80b14900d26ed3347aa316e9b0e89fec7dbfa82e3fca010ae95959692114ccd58a0b7a8addc93fc573eac193ca5ea0c4ccc
+  metadata.gz: 99f9d4bb4af09f223fb624065a99cd2a5f3b7f7cd2e44ff02c7b42b02b13e380462a067e0e20d5b76bccad41fc7a4dc50f2e06b09a5ad45db65aca2beb3c196a
+  data.tar.gz: a2029d5ef893133b631c0939cb6fd78556fde610c58261a085a54d338210609f0b2d12d1757738846a85a9b7f934437e185a17e922b60eace4eaaec6e8781bef

data/.rubocop.yml

@@ -9,4 +9,20 @@
 #
 # See https://docs.rubocop.org/rubocop/configuration
 Layout/LineLength:
-  Max: 80
+  Max: 100
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always_true
+  Safe: true
+  SafeAutoCorrect: true
+Style/ClassAndModuleChildren:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false

data/lib/aws_recon/collectors/accessanalyzer.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect AccessAnalyzer resources
+#
 class AccessAnalyzer < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/acm.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ACM resources
+#
 class ACM < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/apigateway.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect API Gateway resources
+#
 class APIGateway < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/apigatewayv2.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect API Gateway v2 resources
+#
 class ApiGatewayV2 < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/applicationautoscaling.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ApplicationAutoScaling resources
+#
 class ApplicationAutoScaling < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/athena.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Athena resources
+#
 class Athena < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/autoscaling.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect AutoScaling resources
+#
 class AutoScaling < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/backup.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Backup resources
+#
 class Backup < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/cloudformation.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CloudFormation resources
+#
 class CloudFormation < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/cloudfront.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CloudFront resources
+#
 class CloudFront < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/cloudtrail.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CloudTrail resources
+#
 class CloudTrail < Mapper
   #
   # Returns an array of resources.
@@ -19,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

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CloudWatch resources
+#
 class CloudWatch < Mapper
   #
   # Returns an array of resources.
@@ -23,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/cloudwatchlogs.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CloudWatchLogs resources
+#
 class CloudWatchLogs < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/codebuild.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CodeBuild resources
+#
 class CodeBuild < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/codepipeline.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect CodePipeline resources
+#
 class CodePipeline < Mapper
   #
   # Returns an array of resources.
@@ -25,9 +30,7 @@ class CodePipeline < Mapper
     rescue Aws::CodePipeline::Errors::ServiceError => e
       log_error(e.code)
 
-      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-        raise e
-      end
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     resources

data/lib/aws_recon/collectors/configservice.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Config resources
+#
 class ConfigService < Mapper
   #
   # Returns an array of resources.
@@ -38,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/directconnect.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect DirectConnect resources
+#
 class DirectConnect < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/{directyservice.rb → directoryservice.rb}

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect DirectoryService resources
+#
 class DirectoryService < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/dms.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect DMS resources
+#
 class DatabaseMigrationService < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/dynamodb.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect DynamodDB resources
+#
 class DynamoDB < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/ec2.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect EC2 resources
+#
 class EC2 < Mapper
   #
   # Returns an array of resources.
@@ -50,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|
@@ -71,9 +76,7 @@ class EC2 < Mapper
               if user_data_raw
                 user_data = Base64.decode64(user_data_raw)
 
-                if user_data.force_encoding('UTF-8').ascii_only?
-                  struct.user_data = user_data
-                end
+                struct.user_data = user_data if user_data.force_encoding('UTF-8').ascii_only?
               end
             end
 

data/lib/aws_recon/collectors/ecr.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ECR resources
+#
 class ECR < Mapper
   #
   # Returns an array of resources.
@@ -21,9 +26,7 @@ class ECR < Mapper
       rescue Aws::ECR::Errors::ServiceError => e
         log_error(e.code)
 
-        unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-          raise e
-        end
+        raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
       ensure
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/ecs.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
+#
+# Collect ECS resources
+#
 class ECS < Mapper
   #
   # Returns an array of resources.
   #
-  # TODO: test live
-  #
   def collect
     resources = []
 

data/lib/aws_recon/collectors/efs.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect EFS resources
+#
 class EFS < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/eks.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect EKS resources
+#
 class EKS < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/elasticache.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ElastiCache resources
+#
 class ElastiCache < Mapper
   def collect
     resources = []

data/lib/aws_recon/collectors/elasticloadbalancing.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ELB resources
+#
 class ElasticLoadBalancing < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/elasticloadbalancingv2.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ELBv2 resources
+#
 class ElasticLoadBalancingV2 < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/elasticsearch.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ElasticSearch resources
+#
 class ElasticsearchService < Mapper
   #
   # Returns an array of resources.
@@ -17,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/emr.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect EMR resources
+#
 class EMR < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/firehose.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Firehose resources
+#
 class Firehose < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/guardduty.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
+#
+# Collect GuardDuty resources
+#
 class GuardDuty < Mapper
   #
   # Returns an array of resources.
   #
-  # TODO: test live
-  #
   def collect
     resources = []
 

data/lib/aws_recon/collectors/iam.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect IAM resources
+#
 class IAM < Mapper
   #
   # Returns an array of resources.
@@ -80,7 +85,7 @@ class IAM < Mapper
                                            create_date: p.create_date
                                          }
                                        end
-                                      end
+                                     end
 
         resources.push(struct.to_h)
       end
@@ -102,9 +107,7 @@ class IAM < Mapper
     rescue Aws::IAM::Errors::ServiceError => e
       log_error(e.code)
 
-      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-        raise e
-      end
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     #
@@ -187,9 +190,7 @@ class IAM < Mapper
     rescue Aws::IAM::Errors::ServiceError => e
       log_error(e.code)
 
-      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-        raise e
-      end
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     resources

data/lib/aws_recon/collectors/kafka.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Kafka resources
+#
 class Kafka < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/kinesis.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Kinesis resources
+#
 class Kinesis < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/kms.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect KMS resources
+#
 class KMS < Mapper
   #
   # Returns an array of resources.
@@ -30,9 +35,7 @@ class KMS < Mapper
         rescue Aws::KMS::Errors::ServiceError => e
           log_error(e.code)
 
-          unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-            raise e
-          end
+          raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
         end
 
         # list_grants
@@ -48,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/lambda.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Lambda resources
+#
 class Lambda < Mapper
   def collect
     resources = []

data/lib/aws_recon/collectors/lightsail.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Lightsail resources
+#
 class Lightsail < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/organizations.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Org resources
+#
 class Organizations < Mapper
   #
   # Returns an array of resources.
@@ -49,9 +54,7 @@ class Organizations < Mapper
     rescue Aws::Organizations::Errors::ServiceError => e
       log_error(e.code)
 
-      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-        raise e
-      end
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     resources

data/lib/aws_recon/collectors/rds.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect RDS Resources
+#
 class RDS < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/redshift.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Redshift resources
+#
 class Redshift < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/route53.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Route53 resources
+#
 class Route53 < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/route53domains.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Route53 Domain resources
+#
 class Route53Domains < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/s3.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect S3 Resources
+#
 class S3 < Mapper
   #
   # Returns an array of resources.
@@ -63,9 +68,7 @@ class S3 < Mapper
         rescue Aws::S3::Errors::ServiceError => e
           log_error(e.code)
 
-          unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-            raise e
-          end
+          raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
         end
 
         resources.push(struct.to_h)

data/lib/aws_recon/collectors/sagemaker.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect SageMaker Resources
+#
 class SageMaker < Mapper
   #
   # Returns an array of resources.
@@ -12,7 +17,9 @@ class SageMaker < Mapper
       log(response.context.operation_name, page)
 
       response.notebook_instances.each do |instance|
-        struct = OpenStruct.new(instance.to_h)
+        struct = OpenStruct.new(@client.describe_notebook_instance({
+                                                                     notebook_instance_name: instance.notebook_instance_name
+                                                                   }).to_h)
         struct.type = 'notebook_instance'
         struct.arn = instance.notebook_instance_arn
 
@@ -20,6 +27,23 @@ class SageMaker < Mapper
       end
     end
 
+    #
+    # list_endpoints
+    #
+    @client.list_endpoints.each_with_index do |response, page|
+      log(response.context.operation_name, page)
+
+      response.endpoints.each do |instance|
+        struct = OpenStruct.new(@client.describe_endpoint({
+                                                            endpoint_name: instance.endpoint_name
+                                                          }).to_h)
+        struct.type = 'endpoint'
+        struct.arn = instance.endpoint_arn
+
+        resources.push(struct.to_h)
+      end
+    end
+
     resources
   end
 end

data/lib/aws_recon/collectors/secretsmanager.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Secrets Manager resources
+#
 class SecretsManager < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/securityhub.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Security Hub resources
+#
 class SecurityHub < Mapper
   #
   # Returns an array of resources.
@@ -21,9 +26,7 @@ class SecurityHub < Mapper
     rescue Aws::SecurityHub::Errors::ServiceError => e
       log_error(e.code)
 
-      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-        raise e
-      end
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     resources

data/lib/aws_recon/collectors/servicequotas.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect ServiceQuota resources
+#
 class ServiceQuotas < Mapper
   #
   # Returns an array of resources.
@@ -28,9 +33,7 @@ class ServiceQuotas < Mapper
     rescue Aws::ServiceQuotas::Errors::ServiceError => e
       log_error(e.code, service)
 
-      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-        raise e
-      end
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     resources

data/lib/aws_recon/collectors/ses.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect SES resources
+#
 class SES < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/shield.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Shield resources
+#
 class Shield < Mapper
   #
   # Returns an array of resources.
@@ -27,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
@@ -52,9 +57,7 @@ class Shield < Mapper
   rescue Aws::Shield::Errors::ServiceError => e
     log_error(e.code)
 
-    unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-      raise e
-    end
+    raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
 
     [] # no access or service isn't enabled
   end

data/lib/aws_recon/collectors/sns.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect SNS resources
+#
 class SNS < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/sqs.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect SQS resources
+#
 class SQS < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/ssm.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect SSM resources
+#
 class SSM < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/support.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Support resources
+#
 class Support < Mapper
   #
   # Returns an array of resources.
@@ -28,9 +33,7 @@ class Support < Mapper
   rescue Aws::Support::Errors::ServiceError => e
     log_error(e.code)
 
-    unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
-      raise e
-    end
+    raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
 
     [] # no Support subscription
   end

data/lib/aws_recon/collectors/transfer.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect Transfer resources
+#
 class Transfer < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/wafv2.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect WAFv2 resources
+#
 class WAFV2 < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/workspaces.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect WorkSpaces resources
+#
 class WorkSpaces < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/collectors/xray.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Collect XRay resources
+#
 class XRay < Mapper
   #
   # Returns an array of resources.

data/lib/aws_recon/lib/mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Generic wrapper for service clients.
 #
@@ -64,14 +66,14 @@ class Mapper
   end
 
   def log(*msg)
-    if @options.verbose
-      puts _msg(msg).map { |x| "\x1b[32m#{x}\x1b[0m" }.join("\x1b[35m.\x1b[0m")
-    end
+    return unless @options.verbose
+
+    puts _msg(msg).map { |x| "\x1b[32m#{x}\x1b[0m" }.join("\x1b[35m.\x1b[0m")
   end
 
   def log_error(*msg)
-    if @options.verbose
-      puts _msg(msg).map { |x| "\x1b[35m#{x}\x1b[0m" }.join("\x1b[32m.\x1b[0m")
-    end
+    return unless @options.verbose
+
+    puts _msg(msg).map { |x| "\x1b[35m#{x}\x1b[0m" }.join("\x1b[32m.\x1b[0m")
   end
 end

data/lib/aws_recon/lib/patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Parse and unescape AWS policy document string
 #

data/lib/aws_recon/options.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+#
+# Command line options parser
+#
 class Parser
   DEFAULT_CONFIG_FILE = nil
   DEFAULT_OUTPUT_FILE = File.expand_path(File.join(Dir.pwd, 'output.json')).freeze
@@ -97,16 +100,12 @@ class Parser
 
       # output format
       opts.on('-f', '--format [FORMAT]', 'Specify output format (default: aws)') do |file|
-        if %w[aws custom].include?(file.downcase)
-          args.output_format = file.downcase
-        end
+        args.output_format = file.downcase if %w[aws custom].include?(file.downcase)
       end
 
       # threads
       opts.on('-t', '--threads [THREADS]', "Specify max threads (default: #{Parser::DEFAULT_THREADS}, max: 128)") do |threads|
-        if (0..Parser::MAX_THREADS).include?(threads.to_i)
-          args.threads = threads.to_i
-        end
+        args.threads = threads.to_i if (0..Parser::MAX_THREADS).include?(threads.to_i)
       end
 
       # collect EC2 instance user data

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.2.26"
+  VERSION = "0.2.31"
 end

data/readme.md

@@ -23,7 +23,7 @@ Enter AWS Recon, multi-threaded AWS inventory collection tool written in plain R
 
 ### Requirements
 
-AWS Recon needs AWS account role or credentials with `ReadOnlyAccess`. Full `AdministratorAccess` is over-privileged, but will work as well. The `SecurityAudit` policy is **not** sufficient as it omits access to many services.
+AWS Recon needs an AWS account role or credentials with `ReadOnlyAccess`. Full `AdministratorAccess` is over-privileged, but will work as well. The `SecurityAudit` policy is **not** sufficient as it omits access to many services.
 
 #### Running via Docker
 
@@ -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.26
+  version: 0.2.31
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -197,7 +197,7 @@ files:
 - lib/aws_recon/collectors/codepipeline.rb
 - lib/aws_recon/collectors/configservice.rb
 - lib/aws_recon/collectors/directconnect.rb
-- lib/aws_recon/collectors/directyservice.rb
+- lib/aws_recon/collectors/directoryservice.rb
 - lib/aws_recon/collectors/dms.rb
 - lib/aws_recon/collectors/dynamodb.rb
 - lib/aws_recon/collectors/ec2.rb