cartography 0.111.0rc1__py3-none-any.whl → 0.113.0__py3-none-any.whl

cartography/models/aws/apigateway/apigatewayintegration.py

@@ -0,0 +1,79 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import OtherRelationships
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class APIGatewayIntegrationNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    httpmethod: PropertyRef = PropertyRef("httpMethod")
+    integration_http_method: PropertyRef = PropertyRef("integrationHttpMethod")
+    resource_id: PropertyRef = PropertyRef("resourceId")
+    api_id: PropertyRef = PropertyRef("apiId")
+    type: PropertyRef = PropertyRef("type")
+    uri: PropertyRef = PropertyRef("uri")
+    connection_type: PropertyRef = PropertyRef("connectionType")
+    connection_id: PropertyRef = PropertyRef("connectionId")
+    credentials: PropertyRef = PropertyRef("credentials")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class APIGatewayIntegrationToAPIGatewayResourceRelRelProperties(
+    CartographyRelProperties
+):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class APIGatewayIntegrationToAPIGatewayResourceRel(CartographyRelSchema):
+    target_node_label: str = "APIGatewayResource"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("resourceId")},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "HAS_INTEGRATION"
+    properties: APIGatewayIntegrationToAPIGatewayResourceRelRelProperties = (
+        APIGatewayIntegrationToAPIGatewayResourceRelRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class APIGatewayIntegrationToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:APIGatewayIntegration)<-[:RESOURCE]-(:AWSAccount)
+class APIGatewayIntegrationToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: APIGatewayIntegrationToAWSAccountRelRelProperties = (
+        APIGatewayIntegrationToAWSAccountRelRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class APIGatewayIntegrationSchema(CartographyNodeSchema):
+    label: str = "APIGatewayIntegration"
+    properties: APIGatewayIntegrationNodeProperties = (
+        APIGatewayIntegrationNodeProperties()
+    )
+    sub_resource_relationship: APIGatewayIntegrationToAWSAccountRel = (
+        APIGatewayIntegrationToAWSAccountRel()
+    )
+    other_relationships: OtherRelationships = OtherRelationships(
+        [APIGatewayIntegrationToAPIGatewayResourceRel()],
+    )

cartography/models/aws/apigateway/apigatewaymethod.py

@@ -0,0 +1,74 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import OtherRelationships
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class APIGatewayMethodNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    httpmethod: PropertyRef = PropertyRef("httpMethod")
+    resource_id: PropertyRef = PropertyRef("resourceId")
+    api_id: PropertyRef = PropertyRef("apiId")
+    authorization_type: PropertyRef = PropertyRef("authorizationType")
+    authorizer_id: PropertyRef = PropertyRef("authorizerId")
+    request_validator_id: PropertyRef = PropertyRef("requestValidatorId")
+    operation_name: PropertyRef = PropertyRef("operationName")
+    api_key_required: PropertyRef = PropertyRef("apiKeyRequired")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class APIGatewayMethodToAPIGatewayResourceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class APIGatewayMethodToAPIGatewayResourceRel(CartographyRelSchema):
+    target_node_label: str = "APIGatewayResource"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("resourceId")},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "HAS_METHOD"
+    properties: APIGatewayMethodToAPIGatewayResourceRelRelProperties = (
+        APIGatewayMethodToAPIGatewayResourceRelRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class APIGatewayMethodToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:APIGatewayMethod)<-[:RESOURCE]-(:AWSAccount)
+class APIGatewayMethodToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: APIGatewayMethodToAWSAccountRelRelProperties = (
+        APIGatewayMethodToAWSAccountRelRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class APIGatewayMethodSchema(CartographyNodeSchema):
+    label: str = "APIGatewayMethod"
+    properties: APIGatewayMethodNodeProperties = APIGatewayMethodNodeProperties()
+    sub_resource_relationship: APIGatewayMethodToAWSAccountRel = (
+        APIGatewayMethodToAWSAccountRel()
+    )
+    other_relationships: OtherRelationships = OtherRelationships(
+        [APIGatewayMethodToAPIGatewayResourceRel()],
+    )

cartography/models/aws/apigatewayv2/apigatewayv2.py

@@ -0,0 +1,53 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class APIGatewayV2APINodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id", extra_index=True)
+    name: PropertyRef = PropertyRef("name")
+    protocoltype: PropertyRef = PropertyRef("protocolType")
+    routeselectionexpression: PropertyRef = PropertyRef("routeSelectionExpression")
+    apikeyselectionexpression: PropertyRef = PropertyRef("apiKeySelectionExpression")
+    apiendpoint: PropertyRef = PropertyRef("apiEndpoint")
+    version: PropertyRef = PropertyRef("version")
+    createddate: PropertyRef = PropertyRef("createdDate")
+    description: PropertyRef = PropertyRef("description")
+    region: PropertyRef = PropertyRef("region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class APIGatewayV2APIToAWSAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:APIGatewayV2API)<-[:RESOURCE]-(:AWSAccount)
+class APIGatewayV2APIToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: APIGatewayV2APIToAWSAccountRelProperties = (
+        APIGatewayV2APIToAWSAccountRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class APIGatewayV2APISchema(CartographyNodeSchema):
+    label: str = "APIGatewayV2API"
+    properties: APIGatewayV2APINodeProperties = APIGatewayV2APINodeProperties()
+    sub_resource_relationship: APIGatewayV2APIToAWSAccountRel = (
+        APIGatewayV2APIToAWSAccountRel()
+    )

cartography/models/aws/ec2/vpc_peering.py

@@ -0,0 +1,157 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import OtherRelationships
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class VPCPeeringNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("VpcPeeringConnectionId")
+    allow_dns_resolution_from_remote_vpc: PropertyRef = PropertyRef(
+        "AllowDnsResolutionFromRemoteVpc",
+    )
+    allow_egress_from_local_classic_link_to_remote_vpc: PropertyRef = PropertyRef(
+        "AllowEgressFromLocalClassicLinkToRemoteVpc",
+    )
+    allow_egress_from_local_vpc_to_remote_classic_link: PropertyRef = PropertyRef(
+        "AllowEgressFromLocalVpcToRemoteClassicLink",
+    )
+    requester_region: PropertyRef = PropertyRef("RequesterRegion")
+    accepter_region: PropertyRef = PropertyRef("AccepterRegion")
+    status_code: PropertyRef = PropertyRef("StatusCode")
+    status_message: PropertyRef = PropertyRef("StatusMessage")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class PeeringToAccepterVpcRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class PeeringToAccepterVpcRel(CartographyRelSchema):
+    target_node_label: str = "AWSVpc"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AccepterVpcId")},
+    )
+    direction: LinkDirection = LinkDirection.OUTWARD
+    rel_label: str = "ACCEPTER_VPC"
+    properties: PeeringToAccepterVpcRelProperties = PeeringToAccepterVpcRelProperties()
+
+
+@dataclass(frozen=True)
+class PeeringToRequesterVpcRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class PeeringToRequesterVpcRel(CartographyRelSchema):
+    target_node_label: str = "AWSVpc"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("RequesterVpcId")},
+    )
+    direction: LinkDirection = LinkDirection.OUTWARD
+    rel_label: str = "REQUESTER_VPC"
+    properties: PeeringToRequesterVpcRelProperties = (
+        PeeringToRequesterVpcRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class PeeringToAccepterCidrRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class PeeringToAccepterCidrRel(CartographyRelSchema):
+    target_node_label: str = "AWSCidrBlock"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("ACCEPTER_CIDR_BLOCK_IDS", one_to_many=True)},
+    )
+    direction: LinkDirection = LinkDirection.OUTWARD
+    rel_label: str = "ACCEPTER_CIDR"
+    properties: PeeringToAccepterCidrRelProperties = (
+        PeeringToAccepterCidrRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class PeeringToRequesterCidrRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class PeeringToRequesterCidrRel(CartographyRelSchema):
+    target_node_label: str = "AWSCidrBlock"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("REQUESTER_CIDR_BLOCK_IDS", one_to_many=True)},
+    )
+    direction: LinkDirection = LinkDirection.OUTWARD
+    rel_label: str = "REQUESTER_CIDR"
+    properties: PeeringToRequesterCidrRelProperties = (
+        PeeringToRequesterCidrRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class PeeringConnectionToAWSAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class PeeringConnectionToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: PeeringConnectionToAWSAccountRelProperties = (
+        PeeringConnectionToAWSAccountRelProperties()
+    )
+
+
+# Composite Node Pattern: AWSAccount as known by VPC Peering
+@dataclass(frozen=True)
+class AWSAccountVPCPeeringNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class AWSAccountVPCPeeringSchema(CartographyNodeSchema):
+    """
+    Composite schema to represent AWS Accounts as known by VPC Peering.
+    Targets the same 'AWSAccount' label as the primary AWS account schema,
+    allowing MERGE operations to combine properties from both sources.
+    """
+
+    label: str = "AWSAccount"  # Same label as primary AWSAccount schema
+    properties: AWSAccountVPCPeeringNodeProperties = (
+        AWSAccountVPCPeeringNodeProperties()
+    )
+    # No sub_resource_relationship - accounts are top-level entities
+
+
+@dataclass(frozen=True)
+class AWSPeeringConnectionSchema(CartographyNodeSchema):
+    label: str = "AWSPeeringConnection"
+    properties: VPCPeeringNodeProperties = VPCPeeringNodeProperties()
+    sub_resource_relationship: PeeringConnectionToAWSAccountRel = (
+        PeeringConnectionToAWSAccountRel()
+    )
+    other_relationships: OtherRelationships = OtherRelationships(
+        [
+            PeeringToAccepterVpcRel(),
+            PeeringToRequesterVpcRel(),
+            PeeringToAccepterCidrRel(),
+            PeeringToRequesterCidrRel(),
+        ],
+    )

cartography/models/azure/principal.py

@@ -0,0 +1,44 @@
+import logging
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class AzurePrincipalProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class AzurePrincipalToTenantRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class AzurePrincipalToTenantRel(CartographyRelSchema):
+    target_node_label: str = "AzureTenant"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("TENANT_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: AzurePrincipalToTenantRelProperties = (
+        AzurePrincipalToTenantRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class AzurePrincipalSchema(CartographyNodeSchema):
+    label: str = "AzurePrincipal"
+    properties: AzurePrincipalProperties = AzurePrincipalProperties()
+    sub_resource_relationship: AzurePrincipalToTenantRel = AzurePrincipalToTenantRel()

cartography/models/azure/tenant.py

@@ -0,0 +1,20 @@
+import logging
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class AzureTenantProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class AzureTenantSchema(CartographyNodeSchema):
+    label: str = "AzureTenant"
+    properties: AzureTenantProperties = AzureTenantProperties()

cartography/models/gcp/dns.py

@@ -0,0 +1,109 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.nodes import ExtraNodeLabels
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import OtherRelationships
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class GCPDNSZoneNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id", extra_index=True)
+    name: PropertyRef = PropertyRef("name", extra_index=True)
+    dns_name: PropertyRef = PropertyRef("dns_name")
+    description: PropertyRef = PropertyRef("description")
+    visibility: PropertyRef = PropertyRef("visibility")
+    kind: PropertyRef = PropertyRef("kind")
+    nameservers: PropertyRef = PropertyRef("nameservers")
+    created_at: PropertyRef = PropertyRef("created_at")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class GCPDNSZoneToProjectRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:GCPProject)-[:RESOURCE]->(:GCPDNSZone)
+class GCPDNSZoneToProjectRel(CartographyRelSchema):
+    target_node_label: str = "GCPProject"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("PROJECT_ID", set_in_kwargs=True)}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: GCPDNSZoneToProjectRelProperties = GCPDNSZoneToProjectRelProperties()
+
+
+@dataclass(frozen=True)
+class GCPDNSZoneSchema(CartographyNodeSchema):
+    label: str = "GCPDNSZone"
+    properties: GCPDNSZoneNodeProperties = GCPDNSZoneNodeProperties()
+    extra_node_labels: ExtraNodeLabels = ExtraNodeLabels(["DNSZone"])
+    sub_resource_relationship: GCPDNSZoneToProjectRel = GCPDNSZoneToProjectRel()
+
+
+@dataclass(frozen=True)
+class GCPRecordSetNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id", extra_index=True)
+    name: PropertyRef = PropertyRef("name", extra_index=True)
+    type: PropertyRef = PropertyRef("type")
+    ttl: PropertyRef = PropertyRef("ttl")
+    data: PropertyRef = PropertyRef("data")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class GCPRecordSetToProjectRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:GCPProject)-[:RESOURCE]->(:GCPRecordSet)
+class GCPRecordSetToProjectRel(CartographyRelSchema):
+    target_node_label: str = "GCPProject"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("PROJECT_ID", set_in_kwargs=True)}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: GCPRecordSetToProjectRelProperties = (
+        GCPRecordSetToProjectRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class GCPRecordSetToZoneRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:GCPDNSZone)-[:HAS_RECORD]->(:GCPRecordSet)
+class GCPRecordSetToZoneRel(CartographyRelSchema):
+    target_node_label: str = "GCPDNSZone"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("zone_id")}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "HAS_RECORD"
+    properties: GCPRecordSetToZoneRelProperties = GCPRecordSetToZoneRelProperties()
+
+
+@dataclass(frozen=True)
+class GCPRecordSetSchema(CartographyNodeSchema):
+    label: str = "GCPRecordSet"
+    properties: GCPRecordSetNodeProperties = GCPRecordSetNodeProperties()
+    extra_node_labels: ExtraNodeLabels = ExtraNodeLabels(["DNSRecord"])
+    sub_resource_relationship: GCPRecordSetToProjectRel = GCPRecordSetToProjectRel()
+    other_relationships: OtherRelationships = OtherRelationships(
+        [
+            GCPRecordSetToZoneRel(),
+        ]
+    )

