Skip to content

Code Improvement #1072

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Code Improvement #1072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 36 additions & 32 deletions duffy/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from .util import UNSET, SentinelType

log = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)


class FakeAPITenant:
Expand All @@ -30,12 +31,10 @@ def __init__(self):
def create_for_cli(cls):
"""This exits the program if creating an AdminContext throws an exception."""
try:
admin_ctx = cls()
return cls()
except DuffyConfigurationError as exc:
log.error("Configuration key missing or wrong: %s", exc.args[0])
log.error("Configuration key missing or incorrect: %s", exc.args[0])
sys.exit(1)
else:
return admin_ctx

async def proxy_controller_function_async(self, controller_function, **kwargs):
async with async_session_maker() as db_async_session, db_async_session.begin():
Expand All @@ -45,12 +44,13 @@ async def proxy_controller_function_async(self, controller_function, **kwargs):
)
except HTTPException as exc:
await db_async_session.rollback()
log.error("HTTPException during async operation: %s", exc.detail)
return {"error": {"detail": exc.detail}}

def proxy_controller_function(self, controller_function, **kwargs):
return asyncio.run(self.proxy_controller_function_async(controller_function, **kwargs))

def get_tenant_id(self, name: str):
def get_tenant_id(self, name: str) -> Optional[int]:
with sync_session_maker() as db_sync_session:
return db_sync_session.execute(
select(Tenant.id).filter_by(name=name)
Expand All @@ -60,50 +60,54 @@ def list_tenants(self):
return self.proxy_controller_function(tenant.get_all_tenants)

def show_tenant(self, name: str):
return self.proxy_controller_function(tenant.get_tenant, id=self.get_tenant_id(name))
tenant_id = self.get_tenant_id(name)
if tenant_id is None:
log.error("Tenant not found: %s", name)
return {"error": {"detail": "Tenant not found"}}
return self.proxy_controller_function(tenant.get_tenant, id=tenant_id)

def create_tenant(
self,
name: str,
ssh_key: str,
node_quota: Optional[int],
session_lifetime: Optional[timedelta],
session_lifetime_max: Optional[timedelta],
node_quota: Optional[int] = None,
session_lifetime: Optional[timedelta] = None,
session_lifetime_max: Optional[timedelta] = None,
is_admin: bool = False,
):
return self.proxy_controller_function(
tenant.create_tenant,
data=TenantCreateModel(
name=name,
ssh_key=ssh_key,
is_admin=is_admin,
node_quota=node_quota,
session_lifetime=session_lifetime,
session_lifetime_max=session_lifetime_max,
),
tenant_data = TenantCreateModel(
name=name,
ssh_key=ssh_key,
is_admin=is_admin,
node_quota=node_quota,
session_lifetime=session_lifetime,
session_lifetime_max=session_lifetime_max,
)
return self.proxy_controller_function(tenant.create_tenant, data=tenant_data)

def retire_unretire_tenant(self, name: str, retire: bool):
return self.proxy_controller_function(
tenant.update_tenant,
id=self.get_tenant_id(name),
data=TenantRetireModel(active=not retire),
)
tenant_id = self.get_tenant_id(name)
if tenant_id is None:
log.error("Tenant not found: %s", name)
return {"error": {"detail": "Tenant not found"}}
retire_data = TenantRetireModel(active=not retire)
return self.proxy_controller_function(tenant.update_tenant, id=tenant_id, data=retire_data)

def update_tenant(
self,
name: str,
api_key: Optional[Union[str, SentinelType]] = UNSET,
ssh_key: Optional[Union[str, SentinelType]] = UNSET,
node_quota: Optional[Union[int, SentinelType]] = UNSET,
session_lifetime: Optional[timedelta] = UNSET,
session_lifetime_max: Optional[timedelta] = UNSET,
session_lifetime: Optional[Union[timedelta, SentinelType]] = UNSET,
session_lifetime_max: Optional[Union[timedelta, SentinelType]] = UNSET,
):
data = {}
for key in ("api_key", "ssh_key", "node_quota", "session_lifetime", "session_lifetime_max"):
value = locals()[key]
if value is not UNSET:
data[key] = value
tenant_id = self.get_tenant_id(name)
if tenant_id is None:
log.error("Tenant not found: %s", name)
return {"error": {"detail": "Tenant not found"}}

data = {key: value for key, value in locals().items() if key != "name" and value is not UNSET}
return self.proxy_controller_function(
tenant.update_tenant, id=self.get_tenant_id(name), data=TenantUpdateModel(**data)
tenant.update_tenant, id=tenant_id, data=TenantUpdateModel(**data)
)