linus/PillarTool
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

some refactoring on the state router

Browse Source
This commit is contained in:
Linus Vogel 2026-05-14 19:39:12 +02:00
parent d76b581ea9
commit 67ed4f686d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pillar_tool/routers/state.py
View File

@ -128,7 +128,7 @@ def state_create(req: Request, name: str, patch_params: StateParams):
stmt_set_env = insert(StateAssignment).values(state_id=new_id, environment_id=bindparam('env_id')) stmt_set_env = insert(StateAssignment).values(state_id=new_id, environment_id=bindparam('env_id'))
stmt_get_env_id = select(Environment).where(Environment.name == bindparam('env_name')) stmt_get_env_id = select(Environment).where(Environment.name == bindparam('env_name'))
for env in patch_params.addenv: for env in patch_params.addenv or []:
env_id_res = db.execute(stmt_get_env_id, {'env_name': env}).fetchall() env_id_res = db.execute(stmt_get_env_id, {'env_name': env}).fetchall()
if len(env_id_res) < 1: if len(env_id_res) < 1:
print("[DEBUG] state_create: ERROR - Environment '{}' does not exist. Cannot assign non-existent environment to new state.".format(env)) print("[DEBUG] state_create: ERROR - Environment '{}' does not exist. Cannot assign non-existent environment to new state.".format(env))
@ -250,7 +250,7 @@ def state_patch(req: Request, name: str, patch_params: StateParams):
# add any requested environments to the state in question # add any requested environments to the state in question
stmt_set_env = insert(StateAssignment).values(state_id=state.id, environment_id=bindparam('env_id')) stmt_set_env = insert(StateAssignment).values(state_id=state.id, environment_id=bindparam('env_id'))
for env in patch_params.addenv: for env in patch_params.addenv or []:
env_id_res = db.execute(stmt_get_env_id, {'env_name': env}).fetchall() env_id_res = db.execute(stmt_get_env_id, {'env_name': env}).fetchall()
if len(env_id_res) < 1: if len(env_id_res) < 1:
print("[DEBUG] state_patch: ERROR - Environment '{}' does not exist. Cannot add non-existent environment to state.".format(env)) print("[DEBUG] state_patch: ERROR - Environment '{}' does not exist. Cannot add non-existent environment to state.".format(env))
@ -261,7 +261,7 @@ def state_patch(req: Request, name: str, patch_params: StateParams):
print("[DEBUG] state_patch: added state '{}' to environment '{}' (id={})".format(name, env, env_id)) print("[DEBUG] state_patch: added state '{}' to environment '{}' (id={})".format(name, env, env_id))
stmt_del_env = delete(StateAssignment).where(and_(StateAssignment.state_id == state.id, StateAssignment.environment_id == bindparam('env_id'))) stmt_del_env = delete(StateAssignment).where(and_(StateAssignment.state_id == state.id, StateAssignment.environment_id == bindparam('env_id')))
for env in patch_params.delenv: for env in patch_params.delenv or []:
env_id_res = db.execute(stmt_get_env_id, {'env_name': env}).fetchall() env_id_res = db.execute(stmt_get_env_id, {'env_name': env}).fetchall()
if len(env_id_res) < 1: if len(env_id_res) < 1:
print("[DEBUG] state_patch: ERROR - Environment '{}' does not exist. Cannot remove non-existent environment from state.".format(env)) print("[DEBUG] state_patch: ERROR - Environment '{}' does not exist. Cannot remove non-existent environment from state.".format(env))