cartography/models/gcp/iam.py

@@ -4,6 +4,7 @@ from dataclasses import dataclass
 from cartography.models.core.common import PropertyRef
 from cartography.models.core.nodes import CartographyNodeProperties
 from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.nodes import ExtraNodeLabels
 from cartography.models.core.relationships import CartographyRelProperties
 from cartography.models.core.relationships import CartographyRelSchema
 from cartography.models.core.relationships import LinkDirection
@@ -61,6 +62,8 @@ class GCPServiceAccountSchema(CartographyNodeSchema):
     label: str = "GCPServiceAccount"
     properties: GCPServiceAccountNodeProperties = GCPServiceAccountNodeProperties()
     sub_resource_relationship: GCPPrincipalToProject = GCPPrincipalToProject()
+    # Service accounts are principals; add shared label for cross-module queries
+    extra_node_labels: ExtraNodeLabels = ExtraNodeLabels(["GCPPrincipal"])
 
 
 @dataclass(frozen=True)

cartography/models/gcp/storage/bucket.py

@@ -0,0 +1,119 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import OtherRelationships
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class GCPBucketNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id", extra_index=True)
+    # Preserve legacy field for compatibility with existing queries
+    bucket_id: PropertyRef = PropertyRef("bucket_id")
+    project_number: PropertyRef = PropertyRef("project_number")
+    self_link: PropertyRef = PropertyRef("self_link")
+    kind: PropertyRef = PropertyRef("kind")
+    location: PropertyRef = PropertyRef("location")
+    location_type: PropertyRef = PropertyRef("location_type")
+    meta_generation: PropertyRef = PropertyRef("meta_generation")
+    storage_class: PropertyRef = PropertyRef("storage_class")
+    time_created: PropertyRef = PropertyRef("time_created")
+    retention_period: PropertyRef = PropertyRef("retention_period")
+    iam_config_bucket_policy_only: PropertyRef = PropertyRef(
+        "iam_config_bucket_policy_only"
+    )
+    owner_entity: PropertyRef = PropertyRef("owner_entity")
+    owner_entity_id: PropertyRef = PropertyRef("owner_entity_id")
+    versioning_enabled: PropertyRef = PropertyRef("versioning_enabled")
+    log_bucket: PropertyRef = PropertyRef("log_bucket")
+    requester_pays: PropertyRef = PropertyRef("requester_pays")
+    default_kms_key_name: PropertyRef = PropertyRef("default_kms_key_name")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class GCPBucketToProjectRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:GCPProject)-[:RESOURCE]->(:GCPBucket)
+class GCPBucketToProjectRel(CartographyRelSchema):
+    target_node_label: str = "GCPProject"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("PROJECT_ID", set_in_kwargs=True)}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: GCPBucketToProjectRelProperties = GCPBucketToProjectRelProperties()
+
+
+@dataclass(frozen=True)
+class GCPBucketSchema(CartographyNodeSchema):
+    label: str = "GCPBucket"
+    properties: GCPBucketNodeProperties = GCPBucketNodeProperties()
+    sub_resource_relationship: GCPBucketToProjectRel = GCPBucketToProjectRel()
+
+
+@dataclass(frozen=True)
+class GCPBucketLabelNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id", extra_index=True)
+    key: PropertyRef = PropertyRef("key", extra_index=True)
+    value: PropertyRef = PropertyRef("value")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class GCPBucketLabelToProjectRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:GCPProject)-[:RESOURCE]->(:GCPBucketLabel)
+class GCPBucketLabelToProjectRel(CartographyRelSchema):
+    target_node_label: str = "GCPProject"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("PROJECT_ID", set_in_kwargs=True)}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: GCPBucketLabelToProjectRelProperties = (
+        GCPBucketLabelToProjectRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class GCPBucketLabelToBucketRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:GCPBucket)-[:LABELED]->(:GCPBucketLabel)
+class GCPBucketLabelToBucketRel(CartographyRelSchema):
+    target_node_label: str = "GCPBucket"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("bucket_id")}
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "LABELED"
+    properties: GCPBucketLabelToBucketRelProperties = (
+        GCPBucketLabelToBucketRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class GCPBucketLabelSchema(CartographyNodeSchema):
+    label: str = "GCPBucketLabel"
+    properties: GCPBucketLabelNodeProperties = GCPBucketLabelNodeProperties()
+    sub_resource_relationship: GCPBucketLabelToProjectRel = GCPBucketLabelToProjectRel()
+    other_relationships: OtherRelationships = OtherRelationships(
+        [
+            GCPBucketLabelToBucketRel(),
+        ]
+    )