aws_recon 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b98e94e11398d8f2aec76174c8d660be040521e44439ca70ca7b5b680e6a631
-  data.tar.gz: e8920ba7308df8491ae6ce6271188fedf3e57e499bc51f6d9d772728277ef6a6
+  metadata.gz: 02f62713767ee1d437543e7684f844a1a9a922179bf6be3688ef7ccb114de345
+  data.tar.gz: d71ef31099b1fbee477b482a9aa84bfe6c9e091aacf2772678cbdf3b9dbfb7ca
 SHA512:
-  metadata.gz: b4c38506bd2a3f6a84d1bbe430f9812e5989bf80d6e8198bfee55ebb1b7f6b8010ee998b896e4202443224046a5fd33c1ed1913fa43d59a25d2cfdf4028d94cc
-  data.tar.gz: a91bd12229dead116b77d412043ecfcef306af8a2ac80772e2c6596574c488cd9e9c97e662334d76a97acb50b95bc578c51ccfcd5dbb3c7b53145e832eea9989
+  metadata.gz: 9215bf848adbd54d2652b35429897ac23e5f7140d6c7aa79db941622c95dee3468bd0354aedcdb3378086592740ea496b435a32adc138ce491a999b56ea4fc59
+  data.tar.gz: f151740b1e793abcae34a948f6375f8ff3a496d52a4df596cd115f59260b0afbbc1710400646c77eece2220fe399aef6ef5f181d2ad5a6cf326ebf51b4ea75d9

data/lib/aws_recon/collectors/ec2.rb

@@ -29,7 +29,7 @@ class EC2 < Mapper
         struct = OpenStruct.new
         struct.attributes = response.account_attributes.map(&:to_h)
         struct.type = 'account'
-        struct.arn = "arn:aws:ec2::#{@account}/account_attributes"
+        struct.arn = "arn:aws:ec2::#{@account}:attributes/account_attributes"
 
         resources.push(struct.to_h)
       end
@@ -45,7 +45,7 @@ class EC2 < Mapper
 
         struct = OpenStruct.new(response.to_h)
         struct.type = 'ebs_encryption_settings'
-        struct.arn = "arn:aws:ec2:#{@region}:#{@account}/ebs_encryption_settings"
+        struct.arn = "arn:aws:ec2:#{@region}:#{@account}:settings/ebs_encryption_settings"
 
         resources.push(struct.to_h)
       end
@@ -64,7 +64,7 @@ class EC2 < Mapper
           reservation.instances.each do |instance|
             struct = OpenStruct.new(instance.to_h)
             struct.type = 'instance'
-            struct.arn = instance.instance_id # no true ARN
+            struct.arn = "arn:aws:ec2:#{@region}:#{@account}:instance/#{instance.instance_id}" # no true ARN
             struct.reservation_id = reservation.reservation_id
 
             # collect instance user_data
@@ -96,7 +96,7 @@ class EC2 < Mapper
         response.vpcs.each do |vpc|
           struct = OpenStruct.new(vpc.to_h)
           struct.type = 'vpc'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{vpc.vpc_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:vpc/#{vpc.vpc_id}" # no true ARN
           struct.flow_logs = @client
                              .describe_flow_logs({ filter: [{ name: 'resource-id', values: [vpc.vpc_id] }] })
                              .flow_logs.first.to_h
@@ -114,7 +114,7 @@ class EC2 < Mapper
         response.security_groups.each do |security_group|
           struct = OpenStruct.new(security_group.to_h)
           struct.type = 'security_group'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{security_group.group_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:security_group/#{security_group.group_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -129,7 +129,7 @@ class EC2 < Mapper
         response.network_interfaces.each do |network_interface|
           struct = OpenStruct.new(network_interface.to_h)
           struct.type = 'network_interface'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{network_interface.network_interface_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:network_interface/#{network_interface.network_interface_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -144,7 +144,7 @@ class EC2 < Mapper
         response.network_acls.each do |network_acl|
           struct = OpenStruct.new(network_acl.to_h)
           struct.type = 'network_acl'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{network_acl.network_acl_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:network_acl/#{network_acl.network_acl_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -159,7 +159,7 @@ class EC2 < Mapper
         response.subnets.each do |subnet|
           struct = OpenStruct.new(subnet.to_h)
           struct.type = 'subnet'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{subnet.subnet_arn}" # no true ARN
+          struct.arn = subnet.subnet_arn
 
           resources.push(struct.to_h)
         end
@@ -174,7 +174,7 @@ class EC2 < Mapper
         response.addresses.each do |address|
           struct = OpenStruct.new(address.to_h)
           struct.type = 'eip_address'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{address.allocation_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:eip_address/#{address.allocation_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -189,7 +189,7 @@ class EC2 < Mapper
         response.nat_gateways.each do |gateway|
           struct = OpenStruct.new(gateway.to_h)
           struct.type = 'nat_gateway'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{gateway.nat_gateway_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:nat_gateway/#{gateway.nat_gateway_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -204,7 +204,7 @@ class EC2 < Mapper
         response.internet_gateways.each do |gateway|
           struct = OpenStruct.new(gateway.to_h)
           struct.type = 'internet_gateway'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{gateway.internet_gateway_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:internet_gateway/#{gateway.internet_gateway_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -219,7 +219,7 @@ class EC2 < Mapper
         response.route_tables.each do |table|
           struct = OpenStruct.new(table.to_h)
           struct.type = 'route_table'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{table.route_table_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:route_table/#{table.route_table_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -234,7 +234,7 @@ class EC2 < Mapper
         response.images.each do |image|
           struct = OpenStruct.new(image.to_h)
           struct.type = 'image'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{image.image_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:image/#{image.image_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -249,7 +249,7 @@ class EC2 < Mapper
         response.snapshots.each do |snapshot|
           struct = OpenStruct.new(snapshot.to_h)
           struct.type = 'snapshot'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{snapshot.snapshot_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:snapshot/#{snapshot.snapshot_id}" # no true ARN
           struct.create_volume_permissions = @client.describe_snapshot_attribute({
                                                                                    attribute: 'createVolumePermission',
                                                                                    snapshot_id: snapshot.snapshot_id
@@ -268,7 +268,7 @@ class EC2 < Mapper
         response.flow_logs.each do |flow_log|
           struct = OpenStruct.new(flow_log.to_h)
           struct.type = 'flow_log'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{flow_log.flow_log_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:flow_log/#{flow_log.flow_log_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -283,7 +283,7 @@ class EC2 < Mapper
         response.volumes.each do |volume|
           struct = OpenStruct.new(volume.to_h)
           struct.type = 'volume'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{volume.volume_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:volume/#{volume.volume_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -298,7 +298,7 @@ class EC2 < Mapper
         response.vpn_gateways.each do |gateway|
           struct = OpenStruct.new(gateway.to_h)
           struct.type = 'vpn_gateway'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{gateway.vpn_gateway_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:vpn_gateway/#{gateway.vpn_gateway_id}" # no true ARN
 
           resources.push(struct.to_h)
         end
@@ -313,7 +313,7 @@ class EC2 < Mapper
         response.vpc_peering_connections.each do |peer|
           struct = OpenStruct.new(peer.to_h)
           struct.type = 'peering_connection'
-          struct.arn = "arn:aws:ec2:#{@region}:#{@account}/#{peer.vpc_peering_connection_id}" # no true ARN
+          struct.arn = "arn:aws:ec2:#{@region}:#{@account}:peering_connection/#{peer.vpc_peering_connection_id}" # no true ARN
 
           resources.push(struct.to_h)
         end

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk