fixing some things

Author: grodzki-lanl

stackinator/mirror.py

@@ -280,13 +280,7 @@ def push_to_build_cache(self) -> Optional[str]:
         a build cache configured without one is read-only - fetched from but never pushed to.
         """
 
-        if (
-            self.buildcache is not None
-            and (
-                self.buildcache.get("private_key") is not None
-                or self.buildcache.get("access_pair") is not None
-            )
-        ):
+        if self.buildcache is not None and self.buildcache["private_key"] is not None:
             return self.buildcache["name"]
         return None
 
@@ -412,14 +406,14 @@ def config_files(self, config_root: pathlib.Path) -> Dict[pathlib.Path, bytes]:
             if self.buildcache["access_pair"] and self.buildcache["endpoint_url"]:
                 spack_mirrors["mirrors"][self.buildcache["name"]] = {
                     "fetch": {
-                        "url": mirror["url"],
-                        "access_pair": mirror["access_pair"],
-                        "endpoint_url": mirror["url"]
+                        "url": url,
+                        "access_pair": self.buildcache["access_pair"],
+                        "endpoint_url": self.buildcache["endpoint_url"]
                     },
                     "push": {
-                        "url": mirror["url"],
-                        "access_pair": mirror["access_pair"],
-                        "endpoint_url": mirror["url"]
+                        "url": url,
+                        "access_pair": self.buildcache["access_pair"],
+                        "endpoint_url": self.buildcache["endpoint_url"]
                     },
                 }
             else:
@@ -431,19 +425,22 @@ def config_files(self, config_root: pathlib.Path) -> Dict[pathlib.Path, bytes]:
 
         # source mirrors are read-only and provide sources only. Push url is required but never used
         for name, mirror in self.source_mirrors.items():
-            if mirror["access_pair"] and mirror["endpoint_url"]:
+            if (
+                mirror.get("access_pair") is not None
+                and mirror.get("endpoint_url") is not None
+            ):
                 spack_mirrors["mirrors"][name] = {
                     "source": True,
                     "binary": False,
                     "fetch": {
                         "url": mirror["url"],
                         "access_pair": mirror["access_pair"],
-                        "endpoint_url": mirror["url"]
+                        "endpoint_url": mirror["endpoint_url"]
                     },
                     "push": {
                         "url": mirror["url"],
                         "access_pair": mirror["access_pair"],
-                        "endpoint_url": mirror["url"]
+                        "endpoint_url": mirror["endpoint_url"]
                     },
                 }
             else: