Merge pull request #433 from ndustrialio/SUP-15403-service-instance-dependency-flow

feat: add grant querying for edge nodes, service instances

Author: connor-geer

contxt/cli/commands/edge_nodes.py

@@ -4,7 +4,7 @@
 
 from contxt.cli.clients import Clients
 from contxt.cli.utils import fields_option, print_item, print_table, sort_option
-from contxt.models.contxt import EdgeNode
+from contxt.models.contxt import EdgeNode, EdgeNodeGrant
 
 
 @click.group("edge-nodes")
@@ -13,14 +13,15 @@ def edge_nodes() -> None:
 
 
 @edge_nodes.command()
-@click.argument("org_id")
-@click.argument("project_id")
-@fields_option(default="id, name, stack_id, description", obj=EdgeNode)
+@click.argument("project_slug")
+@fields_option(default="id, name, project_id, description", obj=EdgeNode)
 @sort_option(default="id")
 @click.pass_obj
-def get(clients: Clients, org_id: str, project_id: int, fields: List[str], sort: str) -> None:
+def get(clients: Clients, project_slug: int, fields: List[str], sort: str) -> None:
     """Get edge nodes for a project"""
-    items = clients.contxt.get_edge_nodes(organization_id=org_id, project_id=project_id)
+    items = clients.contxt_deployments.get_edge_nodes(
+        organization_id=clients.org_id, project_slug=project_slug
+    )
     print_table(items=items, keys=fields, sort_by=sort)
 
 
@@ -34,3 +35,15 @@ def add_grant(clients: Clients, edge_node_id: str, target: int) -> None:
         edge_node_id=edge_node_id, to_service_instance_id=target
     )
     print_item(result)
+
+
+@edge_nodes.command()
+@click.argument("edge_node_id")
+@fields_option(default="id, from_edge_node_id, to_service_instance_id", obj=EdgeNodeGrant)
+@sort_option(default="id")
+@click.pass_obj
+def get_grants(clients: Clients, edge_node_id: str, fields: List[str], sort: str) -> None:
+    """Get all edge node grants"""
+    items = clients.contxt_deployments.get_edge_node_grants(clients.org_id, edge_node_id=edge_node_id)
+
+    print_table(items=items, keys=fields, sort_by=sort)

contxt/cli/commands/service_instances.py

@@ -4,7 +4,7 @@
 
 from contxt.cli.clients import Clients
 from contxt.cli.utils import fields_option, print_item, print_table, sort_option
-from contxt.models.contxt import ServiceInstance
+from contxt.models.contxt import ServiceInstance, ServiceInstanceGrant
 
 
 @click.group()
@@ -78,3 +78,16 @@ def add_grant(clients: Clients, service_instance_id: str, target: int) -> None:
         f"{clients.org_id}/service_instances/{service_instance_id}/grants", json
     )
     print_item(result)
+
+
+@service_instances.command()
+@click.argument("service_instance_id")
+@fields_option(default="id, from_service_instance_id, to_service_instance_id", obj=ServiceInstanceGrant)
+@sort_option(default="id")
+@click.pass_obj
+def get_grants(clients: Clients, service_instance_id: str, fields: List[str], sort: str) -> None:
+    """Get all service instance grants"""
+    items = clients.contxt_deployments.get_service_instance_grants(
+        clients.org_id, service_instance_id=service_instance_id
+    )
+    print_table(items=items, keys=fields, sort_by=sort)

contxt/models/contxt.py

@@ -320,6 +320,21 @@ class ServiceInstance(ApiObject):
     created_at: Optional[datetime] = None
 
 
