aws_recon 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54fad8cccce80029ddf2ae72d7dc8bccb12677d1605f113c16416f2b9e897536
-  data.tar.gz: '02280cf3c096fa03d3b893a19ef444c14f891ab6f1694997ca76905a11290b29'
+  metadata.gz: '091d2a7a27fb6c37494ec2bbddfc029c73e915925ea93e4011dbaaf6fbf637e5'
+  data.tar.gz: a6f2cfb73e6a667f3d3faff70956d26e065d3f83a6dedcdbdf0cd8eb82102385
 SHA512:
-  metadata.gz: cf30189b0f288c076d026104a1ce43775b9ae4704f842aa2d77d7166773a232716e85822392321fe958a74896a2ced3b0f0e36ffbfb82e2b4f5a98f33f17f660
-  data.tar.gz: e0990bc486ffaf659d84de6a23e8d214bb9327c81d8518810682107e1c9144b7d40f35d5a3addf61ce1b5b5b57f3a398898c83b81b6187aa9911b7650e5be5d2
+  metadata.gz: b488755dd29b5d262e2b6775a9de1830f024975874a4f617f0cd01f80a621e2a18e1955b4a590418aa0d1efc203b2427221129ae069c01a038d1ed35bdc0b500
+  data.tar.gz: 8997f3f3350fc9c8a6ded6fbd437816005d5a17a7b6db76c2e3e646b9076af210c4b803a68e2b568bff8ea277950bfb99031c6baa767b23138db5da9869c41c0

data/lib/aws_recon/collectors/dms.rb

@@ -14,7 +14,7 @@ class DatabaseMigrationService < Mapper
       response.replication_instances.each do |instance|
         struct = OpenStruct.new(instance.to_h)
         struct.type = 'replication_instance'
-        struct.arb = "arn:aws:#{@service}:#{@region}::replication_instance/#{instance.replication_instance_identifier}"
+        struct.arn = "arn:aws:#{@service}:#{@region}::replication_instance/#{instance.replication_instance_identifier}"
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/iam.rb

@@ -89,14 +89,19 @@ class IAM < Mapper
     #
     # get_account_password_policy
     #
-    @client.get_account_password_policy.each do |response|
-      log(response.context.operation_name)
+    begin
+      @client.get_account_password_policy.each do |response|
+        log(response.context.operation_name)
 
-      struct = OpenStruct.new(response.password_policy.to_h)
-      struct.type = 'password_policy'
-      struct.arn = "arn:aws:iam::#{@account}:account_password_policy/global"
+        struct = OpenStruct.new(response.password_policy.to_h)
+        struct.type = 'password_policy'
+        struct.arn = "arn:aws:iam::#{@account}:account_password_policy/global"
 
-      resources.push(struct.to_h)
+        resources.push(struct.to_h)
+      end
+    rescue Aws::IAM::Errors::ServiceError => e
+      log_error(e.code)
+      raise e unless suppressed_errors.include?(e.code)
     end
 
     #
@@ -190,6 +195,7 @@ class IAM < Mapper
   def suppressed_errors
     %w[
       ReportNotPresent
+      NoSuchEntity
     ]
   end
 end

data/lib/aws_recon/collectors/organizations.rb

@@ -34,18 +34,32 @@ class Organizations < Mapper
     #
     # list_policies
     #
-    @client.list_policies({ filter: 'SERVICE_CONTROL_POLICY' }).each_with_index do |response, page|
-      log(response.context.operation_name, page)
+    begin
+      @client.list_policies({ filter: 'SERVICE_CONTROL_POLICY' }).each_with_index do |response, page|
+        log(response.context.operation_name, page)
 
-      response.policies.each do |policy|
-        struct = OpenStruct.new(policy.to_h)
-        struct.type = 'service_control_policy'
-        struct.content = @client.describe_policy({ policy_id: policy.id }).policy.content.parse_policy
+        response.policies.each do |policy|
+          struct = OpenStruct.new(policy.to_h)
+          struct.type = 'service_control_policy'
+          struct.content = @client.describe_policy({ policy_id: policy.id }).policy.content.parse_policy
 
-        resources.push(struct.to_h)
+          resources.push(struct.to_h)
+        end
       end
+    rescue Aws::Organizations::Errors::ServiceError => e
+      log_error(e.code)
+      raise e unless suppressed_errors.include?(e.code)
     end
 
     resources
   end
+
+  private
+
+  # not an error
+  def suppressed_errors
+    %w[
+      AccessDeniedException
+    ]
+  end
 end

data/lib/aws_recon/collectors/securityhub.rb

@@ -8,16 +8,30 @@ class SecurityHub < Mapper
     #
     # describe_hub
     #
-    @client.describe_hub.each do |response|
-      log(response.context.operation_name)
+    begin
+      @client.describe_hub.each do |response|
+        log(response.context.operation_name)
 
-      struct = OpenStruct.new(response.to_h)
-      struct.type = 'hub'
-      struct.arn = response.hub_arn
+        struct = OpenStruct.new(response.to_h)
+        struct.type = 'hub'
+        struct.arn = response.hub_arn
 
-      resources.push(struct.to_h)
+        resources.push(struct.to_h)
+      end
+    rescue Aws::SecurityHub::Errors::ServiceError => e
+      log_error(e.code)
+      raise e unless suppressed_errors.include?(e.code)
     end
 
     resources
   end
+
+  private
+
+  # not an error
+  def suppressed_errors
+    %w[
+      InvalidAccessException
+    ]
+  end
 end

data/lib/aws_recon/collectors/support.rb

@@ -37,6 +37,7 @@ class Support < Mapper
   # not an error
   def suppressed_errors
     %w[
+      AccessDeniedException
       SubscriptionRequiredException
     ]
   end

data/lib/aws_recon/services.yaml

@@ -41,6 +41,11 @@
   alias: elasticache
 - name: EMR
   alias: emr
+  excluded_regions:
+    - ap-east-1
+    - af-south-1
+    - eu-south-1
+    - me-south-1
 - name: IAM
   global: true
   alias: iam

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk