WIP - breakage

Author: alexrichey

dcpy/connectors/edm/builds.py

@@ -65,11 +65,6 @@ def storage(self) -> PathedStorageConnector:
             )
         return self._storage
 
-    @storage.setter
-    def storage(self, value: PathedStorageConnector) -> None:
-        """Allow setting storage directly (useful for testing)."""
-        self._storage = value
-
     @staticmethod
     def create() -> "BuildsConnector":
         """Create a BuildsConnector with lazy-loaded S3 storage."""
@@ -85,37 +80,14 @@ def _generate_metadata(self) -> dict[str, str]:
             metadata["run-url"] = git.action_url()
         return metadata
 
-    def _upload(
-        self,
-        output_path: Path,
-        build_key: BuildKey,
-        *,
-        acl: s3.ACL | None,
-        max_files: int = s3.MAX_FILE_COUNT,
-    ) -> None:
-        """Upload build output(s) to build folder in edm-publishing"""
-        meta = self._generate_metadata()
-        if not output_path.is_dir():
-            raise Exception(
-                "'_upload' expects output_path to be a directory, not a file"
-            )
-
-        # Use PathedStorageConnector's push method to upload the folder
-        self.storage.push(
-            key=build_key.path,
-            filepath=str(output_path),
-            acl=str(acl),
-            metadata=meta,
-        )
-
     def _upload_build(
         self,
-        output_path: Path,
+        build_dir: Path,
         product: str,
         *,
         acl: s3.ACL | None = None,
-        build: str | None = None,
-        max_files: int = s3.MAX_FILE_COUNT,
+        build_name: str | None = None,
+        # max_files: int = s3.MAX_FILE_COUNT, # TODO
     ) -> BuildKey:
         """
         Uploads a product build to an S3 bucket using cloudpathlib.
@@ -129,35 +101,40 @@ def _upload_build(
             FileNotFoundError: If the provided output_path does not exist.
             ValueError: If the build name is not provided and cannot be found in the environment variables.
         """
-        if not output_path.exists():
-            raise FileNotFoundError(f"Path {output_path} does not exist")
-        build_name = build or BUILD_NAME
+        if not build_dir.exists():
+            raise FileNotFoundError(f"Path {build_dir} does not exist")
+        build_name = build_name or BUILD_NAME
         if not build_name:
             raise ValueError(
                 f"Build name supplied via CLI or the env var 'BUILD_NAME' cannot be '{build_name}'."
             )
         build_key = BuildKey(product, build_name)
-        logger.info(f'Uploading {output_path} to {build_key.path} with ACL "{acl}"')
-        self._upload(output_path, build_key, acl=acl, max_files=max_files)
+
+        logger.info(f'Uploading {build_dir} to {build_key.path} with ACL "{acl}"')
+        self.storage.push(
+            key=build_key.path,
+            filepath=str(build_dir),
+            acl=str(acl),
+            metadata=self._generate_metadata(),
+        )
 
         return build_key
 
-    def push(self, key: str, **kwargs) -> dict:
+    def push_versioned(self, key: str, version: str, **kwargs) -> dict:
+        # For builds, the "version" is the build name/ID
         connector_args = kwargs["connector_args"]
-
-        logger.info(
-            f"Pushing build for product: {key}, with note: {connector_args['build_note']}"
-        )
         acl = (
             s3.string_as_acl(connector_args["acl"])
             if connector_args.get("acl")
             else None
         )
+
+        logger.info(f"Pushing build for product: {key}, build: {version}")
         result = self._upload_build(
-            output_path=kwargs["build_path"],
+            build_dir=kwargs["build_path"],
             product=key,
             acl=acl,
-            build=connector_args["build_note"],
+            build_name=version,
         )
         return asdict(result)
 
@@ -200,29 +177,6 @@ def pull_versioned(
     ) -> dict:
         return self._pull(key, version, destination_path, **kwargs)
 
-    def push_versioned(self, key: str, version: str, **kwargs) -> dict:
-        # For builds, the "version" is the build name/ID
-        connector_args = kwargs["connector_args"]
-
-        logger.info(f"Pushing build for product: {key}, build: {version}")
-        result = self._upload_build(
-            output_path=kwargs["build_path"],
-            product=key,
-            acl=s3.string_as_acl(connector_args["acl"]),
-            build=version,
-        )
-        return asdict(result)
-
-    def pull(
-        self,
-        key: str,
-        destination_path: Path,
-        **kwargs,
-    ) -> dict:
-        raise Exception(
-            "Use pull_versioned() instead - BuildsConnector requires a specific build version"
-        )
-
     def list_versions(self, key: str, *, sort_desc: bool = True, **kwargs) -> list[str]:
         """List all build versions (build names) for a product."""
         build_folder_key = f"{key}/build"

dcpy/connectors/edm/drafts.py

@@ -53,11 +53,6 @@ def storage(self) -> PathedStorageConnector:
             )
         return self._storage
 
-    @storage.setter
-    def storage(self, value: PathedStorageConnector) -> None:
-        """Allow setting storage directly (useful for testing)."""
-        self._storage = value
-
     @staticmethod
     def create() -> "DraftsConnector":
         """Create a DraftsConnector with lazy-loaded S3 storage."""

dcpy/connectors/edm/gis.py

@@ -39,11 +39,6 @@ def storage(self) -> PathedStorageConnector:
             )
         return self._storage
 
-    @storage.setter
-    def storage(self, value: PathedStorageConnector) -> None:
-        """Allow setting storage directly (useful for testing)."""
-        self._storage = value
-
     @staticmethod
     def create() -> "GisDatasetsConnector":
         """Create a GisDatasetsConnector with lazy-loaded S3 storage."""

dcpy/connectors/edm/published.py

@@ -51,11 +51,6 @@ def storage(self) -> PathedStorageConnector:
             )
         return self._storage
 
-    @storage.setter
-    def storage(self, value: PathedStorageConnector) -> None:
-        """Allow setting storage directly (useful for testing)."""
-        self._storage = value
-
     @staticmethod
     def create() -> "PublishedConnector":
         """Create a PublishedConnector with lazy-loaded S3 storage."""

dcpy/lifecycle/builds/artifacts/builds.py

@@ -128,8 +128,9 @@ def upload(
     meta = _generate_metadata(running_in_gha=CI)  # for now, same thing.
 
     logger.info(f"Uploading {output_path} to {build_key.path}")
-    result = get_builds_default_connector().push(
+    result = get_builds_default_connector().push_versioned(
         key=product,
+        version=build_name,
         build_path=output_path,
         connector_args={"build_note": build_name, "acl": acl, "metadata": meta},
     )

dcpy/test_integration/connectors/edm/test_builds_conn.py

@@ -143,10 +143,6 @@ def _test_builds_connector_error_cases(conn: BuildsConnector, tmp_path):
     ):
         conn.get_latest_version(existing_product)
 
-    # Test pull should raise Exception
-    with pytest.raises(Exception, match="Use pull_versioned"):
-        conn.pull(existing_product, tmp_path / "dummy")
-
     # Test pulling non-existent file
     destination_dir = tmp_path / "downloads" / "test_error"
     destination_dir.mkdir(parents=True, exist_ok=True)