Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix :#1218, #1152 - refactor EC2 network interface, private ip #1219

Merged
merged 10 commits into from
Sep 20, 2023
Merged

fix :#1218, #1152 - refactor EC2 network interface, private ip #1219

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e1866f2
refactor: #1218, fix: #1152
achantavy Jul 17, 2023
9229cad
lint
achantavy Jul 17, 2023
985107c
names, tests
achantavy Jul 17, 2023
23879dc
Add test for sec group
achantavy Jul 17, 2023
fa41d13
scoped analysis docs
achantavy Jul 17, 2023
3c7b0bd
Remove unnecessary scoped analysis job
achantavy Jul 22, 2023
1426cff
Add missing indexes
achantavy Sep 11, 2023
7bc2552
Merge branch 'master' into refactornetworkinterfaces
achantavy Sep 19, 2023
8bbff72
Remove scoped analysis doc
achantavy Sep 19, 2023
01a368d
Add missing indexes
achantavy Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cartography/data/indexes.cypher
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,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);
ramonpetgrave64 marked this conversation as resolved.
Show resolved Hide resolved
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);
Expand Down
30 changes: 0 additions & 30 deletions cartography/data/jobs/cleanup/aws_ingest_network_interfaces_cleanup.json
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions cartography/intel/aws/ec2/instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -183,7 +183,7 @@ def load_ec2_subnets(
) -> None:
load(
neo4j_session,
EC2SubnetSchema(),
EC2SubnetInstanceSchema(),
subnet_list,
Region=region,
AWS_ID=current_aws_account_id,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Loading
Loading