Refer to ASL using archives
This commit is contained in:
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
__pycache__
|
20
modules/asl/0.1.0/MODULE.bazel
Normal file
20
modules/asl/0.1.0/MODULE.bazel
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# Copyright 2025 Steven Le Rouzic
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
|
module(name = "asl", version = "0.1.0")
|
||||||
|
|
||||||
|
bazel_dep(name = "platforms", version = "0.0.10")
|
||||||
|
bazel_dep(name = "rules_cc", version = "0.0.17")
|
||||||
|
bazel_dep(name = "rules_license", version = "1.0.0")
|
||||||
|
|
||||||
|
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
|
||||||
|
git_override(
|
||||||
|
module_name = "hedron_compile_commands",
|
||||||
|
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
|
||||||
|
commit = "4f28899228fb3ad0126897876f147ca15026151e",
|
||||||
|
)
|
||||||
|
|
||||||
|
bazel_dep(name = "rules_python", version = "1.1.0")
|
||||||
|
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
|
||||||
|
python.toolchain(python_version = "3.13", is_default = True)
|
4
modules/asl/0.1.0/source.json
Normal file
4
modules/asl/0.1.0/source.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"url": "https://bazel.stevenlr.com/blobs/asl/0.1.0-E0yyEgMYS3.tar.gz",
|
||||||
|
"integrity": "sha256-E0yyEgMYS3a8Y+oiHzdQNHvTobSXlsDjOrwvDv02Eao="
|
||||||
|
}
|
@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
"type": "git_repository",
|
"url": "https://bazel.stevenlr.com/blobs/asl/0.2.0-r9c2XzBfyd.tar.gz",
|
||||||
"remote": "https://git.stevenlr.com/460nm/asl.git",
|
"integrity": "sha256-r9c2XzBfydc55DTn/WOZm/W/BwnBNhev8adGQA0xZgs="
|
||||||
"commit": "95598e24e16ddd23a5d425e3a797f7518a93c324"
|
}
|
||||||
}
|
|
@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
"type": "git_repository",
|
"url": "https://bazel.stevenlr.com/blobs/asl/0.3.0-NvcVEwRjIK.tar.gz",
|
||||||
"remote": "https://git.stevenlr.com/460nm/asl.git",
|
"integrity": "sha256-NvcVEwRjIKHSO2MVKO/HsemTGyoSgOzcTZTkQ6PaGHs="
|
||||||
"commit": "afbfd0e78176d47c495a29c795fbd3690fa0ded3"
|
}
|
||||||
}
|
|
@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
"type": "git_repository",
|
"url": "https://bazel.stevenlr.com/blobs/asl/0.4.0-BxafPMm6qK.tar.gz",
|
||||||
"remote": "https://git.stevenlr.com/460nm/asl.git",
|
"integrity": "sha256-BxafPMm6qKvY8YLL0Zi14VNEw+FnTCeHIv86Y2xYLRI="
|
||||||
"commit": "5bca42b04941ce132426100b5f99da096b5402b6"
|
}
|
||||||
}
|
|
102
tools/add_module.py
Normal file
102
tools/add_module.py
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
import sys
|
||||||
|
import subprocess
|
||||||
|
import argparse
|
||||||
|
from pathlib import Path, PurePosixPath
|
||||||
|
import tempfile
|
||||||
|
import tarfile
|
||||||
|
from integrity import file_hash
|
||||||
|
import json
|
||||||
|
|
||||||
|
def make_git_archive(repo_path: Path, tag: str, output_path: Path):
|
||||||
|
try:
|
||||||
|
subprocess.run(
|
||||||
|
["git", "archive", "--format=tar.gz", "--output", str(output_path.absolute()), tag],
|
||||||
|
cwd=repo_path,
|
||||||
|
check=True
|
||||||
|
)
|
||||||
|
except subprocess.CalledProcessError as e:
|
||||||
|
print(f"Error creating git archive: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
def extract_module_content(archive_path: Path) -> str:
|
||||||
|
with tarfile.open(archive_path, "r:gz") as tar:
|
||||||
|
file = tar.extractfile("MODULE.bazel")
|
||||||
|
if file is None:
|
||||||
|
print("Error: MODULE.bazel file not found in the archive.")
|
||||||
|
sys.exit(1)
|
||||||
|
return file.read().decode()
|
||||||
|
|
||||||
|
def upload_to_blob_storage(local_path: Path, remote_path: str, scp_port: int = 22):
|
||||||
|
try:
|
||||||
|
ssh_login = remote_path.split(":")[0]
|
||||||
|
ssh_path = str(PurePosixPath(remote_path.split(":")[1]).parent)
|
||||||
|
|
||||||
|
subprocess.run(
|
||||||
|
["ssh", "-p", str(scp_port), ssh_login, f"mkdir -p {ssh_path}"],
|
||||||
|
check=True,
|
||||||
|
stdout=sys.stdout,
|
||||||
|
stderr=sys.stderr,
|
||||||
|
)
|
||||||
|
|
||||||
|
subprocess.run(
|
||||||
|
["scp", "-P", str(scp_port), str(local_path), remote_path],
|
||||||
|
check=True,
|
||||||
|
stdout=sys.stdout,
|
||||||
|
stderr=sys.stderr,
|
||||||
|
)
|
||||||
|
except subprocess.CalledProcessError as e:
|
||||||
|
print(f"Error uploading to blob storage: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
MODULES_DIR = Path(__file__).parent.parent / "modules"
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
parser = argparse.ArgumentParser(description="Add a module to the registry.")
|
||||||
|
parser.add_argument("module_name", type=str, help="Name of the module to add")
|
||||||
|
parser.add_argument("module_version", type=str, help="Version of the module to add")
|
||||||
|
parser.add_argument("local_git_repo_path", type=str, help="Path to the local git repository")
|
||||||
|
parser.add_argument("remote_blob_path", type=str, help="SCP-compatible path to the remote blob storage folder")
|
||||||
|
parser.add_argument("-t", "--tag", type=str, default=None, help="Git tag for the module version")
|
||||||
|
parser.add_argument("-p", "--scp_port", type=int, default=22, help="Port for SCP connection (default: 22)")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
module_name = args.module_name
|
||||||
|
module_version = args.module_version
|
||||||
|
local_git_repo_path = Path(args.local_git_repo_path)
|
||||||
|
git_repo_tag = args.tag or f"v{module_version}"
|
||||||
|
|
||||||
|
if not local_git_repo_path.exists():
|
||||||
|
print(f"Error: The specified local git repository path '{local_git_repo_path}' does not exist.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
registry_module_path = MODULES_DIR / module_name / module_version
|
||||||
|
if registry_module_path.exists():
|
||||||
|
print(f"Error: The module '{module_name}' version '{module_version}' already exists in the registry.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
tmp_dir = tempfile.TemporaryDirectory()
|
||||||
|
|
||||||
|
archive_file = Path(tmp_dir.name) / f"archive.tar.gz"
|
||||||
|
make_git_archive(local_git_repo_path, git_repo_tag, archive_file)
|
||||||
|
|
||||||
|
module_content = extract_module_content(archive_file)
|
||||||
|
integrity = file_hash(archive_file)
|
||||||
|
partial_hash = integrity[7:17]
|
||||||
|
|
||||||
|
registry_module_path.mkdir(parents=True, exist_ok=True)
|
||||||
|
with open(registry_module_path / "MODULE.bazel", "wb+") as f:
|
||||||
|
f.write(module_content.encode())
|
||||||
|
|
||||||
|
blob_path = f"{module_name}/{module_version}-{partial_hash}.tar.gz"
|
||||||
|
remote_blob_path = f"{args.remote_blob_path}/{blob_path}"
|
||||||
|
|
||||||
|
upload_to_blob_storage(archive_file, remote_blob_path, args.scp_port)
|
||||||
|
|
||||||
|
source_json = {
|
||||||
|
"url": f"https://bazel.stevenlr.com/blobs/{blob_path}",
|
||||||
|
"integrity": integrity,
|
||||||
|
}
|
||||||
|
|
||||||
|
with open(registry_module_path / "source.json", "wb+") as f:
|
||||||
|
f.write(json.dumps(source_json, indent=2).encode())
|
@ -1,34 +1,34 @@
|
|||||||
import sys
|
import sys
|
||||||
import hashlib
|
import hashlib
|
||||||
import base64
|
import base64
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
def file_hash(file_path: Path) -> str:
|
def file_hash(file_path: Path) -> str:
|
||||||
sha256_hash = hashlib.sha256()
|
sha256_hash = hashlib.sha256()
|
||||||
with open(file_path, "rb") as file:
|
with open(file_path, "rb") as file:
|
||||||
while True:
|
while True:
|
||||||
data = file.read(65536)
|
data = file.read(65536)
|
||||||
if not data:
|
if not data:
|
||||||
break
|
break
|
||||||
sha256_hash.update(data)
|
sha256_hash.update(data)
|
||||||
return "sha256-" + base64.b64encode(sha256_hash.digest()).decode()
|
return "sha256-" + base64.b64encode(sha256_hash.digest()).decode()
|
||||||
|
|
||||||
def url_hash(url: str) -> str:
|
def url_hash(url: str) -> str:
|
||||||
sha256_hash = hashlib.sha256()
|
sha256_hash = hashlib.sha256()
|
||||||
with requests.get(url, stream=True) as resp:
|
with requests.get(url, stream=True) as resp:
|
||||||
resp.raise_for_status()
|
resp.raise_for_status()
|
||||||
while True:
|
while True:
|
||||||
data = resp.raw.read(65536)
|
data = resp.raw.read(65536)
|
||||||
if not data:
|
if not data:
|
||||||
break
|
break
|
||||||
sha256_hash.update(data)
|
sha256_hash.update(data)
|
||||||
return "sha256-" + base64.b64encode(sha256_hash.digest()).decode()
|
return "sha256-" + base64.b64encode(sha256_hash.digest()).decode()
|
||||||
|
|
||||||
if __name__ == "__main__" and len(sys.argv) > 1:
|
if __name__ == "__main__" and len(sys.argv) > 1:
|
||||||
path = Path(sys.argv[1])
|
path = Path(sys.argv[1])
|
||||||
if path.exists():
|
if path.exists():
|
||||||
print(file_hash(path))
|
print(file_hash(path))
|
||||||
else:
|
else:
|
||||||
print(url_hash(sys.argv[1]))
|
print(url_hash(sys.argv[1]))
|
||||||
|
|
Reference in New Issue
Block a user