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.

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

add ec2 keypairs ingestion #124

Merged
merged 2 commits into from
Aug 15, 2019
Merged

add ec2 keypairs ingestion #124

merged 2 commits into from
Aug 15, 2019

Conversation

ramonpetgrave64
Copy link
Contributor

I closed #120, addressed comments from @sachafaust and @achantavy in this PR.

  • add ec2 keypairs ingestion

  • use ARN as Id for EC2KeyPair

Ingest EC2 Key Pairs and associate them with EC2 Instances.
Fixes issue #121.

cartography/intel/aws/ec2.py Outdated Show resolved Hide resolved
cartography/intel/aws/ec2.py Show resolved Hide resolved
Copy link
Contributor

@achantavy achantavy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second pass - some minor changes. Looking good!

docs/schema/aws.md Outdated Show resolved Hide resolved
cartography/intel/aws/ec2.py Outdated Show resolved Hide resolved
@achantavy
Copy link
Contributor

Just an update: we currently have this running in our internal testing setup and will followup when our runs finish

Copy link
Contributor

@achantavy achantavy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test run is looking good so far. I caught one more minor thing while we wait for it to finish.

cartography/intel/aws/ec2.py Outdated Show resolved Hide resolved
cartography/intel/aws/ec2.py Outdated Show resolved Hide resolved
Copy link
Contributor

@achantavy achantavy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last change!

Testing worked great on our end.

cartography/data/indexes.cypher Outdated Show resolved Hide resolved
ramonpetgrave64 and others added 2 commits August 14, 2019 23:13
* use ARN as Id for EC2KeyPair

* add load_ec2_key_pairs test

* remove LOGIN_KEY relationship in cleanup jobs

* change LOGIN_KEY to SSH_LOGIN_TO

* delete proper relationships in cleanup

* remove commented dead code

* update schema

* node merge ARN on both keypair.id and keypair.arn

* create index on :EC2KeyPair(id)

* remove create index on :EC2KeyPair(arn)
@achantavy achantavy merged commit e3d62ab into lyft:master Aug 15, 2019
@achantavy
Copy link
Contributor

Thank you again for your contribution! 😁

@ramonpetgrave64
Copy link
Contributor Author

My pleasure :)

@ramonpetgrave64 ramonpetgrave64 deleted the ec2-key-pairs branch January 26, 2020 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants