Organize data model files under cartography.models #1096

achantavy · 2023-01-23T22:36:08Z

As discussed on https://lyftoss.slack.com/archives/CTZUQL0KX/p1674037104828659: it'd be easier to discover schemas and other data types if they are located in one place.

Node-related objects in cartography/graph/model are moved to cartography/models/nodes.py
Relationship-related objects in cartography/graph/model.py are moved to cartography/models/relationships.py
Objects and functions applicable to both are moved to cartography/models/common.py
Model objects for cartography/intel/aws/emr.py are moved to cartography/models/aws/emr.py (thankfully there is only one real file to refactor here since we're catching this early enough).

achantavy · 2023-01-23T22:39:56Z

cc: @resilience-jychp

achantavy changed the title ~~Organize model files under cartography.models~~ Organize data model files under cartography.models Jan 23, 2023

achantavy requested a review from ramonpetgrave64 January 23, 2023 22:53

achantavy force-pushed the modelsbranch branch from abcff44 to 0208b01 Compare January 26, 2023 01:15

achantavy added 2 commits February 1, 2023 13:25

Organize model files under cartography.models

7caecd2

Update with upstream cleanup changes

bd9ba6b

achantavy force-pushed the modelsbranch branch from 0208b01 to bd9ba6b Compare February 1, 2023 21:34

jychp mentioned this pull request Feb 2, 2023

CartographySchema with Node shared by multiple intel #1106

Closed

ramonpetgrave64 approved these changes Feb 2, 2023

View reviewed changes

Merge branch 'master' into modelsbranch

6689dc1

achantavy merged commit 82e1dd0 into master Feb 2, 2023

achantavy deleted the modelsbranch branch February 2, 2023 17:20

Provide feedback