fixing unit tests, _key_init() still broken

grodzki-lanl · grodzki-lanl · commit d730ce192da5 · 2026-04-21T14:45:51.000-06:00
diff --git a/stackinator/mirror.py b/stackinator/mirror.py
@@ -71,8 +71,8 @@ def _load_mirrors(self, cmdline_cache: Optional[pathlib.Path]) -> Dict[str, Dict
                 raise MirrorError(
                     "Mirror build cache config is missing a required 'private_key' path."
                 )
-                self.build_cache_mirror = "buildcache"
-                enabled_mirrors["buildcache"] = buildcache
+            self.build_cache_mirror = "buildcache"
+            enabled_mirrors["buildcache"] = buildcache
         else:
             self.build_cache_mirror = None
 
@@ -81,17 +81,13 @@ def _load_mirrors(self, cmdline_cache: Optional[pathlib.Path]) -> Dict[str, Dict
             enabled_mirrors["buildcache"] = self._load_cmdline_cache(cmdline_cache)
             self.build_cache_mirror = self.CMDLINE_CACHE
 
-
         bootstrap = mirrors.get("bootstrap")
         if bootstrap and bootstrap.get("enabled", True):
-            self.bootstrap_mirror = bootstrap
             enabled_mirrors["bootstrap"] = bootstrap
-        else:
-            self.bootstrap_mirror = None
 
         for name, mirror in mirrors.get("sourcecache", {}).items():
-        if mirror.get("enabled", True):
-            enabled_mirrors[name] = mirror
+            if mirror.get("enabled", True):
+                enabled_mirrors[name] = mirror
 
         return enabled_mirrors
 
@@ -182,44 +178,26 @@ def _create_spack_mirrors_yaml(self, dest: pathlib.Path):
 
         raw = {"mirrors": {}}
 
-        if self.build_cache_mirror:
-            url = self.mirrors.get("buildcache")["url"]
-            name = self.build_cache_mirror
+        for name, mirror in self.mirrors.items():
+            url = mirror["url"]
 
-            if self.build_cache_mirror.get("mount_specific", True) and self._mount_point is not None:
-                url = url.rstrip("/") + "/" + self._mount_point.as_posix().lstrip("/")
+            # Make the mirror path specific to the mount point
+            if(name=="buildcache"):
+                if mirror["mount_specific"] and self._mount_point is not None:
+                    url = url.rstrip("/") + "/" + self._mount_point.as_posix().lstrip("/")
 
             raw["mirrors"][name] = {
                 "fetch": {"url": url},
                 "push": {"url": url},
             }
 
-        elif self.mirrors.get("bootstrap"):
-            url = self.mirrors.get("bootstrap")["url"]
-
-            raw["mirrors"]["bootstrap"] = {
-                "fetch": {"url": url},
-                "push": {"url": url},
-            }
-
-        elif self.mirrors.get("sourcecache"):
-            source_mirrors = self.mirrors.get("sourcecache")
-
-            for name, mirror in source_mirrors.items():
-                url = mirror["url"]
-
-                raw["mirrors"][name] = {
-                    "fetch": {"url": url},
-                    "push": {"url": url},
-                }
-
         with dest.open("w") as file:
             yaml.dump(raw, file, default_flow_style=False)
 
     def _create_bootstrap_configs(self, config_root: pathlib.Path):
         """Create the bootstrap.yaml and bootstrap metadata dirs in our build dir."""
 
-        if not self.bootstrap_mirror:
+        if not self.mirrors.get("bootstrap"):
             return
 
         bootstrap_yaml = {
@@ -229,17 +207,17 @@ def _create_bootstrap_configs(self, config_root: pathlib.Path):
             }
         }
 
-        bs_mirror_path = config_root / f"bootstrap/{self.bootstrap_mirror}"
+        bs_mirror_path = config_root / "bootstrap" / "bootstrap-mirror"
         mirror = self.mirrors.get("bootstrap")
         # Tell spack where to find the metadata for each bootstrap mirror.
         bootstrap_yaml["bootstrap"]["sources"].append(
             {
-                "name": "bootstrap_mirror",
+                "name": "bootstrap-mirror",
                 "metadata": str(bs_mirror_path),
             }
         )
         # And trust each one
-        bootstrap_yaml["bootstrap"]["trusted"][bootstrap_mirror] = True
+        bootstrap_yaml["bootstrap"]["trusted"]["bootstrap-mirror"] = True
 
         # Create the metadata dir and metadata.yaml
         bs_mirror_path.mkdir(parents=True, exist_ok=True)
@@ -256,44 +234,44 @@ def _create_bootstrap_configs(self, config_root: pathlib.Path):
             yaml.dump(bootstrap_yaml, file, default_flow_style=False)
 
     def _key_init(self):
-        key_info = []
-
-        for name, mirror in self.mirrors.items():
-            if mirror.get("private_key") is None:
-                continue
+        key_info = {}
+        
+        key = self.mirrors["buildcache"].get("private_key")
 
-            key = mirror["private_key"]
+        if key is None:
+            return
 
-            # if path, check if abs path, if not, append sys config path in front and check again
-            path = pathlib.Path(os.path.expandvars(key))
+        # if path, check if abs path, if not, append sys config path in front and check again
+        path = pathlib.Path(os.path.expandvars(key))
 
-            if not path.is_absolute():
-                # try prepending system config path
-                path = self._system_config_root / path
+        if not path.is_absolute():
+            # try prepending system config path
+            path = self._system_config_root / path
 
-            if path.is_file():
-                # use the user-provided file
-                key_info.append({"path": pathlib.Path(f"{name}.pgp"), "source": path})
-            else:
-                # convert base64 key to binary
-                try:
-                    binary_key = base64.b64decode(key)
-                except ValueError:
-                    raise MirrorError(
-                        f"Key for mirror '{name}' is not valid: '{path}'. \n"
-                        f"Must be a path to a GPG public key or a base64 encoded GPG public key. \n"
-                        f"Check the key listed in mirrors.yaml in system config."
-                    )
+        if path.is_file():
+            # use the user-provided file
+            key_info = {"path": pathlib.Path(f"buildcache.pgp"), "source": path}
+        else:
+            # convert base64 key to binary
+            try:
+                binary_key = base64.b64decode(key, validate=True)
+                print(binary_key)
+            except ValueError:
+                raise MirrorError(
+                    f"Key for mirror 'buildcache' is not valid. \n"
+                    f"Must be a path to a GPG public key or a base64 encoded GPG public key. \n"
+                    f"Check the key listed in mirrors.yaml in system config."
+                )
 
-                file_type = magic.from_buffer(binary_key, mime=True)
-                if file_type not in ("application/x-gnupg-keyring", "application/pgp-keys"):
-                    raise MirrorError(
-                        f"Key for mirror {name} is not a valid GPG key. \n"
-                        f"The file (or base64) was readable, but the data itself was not a PGP key.\n"
-                        f"Check the key listed in mirrors.yaml in system config."
-                    )
+            file_type = magic.from_buffer(binary_key, mime=True)
+            if file_type not in ("application/x-gnupg-keyring", "application/pgp-keys"):
+                raise MirrorError(
+                    f"Key for mirror 'buildcache' is not a valid GPG key. \n"
+                    f"The file (or base64) was readable, but the data itself was not a PGP key.\n"
+                    f"Check the key listed in mirrors.yaml in system config."
+                )
 
-                key_info.append({"path": pathlib.Path(f"{name}.pgp"), "source": binary_key})
+            key_info = {"path": pathlib.Path("buildcache.pgp"), "source": binary_key}
 
         return key_info
 
@@ -302,17 +280,20 @@ def _key_setup(self, key_store: pathlib.Path):
 
         key_store.mkdir(exist_ok=True)
 
-        for key_info in self._keys:
-            path = key_store / key_info["path"]
-            source = key_info["source"]
-
-            match source:
-                case pathlib.Path():
-                    # copy source -> path
-                    shutil.copy2(source, path)
-                case bytes():
-                    # open path and copy in bytes
-                    with open(path, "wb") as writer:
-                        writer.write(source)
-                case _:
-                    raise TypeError(f"Expected Path or bytes, got {type(source).__name__}")
+        #for key_info in self._keys:
+
+        #path = key_store / key_info["path"]
+        path = key_store / self._keys["path"]
+        #source = key_info["source"]
+        source = self._keys["source"]
+
+        match source:
+            case pathlib.Path():
+                # copy source -> path
+                shutil.copy2(source, path)
+            case bytes():
+                # open path and copy in bytes
+                with open(path, "wb") as writer:
+                    writer.write(source)
+            case _:
+                raise TypeError(f"Expected Path or bytes, got {type(source).__name__}")
diff --git a/stackinator/schema/mirror.json b/stackinator/schema/mirror.json
@@ -32,7 +32,7 @@
                 },
                 "cmdline": {
                     "type": "boolean",
-                    "default": true
+                    "default": false
                 }
             },
             "additionalProperties": false,
