fix :cartography-cncf#1218, cartography-cncf#1152 - refactor EC2 netw…

…ork interface, private ip (cartography-cncf#1219)

Refactors EC2 Network Interfaces and Private IPs to the cartography data
model. Fixes cartography-cncf#1152 since the data model includes automatic cleanup jobs.

- Uses same technique as cartography-cncf#1214 to represent Network Interfaces as known
by EC2 instances vs Network Interfaces known by
describe-network-interfaces.
- Also clearly marks that the Private IPs ingested here are known by
Network Interfaces and not another source.

cartography/data/indexes.cypher

@@ -89,8 +89,6 @@ CREATE INDEX IF NOT EXISTS FOR (n:DOProject) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:EBSSnapshot) ON (n.id);
 CREATE INDEX IF NOT EXISTS FOR (n:EBSSnapshot) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:EC2KeyPair) ON (n.keyfingerprint);
-CREATE INDEX IF NOT EXISTS FOR (n:EC2PrivateIp) ON (n.id);
-CREATE INDEX IF NOT EXISTS FOR (n:EC2PrivateIp) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:EC2ReservedInstance) ON (n.id);
 CREATE INDEX IF NOT EXISTS FOR (n:EC2ReservedInstance) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:ECRImage) ON (n.id);

cartography/intel/aws/ec2/instances.py

@@ -13,10 +13,10 @@
 from cartography.intel.aws.ec2.util import get_botocore_config
 from cartography.models.aws.ec2.instances import EC2InstanceSchema
 from cartography.models.aws.ec2.keypairs import EC2KeyPairSchema
-from cartography.models.aws.ec2.networkinterfaces import EC2NetworkInterfaceSchema
+from cartography.models.aws.ec2.networkinterface_instance import EC2NetworkInterfaceInstanceSchema
 from cartography.models.aws.ec2.reservations import EC2ReservationSchema
-from cartography.models.aws.ec2.securitygroups import EC2SecurityGroupSchema
-from cartography.models.aws.ec2.subnets import EC2SubnetSchema
+from cartography.models.aws.ec2.securitygroup_instance import EC2SecurityGroupInstanceSchema
+from cartography.models.aws.ec2.subnet_instance import EC2SubnetInstanceSchema
 from cartography.models.aws.ec2.volumes import EBSVolumeInstanceSchema
 from cartography.util import aws_handle_regions
 from cartography.util import timeit
@@ -183,7 +183,7 @@ def load_ec2_subnets(
 ) -> None:
     load(
         neo4j_session,
-        EC2SubnetSchema(),
+        EC2SubnetInstanceSchema(),
         subnet_list,
         Region=region,
         AWS_ID=current_aws_account_id,
@@ -219,7 +219,7 @@ def load_ec2_security_groups(
 ) -> None:
     load(
         neo4j_session,
-        EC2SecurityGroupSchema(),
+        EC2SecurityGroupInstanceSchema(),
         sg_list,
         Region=region,
         AWS_ID=current_aws_account_id,
@@ -237,7 +237,7 @@ def load_ec2_network_interfaces(
 ) -> None:
     load(
         neo4j_session,
-        EC2NetworkInterfaceSchema(),
+        EC2NetworkInterfaceInstanceSchema(),
         network_interface_list,
         Region=region,
         AWS_ID=current_aws_account_id,