edu/stem-launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move token item URL to last column

Browse Source
This commit is contained in:
mpabi
2026-04-26 19:45:35 +02:00
parent b4e638ef4f
commit d93d28eaa7
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rvctl.py
+12 -12
View File
@@ -682,7 +682,7 @@ def print_token_item_rows(
scan_rows_by_endpoint.setdefault(endpoint, []).append(row)
print("items")
print("item\tsource\tendpoint\tremote\tkind\tuser\ttoken\tresult\tstatus")
print("item\tsource\tremote\tkind\tuser\ttoken\tresult\tstatus\turl")
for index, endpoint in enumerate(endpoint_names, start=1):
item_id = str(index)
repo_entry = repo_servers.get(endpoint)
@@ -696,11 +696,11 @@ def print_token_item_rows(
for row in repo_rows:
token_label = "remote" if row["url_kind"] == "auth" else ""
print(
f"{item_id}\trepo\t{endpoint}\t{row['remote']}\t{row['url_kind']}\t"
f"{row['user']}\t{token_label}\t{row['result']}\t{status_name}"
f"{item_id}\trepo\t{row['remote']}\t{row['url_kind']}\t"
f"{row['user']}\t{token_label}\t{row['result']}\t{status_name}\t{endpoint}"
)
elif repo_entry is None:
print(f"{item_id}\trepo\t{endpoint}\t\tmissing\t\t\tmissing\t{status_name}")
print(f"{item_id}\trepo\t\tmissing\t\t\tmissing\t{status_name}\t{endpoint}")
else:
repo_kind, repo_result = repo_result_for_entry(repo_entry)
remote_names = ",".join(sorted(repo_entry.get("remotes", set())))
@@ -708,28 +708,28 @@ def print_token_item_rows(
if repo_users:
for user_name, _ in repo_users:
print(
f"{item_id}\trepo\t{endpoint}\t{remote_names}\t{repo_kind}\t"
f"{user_name}\tremote\t{repo_result}\t{status_name}"
f"{item_id}\trepo\t{remote_names}\t{repo_kind}\t"
f"{user_name}\tremote\t{repo_result}\t{status_name}\t{endpoint}"
)
else:
print(
f"{item_id}\trepo\t{endpoint}\t{remote_names}\t{repo_kind}\t\t\t"
f"{repo_result}\t{status_name}"
f"{item_id}\trepo\t{remote_names}\t{repo_kind}\t\t\t"
f"{repo_result}\t{status_name}\t{endpoint}"
)
if store_entry is None:
print(f"{item_id}\ttokens.json\t{endpoint}\t\tmissing\t\t\tmissing\t{status_name}")
print(f"{item_id}\ttokens.json\t\tmissing\t\t\tmissing\t{status_name}\t{endpoint}")
continue
store_users = token_name_rows(store_entry.get("users", {}))
if not store_users:
print(f"{item_id}\ttokens.json\t{endpoint}\t\tstore\t\t\tempty\t{status_name}")
print(f"{item_id}\ttokens.json\t\tstore\t\t\tempty\t{status_name}\t{endpoint}")
continue
for user_name, token_name in store_users:
print(
f"{item_id}\ttokens.json\t{endpoint}\t\tstore\t{user_name}\t"
f"{token_name}\tpresent\t{status_name}"
f"{item_id}\ttokens.json\t\tstore\t{user_name}\t"
f"{token_name}\tpresent\t{status_name}\t{endpoint}"
)
return status_counts