diff --git a/unittests/data/systems/mirror-bad-key/mirrors.yaml b/unittests/data/systems/mirror-bad-key/mirrors.yaml
@@ -1,3 +1,3 @@
-bad-key:
+buildcache:
   url: https://mirror.spack.io
-  public_key: bad_key.gpg
+  private_key: bad_key.gpg
diff --git a/unittests/data/systems/mirror-bad-keypath/mirrors.yaml b/unittests/data/systems/mirror-bad-keypath/mirrors.yaml
@@ -1,3 +1,3 @@
-bad-key-path:
+buildcache:
   url: https://mirror.spack.io
-  public_key: /path/doesnt/exist
+  private_key: /path/doesnt/exist
diff --git a/unittests/data/systems/mirror-bad-url/mirrors.yaml b/unittests/data/systems/mirror-bad-url/mirrors.yaml
@@ -1,2 +1,4 @@
-bad-url:
-  url: https://www.testsite.io/services
+sourcecache:
+  bad-url:
+    url: https://www.testsite.io/services
+    enabled: true
diff --git a/unittests/data/systems/mirror-ok-raw-key/mirrors.yaml b/unittests/data/systems/mirror-ok-raw-key/mirrors.yaml
@@ -0,0 +1,59 @@
+bootstrap:
+  url: https://mirror.spack.io
+  enabled: true
+buildcache:
+  url: https://mirror.spack.io
+  enabled: true
+  private_key: "\
+    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\
+    gllMF++N8+7T4/ehkA/hs2udYRkSCANLQ3I3"
+  mount_specific: false
+  cmdline: false
+sourcecache:
+  mirror1:
+    url: https://github.com
+    enabled: true
+  mirror2:
+    url: https://github.com/spack
+    enabled: true
+  disabled-mirror:
+    url: https://github.com
+    enabled: false
diff --git a/unittests/data/systems/mirror-ok/mirrors.yaml b/unittests/data/systems/mirror-ok/mirrors.yaml
@@ -1,55 +1,19 @@
-fake-mirror:
-  url: https://github.com
-  public_key: ../../test-gpg-pub.asc
-disabled-mirror:
-  url: https://github.com
-  enabled: false
-buildcache-mirror:
+bootstrap:
   url: https://mirror.spack.io
-  private_key: '../test-gpg-priv.asc'
-  public_key: "\
-    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\
-    gllMF++N8+7T4/ehkA/hs2udYRkSCANLQ3I3"
-
-  cache: true
-bootstrap-mirror:
+  enabled: true
+buildcache:
   url: https://mirror.spack.io
-  bootstrap: true
+  enabled: true
+  private_key: ../../test-gpg-priv.asc
+  mount_specific: false
+  cmdline: false
+sourcecache:
+  mirror1:
+    url: https://github.com
+    enabled: true
+  mirror2:
+    url: https://github.com/spack
+    enabled: true
+  disabled-mirror:
+    url: https://github.com
+    enabled: false
diff --git a/unittests/test_mirrors.py b/unittests/test_mirrors.py

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`},`
`33`	`33`	`"cmdline": {`
`34`	`34`	`"type": "boolean",`
`35`		`- "default": true`
	`35`	`+ "default": false`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`"additionalProperties": false,`