From cda9df9e13a05bffe2a5559fe804cccb41ea5f58 Mon Sep 17 00:00:00 2001
From: Linus Vogel <linus@linvogel.ch>
Date: Sun, 31 May 2026 18:52:14 +0200
Subject: [PATCH] added states and hostgroup to pillar output

---
 pillar_tool/__pycache__/__init__.cpython-313.pyc | Bin 188 -> 0 bytes
 .../__pycache__/__init__.cpython-313.pyc         | Bin 199 -> 0 bytes
 .../basicauth_backend.cpython-313.pyc            | Bin 2018 -> 0 bytes
 pillar_tool/routers/pillar.py                    |  13 ++++++++++++-
 4 files changed, 12 insertions(+), 1 deletion(-)
 delete mode 100644 pillar_tool/__pycache__/__init__.cpython-313.pyc
 delete mode 100644 pillar_tool/middleware/__pycache__/__init__.cpython-313.pyc
 delete mode 100644 pillar_tool/middleware/__pycache__/basicauth_backend.cpython-313.pyc

diff --git a/pillar_tool/__pycache__/__init__.cpython-313.pyc b/pillar_tool/__pycache__/__init__.cpython-313.pyc
deleted file mode 100644
index 272a76d25a37f52abb2ed920a0e329d6f7558250..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmey&%ge<81Z%hXXM*U*AOZ#$p^VQgK*m&tbOudEzm*I{OhDdekkqYc{fzwFRQ;UH
zywYNQm(=3ylKcXF51^1wVp2d+epYI72~a$-Br!QPuOzj|H!&|UJvA4|)(^<c$w@2<
z$<NQxF90*+OF-=S_{_Y_lK6PNg34PQHo5sJr8%i~MXW%(KyE1pF+MUgGBOr116crE
CDKhT>

diff --git a/pillar_tool/middleware/__pycache__/__init__.cpython-313.pyc b/pillar_tool/middleware/__pycache__/__init__.cpython-313.pyc
deleted file mode 100644
index 305b1e414b2f2959df536ee4b568c87a663e9f70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmey&%ge<81U=jynIQTxh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABy}rIKO;XkRX-;)
zue4a-CAB!aB)>r411RK^m=sWypOu<i0u)ayNlZ@7D@iT#P0UM7Pt66g^#d|<auSO|
z^7C`_3&70y5)eB#GbJS_wLGyXRX;vHGcU6wK3=b&@)n0pZhlH>PO4oIE6`eyvx-5C
NkIamWj77{q764vyHgo_0

diff --git a/pillar_tool/middleware/__pycache__/basicauth_backend.cpython-313.pyc b/pillar_tool/middleware/__pycache__/basicauth_backend.cpython-313.pyc
deleted file mode 100644
index 7f9c04e86fd3ca55186645cfbec70c16bc1c8ecb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2018
zcmZt{O>Y}Tbk^QouN}La58?zjO}A+%aY=28oPg4XCT(bo(=XY$RC1-&dUtFuUGKWH
z>qfOIgg`=x02L0ET5(7@0k<L{Ar4%CAK+l5MAIB9RS4x)DXqkT12b!H;*hMgGw=Jo
zdGp?z%}68!$T$7VW&J7(z*CBNAJ+ypuM*%M$bu|04^V4o5aZ%L<R`mto=tOzOY?|N
z2T&j_AVH#X{`p`!ghCP+1S25J#z2<4&Q17Rc2QS}iSrv2xfEw{|7^`EL(|b!#nCPE
zw4&aCriS}=lHWndLRh54GYD!_UNLMO%IcM>0dqD)aRztYf=DmkmTLr6Th3Z5(?&L9
z1h@yT19}SN%QEB?z8FAk){nRn8|QHMX~ou6>ZTpYMi)_0eQg7Dqv`pC{F|eMdKgH=
zVBT{;QZ><rNg{kXCex`&waIsaNGQZ?-b*w|n5PAqy>+raDs1|OLC%*6xMp@N6K$+U
z{8dvqe<rwt?INB`mYrJI6#=&$LEbG5s*(xswlV^8tS6fhck{En$2GYemw9;)3Bi-7
zk&>vEOd-GDlOm@d^5E?~GrSFZ(6zExP-ZX}RCnex;CX<|wXgQFXmopaO5hO4Z(;df
zkDh<YgECPM+TK(C08mJFq|RIH@LB}Z{)3>%yy-78@!+L8??Bs;-oO!BS{BmlZn4(~
zE?LqJigX?-8bp{Y&^oO5y=&f53|(`Dq^w$o6<FtLPVv}V^<j_aib@JGEU6v6!A!+_
zFjqyo>EJ-wHESc%>i~0h)zBTx8P)=E#S?uvnZm)sWJ-gor9sTM_s~_vsKHk6_2x{S
zGUr^87ELJVredqQj=2^gSXGdt(>_MDNQoy$aUk|-1<cZ}jE695L!*dU)iO=Y(x5SK
zyXV3jjo!wAmU9gYRKrv%5Hm6ss)}tdSV%($h+&(SsI>KAD_OQGFlp#!%}&li`-Wpx
zljjNPf>OAGtPh~-5W3<hDw!M*T~th^L{e!w$t${HDCj-QGLlsnlpP9JbWJnhf`VYu
zO)m{pF0^J-qIw&LDWN^JAU<&Ve^VpT$&S!~>Ac$jAAxltvRM9HT<eNG9Q}6uoAG8>
zV!ij3#*tIa-kC;t=84#M_s-It`<GY5@kRETj}M+_)`q0z^n>)*7nUwAo?R3BslaC+
zJ{)L@W9!j)<LIeobf(cgvmPB<jUM?UdgNiP89lZdO|3*zkKS)arx(vX3xPvptJ3im
z>G-3=O=)sPIIt*ud2L;c-A^q~J(yaaelY#rSW}!{WS?}2ODElk&Nh3`HNxkf#D?#N
zmO@{M|2*#pJ^TM0O8hANwC{&~4e`__U`TkK!q5Da@~=(%_2bF8ZszCN=$R4lt2o<7
zkl#jLn~V5=kN64vJsJKy7G#-Tuq@+{ELSY8W>7dR%QtI^(dLM<T-1^6kjsUpCCg}x
z7{~pxOlwP5WyNujUZ{}<BfO)8w@H40UZo42g6=}6xJ^s)Q}BZA=MJLRJx)A~`Y1d|
z7Ti<5T_taah0KIul}fr<!oe*P9wZ)-0UZZ+-Y+e7`n0*dh3J?@JhgSWqn;94A#t-t
zUMFa~s^okw;&w?ZN*Z}9DjGQ!PPWqVHlkyjzA5%7SxABz<}rvo2I5mN_%|?`!1xQC
Sc+L+n2O9(9F96wHEB^sfRO^ZW

diff --git a/pillar_tool/routers/pillar.py b/pillar_tool/routers/pillar.py
index 8c63271..8286ac3 100644
--- a/pillar_tool/routers/pillar.py
+++ b/pillar_tool/routers/pillar.py
@@ -11,7 +11,7 @@ from starlette.requests import Request
 from fastapi import APIRouter, Depends
 from starlette.responses import JSONResponse
 
-from pillar_tool.db import Host, Pillar
+from pillar_tool.db import Host, Pillar, TopFile
 from pillar_tool.db.models.top_data import State, StateAssignment
 from pillar_tool.db.queries.pillar_queries import get_pillar_for_target
 from pillar_tool.schemas import PillarParams, get_model_from_query
@@ -83,9 +83,20 @@ def pillar_get(req: Request, target: str) -> JSONResponse:
 
         path.reverse()
 
+    # create 'virtual' pillar for states
+    stmt_states = select(State).join(TopFile, TopFile.state_id == State.id).where(TopFile.host_id == host.id)
+    states_list: list[str] = [ x[0].name for x in db.execute(stmt_states).fetchall() ]
+
+    # create path name
+    hostgroup_name = '/'.join(x.name for x in path[:-1])
+
     print("[DEBUG] pillar_get: resolved host hierarchy with {} hosts: {}".format(len(path), [h.name for h in path]))
 
     out = merge([get_pillar_for_target(db, host.id) for host in path]) # type: ignore
+    out.update({
+        "states": states_list,
+        "hostgroup": hostgroup_name
+    })
     print("[DEBUG] pillar_get: merged pillar data contains {} top-level key(s)".format(len(out)))
     return JSONResponse(status_code=200, content=out)