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

Remove Git remote when deleting remote token

Browse Source
This commit is contained in:
mpabi
2026-04-27 20:03:25 +02:00
parent ffd12c9905
commit 2ab1a428e7
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rvctl.py
+8 -17
View File
@@ -2008,7 +2008,7 @@ def remove_token_from_store(
}
def remove_git_remote_credentials(repo_path: Path, remote_id: str, dry_run: bool = False) -> dict[str, str]:
def remove_git_remote(repo_path: Path, remote_id: str, dry_run: bool = False) -> dict[str, str]:
repo_root = git_repo_root(repo_path)
if repo_root is None:
raise SystemExit(f"Missing git repo at path: {repo_path}")
@@ -2021,26 +2021,17 @@ def remove_git_remote_credentials(repo_path: Path, remote_id: str, dry_run: bool
"removed": "0",
"status": "missing",
}
sanitized_url, had_credentials = sanitize_remote_url(remote_url)
if not had_credentials:
return {
"repo_root": str(repo_root),
"remote": remote_id,
"url": sanitized_url,
"removed": "0",
"status": "no_credentials",
}
if not dry_run:
subprocess.run(
["git", "-C", str(repo_root), "remote", "set-url", remote_id, sanitized_url],
["git", "-C", str(repo_root), "remote", "remove", remote_id],
check=True,
)
return {
"repo_root": str(repo_root),
"remote": remote_id,
"url": sanitized_url,
"url": safe_remote_url_label(remote_url),
"removed": "1",
"status": "dry-run" if dry_run else "removed",
}
@@ -2053,7 +2044,7 @@ def run_tokens_remove(config: WorkspaceConfig, args: argparse.Namespace) -> None
return
if args.target == "remote":
result = remove_git_remote_credentials(resolve_launcher_repo_argument(args.repo), args.remote_id, args.dry_run)
result = remove_git_remote(resolve_launcher_repo_argument(args.repo), args.remote_id, args.dry_run)
print_token_action_result(result)
return
@@ -2061,7 +2052,7 @@ def run_tokens_remove(config: WorkspaceConfig, args: argparse.Namespace) -> None
repo_path = resolve_launcher_repo_argument(args.repo)
if not args.dry_run:
remove_token_from_store(config, args.remote_id, args.server, dry_run=True)
remote_result = remove_git_remote_credentials(repo_path, args.remote_id, args.dry_run)
remote_result = remove_git_remote(repo_path, args.remote_id, args.dry_run)
print_token_action_result(remote_result)
print()
store_result = remove_token_from_store(config, args.remote_id, args.server, args.dry_run)
@@ -2529,7 +2520,7 @@ def print_tokens_overview() -> None:
["stats", "[--repo PATH]", "repo + tokens.json", "compare remote URLs with local token store"],
["sync remote", "REMOTE_ID [--repo PATH]", "repo -> tokens.json", "copy one remote URL into the store"],
["sync store", "REMOTE_ID [--repo PATH]", "tokens.json -> repo", "write one store record into a remote URL"],
["remove", "store|remote|both REMOTE_ID", "selected", "remove store record or remote credentials"],
["remove", "store|remote|both REMOTE_ID", "selected", "remove token store record or Git remote"],
["write", "--remote R [--replace]", "tokens.json -> repo", "write selected token into a remote URL"],
["update", "REMOTE_ID", "API -> tokens.json", "refresh valid/scope/org/repo metadata"],
],
@@ -2546,7 +2537,7 @@ def print_tokens_overview() -> None:
["refresh r1 metadata", "./rvctl tokens update r1"],
["write store r1 to remote", "./rvctl tokens sync store r1 --repo PATH"],
["remove r1 from store", "./rvctl tokens remove store r1"],
["remove auth from r1", "./rvctl tokens remove remote r1"],
["remove Git remote r1", "./rvctl tokens remove remote r1"],
["scan selected card", "./rvctl tokens scan --repo ~/dev/workspace/rv/series/inf/03"],
["compare state", "./rvctl tokens stats --repo ~/dev/workspace/rv/series/inf/03"],
["write auth to r1", "./rvctl tokens write --repo PATH --remote r1 --server URL"],
@@ -2707,7 +2698,7 @@ def build_parser() -> argparse.ArgumentParser:
tokens_remove_parser = tokens_subparsers.add_parser(
"remove",
help="Remove a token store record, Git remote credentials, or both.",
help="Remove a token store record, a Git remote, or both.",
)
tokens_remove_parser.add_argument("target", choices=["store", "remote", "both"], help="Where to remove REMOTE_ID from.")
tokens_remove_parser.add_argument("remote_id", help="Remote id, for example 'r1' or 'r1a'.")