From 916ca4a0c6df1e892f26b50f69da20a3e2bf1a6a Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Tue, 27 Dec 2022 17:41:01 -0500 Subject: [PATCH 1/2] _internal/tuf: restructure TUF cache dir layout Signed-off-by: William Woodruff --- sigstore/_internal/tuf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sigstore/_internal/tuf.py b/sigstore/_internal/tuf.py index 15919b74..4c0897f0 100644 --- a/sigstore/_internal/tuf.py +++ b/sigstore/_internal/tuf.py @@ -44,12 +44,12 @@ def _get_dirs(url: str) -> tuple[Path, Path]: """ builder = appdirs.AppDirs("sigstore-python", "sigstore") - tuf_base = parse.quote(url, safe="") + repo_base = parse.quote(url, safe="") - data_dir = Path(builder.user_data_dir) - cache_dir = Path(builder.user_cache_dir) + tuf_data_dir = Path(builder.user_data_dir) / "tuf" + tuf_cache_dir = Path(builder.user_cache_dir) / "tuf" - return (data_dir / tuf_base), (cache_dir / tuf_base) + return (tuf_data_dir / repo_base), (tuf_cache_dir / repo_base) class TrustUpdater: From d6ea1a564c8b98be18cf40796ff5766251120443 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Tue, 27 Dec 2022 17:46:06 -0500 Subject: [PATCH 2/2] _internal/tuf: typo Signed-off-by: William Woodruff --- sigstore/_internal/tuf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigstore/_internal/tuf.py b/sigstore/_internal/tuf.py index 4c0897f0..e2da54b3 100644 --- a/sigstore/_internal/tuf.py +++ b/sigstore/_internal/tuf.py @@ -75,7 +75,7 @@ def __init__(self, url: str) -> None: self._metadata_dir, self._targets_dir = _get_dirs(url) - # intialize metadata dir + # Initialize metadata dir tuf_root = self._metadata_dir / "root.json" if not tuf_root.exists(): if self._repo_url == DEFAULT_TUF_URL: