repository: remove init argument from open()

This no longer seems needed: if the metadata store does not contain
a single version of role, then open() can assume it is initializing.

Signed-off-by: Jussi Kukkonen <jkukkonen@google.com>

Author: jku

examples/repository/_simplerepo.py

@@ -68,14 +68,14 @@ def __init__(self) -> None:
         )
 
         # setup a basic repository, generate signing key per top-level role
-        with self.edit("root", init=True) as root:
+        with self.edit("root") as root:
             for role in ["root", "timestamp", "snapshot", "targets"]:
                 key = keys.generate_ed25519_key()
                 self.signer_cache[role].append(SSlibSigner(key))
                 root.add_key(Key.from_securesystemslib_key(key), role)
 
         for role in ["timestamp", "snapshot", "targets"]:
-            with self.edit(role, init=True):
+            with self.edit(role):
                 pass
 
     @property
@@ -86,10 +86,10 @@ def targets_infos(self) -> Dict[str, MetaFile]:
     def snapshot_info(self) -> MetaFile:
         return self._snapshot_info
 
-    def open(self, role: str, init: bool = False) -> Metadata:
+    def open(self, role: str) -> Metadata:
         """Return current Metadata for role from 'storage' (or create a new one)"""
 
-        if init:
+        if role not in self.role_cache:
             signed_init = _signed_init.get(role, Targets)
             md = Metadata(signed_init())
 

examples/repository/repo

@@ -21,14 +21,15 @@ from _simplerepo import SimpleRepository
 
 logger = logging.getLogger(__name__)
 
+
 class ReqHandler(BaseHTTPRequestHandler):
     """HTTP handler to serve metadata and targets from a SimpleRepository"""
 
     def do_GET(self):
         if self.path.startswith("/metadata/") and self.path.endswith(".json"):
-            self.get_metadata(self.path[len("/metadata/"):-len(".json")])
+            self.get_metadata(self.path[len("/metadata/") : -len(".json")])
         elif self.path.startswith("/targets/"):
-            self.get_target(self.path[len("/targets/"):])
+            self.get_target(self.path[len("/targets/") :])
         else:
             self.send_error(404, "Only serving /metadata/*.json")
 
@@ -47,9 +48,9 @@ class ReqHandler(BaseHTTPRequestHandler):
             return
 
         # send the metadata json
-        data = repo.role_cache[role][ver-1].to_bytes()
+        data = repo.role_cache[role][ver - 1].to_bytes()
         self.send_response(200)
-        self.send_header('Content-length', len(data))
+        self.send_header("Content-length", len(data))
         self.end_headers()
         self.wfile.write(data)
 
@@ -66,7 +67,7 @@ class ReqHandler(BaseHTTPRequestHandler):
         # send the target content
         data = repo.target_cache[target]
         self.send_response(200)
-        self.send_header('Content-length', len(data))
+        self.send_header("Content-length", len(data))
         self.end_headers()
         self.wfile.write(data)
 
@@ -93,7 +94,9 @@ def main(argv: List[str]) -> None:
     last_change = 0
     counter = 0
 
-    logger.info(f"Now serving. Root v1 at http://127.0.0.1:{server.server_port}/metadata/1.root.json")
+    logger.info(
+        f"Now serving. Root v1 at http://127.0.0.1:{server.server_port}/metadata/1.root.json"
+    )
 
     while True:
         # Simulate a live repository: Add a new target file every few seconds

tuf/repository/_repository.py

@@ -35,10 +35,10 @@ class Repository(ABC):
     """
 
     @abstractmethod
-    def open(self, role: str, init: bool = False) -> Metadata:
+    def open(self, role: str) -> Metadata:
         """Load a roles metadata from storage or cache, return it
 
-        If 'init', then create metadata from scratch"""
+        If role has no metadata, create first version from scratch"""
         raise NotImplementedError
 
     @abstractmethod
@@ -76,20 +76,18 @@ def snapshot_info(self) -> MetaFile:
         raise NotImplementedError
 
     @contextmanager
-    def edit(
-        self, role: str, init: bool = False
-    ) -> Generator[Signed, None, None]:
+    def edit(self, role: str) -> Generator[Signed, None, None]:
         """Context manager for editing a role's metadata
 
         Context manager takes care of loading the roles metadata (or creating
-        new metadata if 'init'), updating expiry and version. The caller can do
+        new metadata), updating expiry and version. The caller can do
         other changes to the Signed object and when the context manager exits,
         a new version of the roles metadata is stored.
 
         Context manager user can raise AbortEdit from inside the with-block to
         cancel the edit: in this case none of the changes are stored.
         """
-        md = self.open(role, init)
+        md = self.open(role)
         with suppress(AbortEdit):
             yield md.signed
             self.close(role, md)