+@dataclass
+class ServiceInstanceGrant(ApiObject):
+    _api_fields: ClassVar = (
+        ApiField("id"),
+        ApiField("from_service_instance_id"),
+        ApiField("to_service_instance_id"),
+        ApiField("created_at", data_type=Parsers.datetime),
+    )
+
+    id: str
+    from_service_instance_id: str
+    to_service_instance_id: int
+    created_at: Optional[datetime] = None
+
+
 @dataclass
 class Project(ApiObject):
     _api_fields: ClassVar = (
@@ -372,24 +387,39 @@ class ProjectEnvironment(ApiObject):
 @dataclass
 class EdgeNode(ApiObject):
     _api_fields: ClassVar = (
-        ApiField("id", data_type=int),
+        ApiField("id"),
         ApiField("name"),
-        ApiField("stack_id"),
+        ApiField("project_id"),
         ApiField("organization_id"),
         ApiField("description"),
         ApiField("client_id"),
         ApiField("created_at", data_type=Parsers.datetime),
     )
 
-    id: int
+    id: str
     name: str
-    stack_id: int
+    project_id: int
     organization_id: str
     description: str
     client_id: str
     created_at: Optional[datetime] = None
 
 
+@dataclass
+class EdgeNodeGrant(ApiObject):
+    _api_fields: ClassVar = (
+        ApiField("id"),
+        ApiField("from_edge_node_id"),
+        ApiField("to_service_instance_id"),
+        ApiField("created_at", data_type=Parsers.datetime),
+    )
+
+    id: str
+    from_edge_node_id: str
+    to_service_instance_id: int
+    created_at: Optional[datetime] = None
+
+
 @dataclass
 class Cluster(ApiObject):
     _api_fields: ClassVar = (

contxt/services/contxt.py

@@ -5,7 +5,6 @@
 from ..models.contxt import (
     Config,
     ConfigValue,
-    EdgeNode,
     Organization,
     OrganizationUser,
     Project,
@@ -108,15 +107,11 @@ def get_services(self, project_id: Union[int, None] = None) -> List[Service]:
             resp = self.get("services")
             return [Service.from_api(rec) for rec in resp]
 
-    def get_edge_nodes(self, organization_id: str, project_id: int) -> List[EdgeNode]:
-        resp = self.get(f"organizations/{organization_id}/stacks/{project_id}/edgenodes")
-        return [EdgeNode.from_api(rec) for rec in resp]
+    def get_service(self, service_id: int) -> Service:
+        resp = self.get(f"services/{service_id}")
+        return Service.from_api(resp)
 
     def create_edge_node_grant(self, edge_node_id: str, to_service_instance_id: int) -> Dict:
         return self.post(
             f"edgenodes/{edge_node_id}/grants", data={"to_service_instance_id": to_service_instance_id}
         )
-
-    def get_service(self, service_id: int) -> Service:
-        resp = self.get(f"services/{service_id}")
-        return Service.from_api(resp)

contxt/services/contxt_deployments.py

@@ -3,7 +3,7 @@
 from requests.exceptions import HTTPError
 
 from ..auth import Auth
-from ..models.contxt import Cluster
+from ..models.contxt import Cluster, EdgeNode, EdgeNodeGrant, ServiceInstanceGrant
 from .api import ApiEnvironment, ConfiguredApi
 
 
@@ -41,3 +41,17 @@ def register_cluster(self, organization_id: str, cluster: Cluster) -> None:
         except HTTPError:
             pass
             return
+
+    def get_edge_nodes(self, organization_id: str, project_slug: int) -> List[EdgeNode]:
+        resp = self.get(f"{organization_id}/projects/{project_slug}/edgenodes")
+        return [EdgeNode.from_api(rec) for rec in resp]
+
+    def get_edge_node_grants(self, organization_id: str, edge_node_id: int) -> List[EdgeNodeGrant]:
+        resp = self.get(f"{organization_id}/edgenodes/{edge_node_id}/grants")
+        return [EdgeNodeGrant.from_api(rec) for rec in resp]
+
+    def get_service_instance_grants(
+        self, organization_id: str, service_instance_id: int
+    ) -> List[ServiceInstanceGrant]:
+        resp = self.get(f"{organization_id}/service_instances/{service_instance_id}/grants")
+        return [ServiceInstanceGrant.from_api(rec) for rec in resp]