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

Drop legacy gitea token migration

Browse Source
This commit is contained in:
mpabi
2026-04-26 10:33:13 +02:00
parent 72e09bb077
commit 663242c855
4 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
workspace.py
-20
View File
@@ -40,7 +40,6 @@ class WorkspaceConfig:
series_root: Path
socket_root: Path
token_path: Path
legacy_token_path: Path
tools_root_candidates: list[Path]
tools_root: Path
defaults: dict[str, str]
@@ -55,10 +54,6 @@ def load_config(config_path: Path) -> WorkspaceConfig:
series_root = expand_path(raw.get("series_root", str(workspace_root / "series")), base_dir)
socket_root = expand_path(raw.get("socket_root", str(workspace_root / "sockets")), base_dir)
token_path = expand_path(raw.get("token_file", str(workspace_root / "tokens" / "tokens.json")), base_dir)
legacy_token_path = expand_path(
raw.get("legacy_token_file", str(workspace_root / "tokens" / "gitea_tokens.json")),
base_dir,
)
candidate_values = raw.get("tools_root_candidates")
if not candidate_values:
@@ -84,7 +79,6 @@ def load_config(config_path: Path) -> WorkspaceConfig:
series_root=series_root,
socket_root=socket_root,
token_path=token_path,
legacy_token_path=legacy_token_path,
tools_root_candidates=tools_root_candidates,
tools_root=tools_root,
defaults=defaults,
@@ -256,16 +250,6 @@ def server_info_from_url(config: WorkspaceConfig, remote_url: str) -> dict | Non
}
def migrate_legacy_token_store(config: WorkspaceConfig) -> None:
if config.token_path.exists() or not config.legacy_token_path.exists():
return
config.token_path.parent.mkdir(parents=True, exist_ok=True)
os.chmod(config.token_path.parent, 0o700)
config.legacy_token_path.replace(config.token_path)
os.chmod(config.token_path, 0o600)
def empty_token_store() -> dict:
return {"version": 2, "servers": {}}
@@ -354,8 +338,6 @@ def normalize_token_store(config: WorkspaceConfig, raw_data: dict) -> dict:
def load_token_store(config: WorkspaceConfig) -> dict:
migrate_legacy_token_store(config)
if not config.token_path.exists():
return empty_token_store()
@@ -425,7 +407,6 @@ def remote_credentials(remote_url: str) -> tuple[str, str] | None:
def sync_tokens_from_repo(config: WorkspaceConfig, repo_path: Path) -> dict:
repo_root = git_repo_root(repo_path)
if repo_root is None:
migrate_legacy_token_store(config)
return {
"repo_root": None,
"scanned": 0,
@@ -443,7 +424,6 @@ def sync_tokens_from_repo(config: WorkspaceConfig, repo_path: Path) -> dict:
found_credentials.append((server_info, user_name, token_value))
if not found_credentials:
migrate_legacy_token_store(config)
return {
"repo_root": repo_root,
"scanned": 0,