#1210: EBSVolume => new data model, Allow node attr updates from multiple intel modules #1214
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ramonpetgrave64
previously approved these changes
Jul 14, 2023
|
|
||
|
|
||
| @dataclass(frozen=True) | ||
| class EBSVolumeInstanceProperties(CartographyNodeProperties): |
There was a problem hiding this comment.
Looking at the sample DESCRIBE_INSTANCES, the only properties about Volumes that are returned are just volumeid and deleteontermination, right?
https://github.com/lyft/cartography/blob/facb63bcbac6b68eec0fd2ea3f6b0550ac40eb10/tests/data/aws/ec2/instances.py#L390-L395
There was a problem hiding this comment.
Good point, will update
tests/integration/cartography/intel/aws/ec2/test_ec2_volumes.py
Outdated
Show resolved
Hide resolved
| (r['n1.id'], r['n2.id']) for r in result | ||
|
|
||
| # Assert that the account to volume rels exist | ||
| assert check_rels( |
There was a problem hiding this comment.
We should maybe do this check after syncing instances, but before syncing the volumes
Co-authored-by: Ramon Petgrave <[email protected]>
ramonpetgrave64
approved these changes
Jul 14, 2023
ramonpetgrave64
added a commit
that referenced
this pull request
Aug 3, 2023
…iple intel modules (#1214) See #1210 for full context. #1154 tried to solve this problem by updating the querybuilder but this was too complex and would not generalize well. This solution is simpler where we use different property classes for each API response so that we don't overwrite properties on a node set by another sync job. This PR can be reviewed commit-by-commit: - c0d9ac4 shows a repro of the error with a failing integration test. - facb63b shows the solution using multiple classes. --------- Co-authored-by: Ramon Petgrave <[email protected]>
achantavy
added a commit
that referenced
this pull request
Sep 20, 2023
Refactors EC2 Network Interfaces and Private IPs to the cartography data model. Fixes #1152 since the data model includes automatic cleanup jobs. - Uses same technique as #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.
chandanchowdhury
pushed a commit
to juju4/cartography
that referenced
this pull request
Jun 26, 2024
…pdates from multiple intel modules (cartography-cncf#1214) See cartography-cncf#1210 for full context. cartography-cncf#1154 tried to solve this problem by updating the querybuilder but this was too complex and would not generalize well. This solution is simpler where we use different property classes for each API response so that we don't overwrite properties on a node set by another sync job. This PR can be reviewed commit-by-commit: - c0d9ac4 shows a repro of the error with a failing integration test. - facb63b shows the solution using multiple classes. --------- Co-authored-by: Ramon Petgrave <[email protected]>
chandanchowdhury
pushed a commit
to juju4/cartography
that referenced
this pull request
Jun 26, 2024
…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.
achantavy
commented
Nov 8, 2024
| id: PropertyRef = PropertyRef('VolumeId') | ||
| volumeid: PropertyRef = PropertyRef('VolumeId', extra_index=True) | ||
| lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True) | ||
| deleteontermination: PropertyRef = PropertyRef('DeleteOnTermination') |
There was a problem hiding this comment.
@serge-wq [comment 1 of 2] - ah here we go. Here an EBS volume as known by an EC2 instance has a deleteontermination field...
achantavy
commented
Nov 8, 2024
| size: PropertyRef = PropertyRef('Size') | ||
| state: PropertyRef = PropertyRef('State') | ||
| outpostarn: PropertyRef = PropertyRef('OutpostArn') | ||
| snapshotid: PropertyRef = PropertyRef('SnapshotId') |
There was a problem hiding this comment.
@serge-wq [comment 2 of 2] - .. but the EBSVolume by itself doesn't have that field. It also has fields that are not known by the EBSVolumeInstance.
The description of this PR shows more details on this decision.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #1210 for full context.
#1154 tried to solve this problem by updating the querybuilder but this was too complex and would not generalize well.
This solution is simpler where we use different property classes for each API response so that we don't overwrite properties on a node set by another sync job.
This PR can be reviewed commit-by-commit: