Fix running on S3 / Azure

Author: dralley

pulp_rust/app/models.py

@@ -138,7 +138,8 @@ def init_from_artifact_and_relative_path(artifact, relative_path):
         Cargo.toml inside the .crate tarball.
         """
         crate_name, version = _parse_crate_relative_path(relative_path)
-        cargo_toml = extract_cargo_toml(artifact.file.path, crate_name, version)
+        with artifact.file.open("rb") as f:
+            cargo_toml = extract_cargo_toml(f, crate_name, version)
 
         content = RustContent(
             name=crate_name,

pulp_rust/app/tasks/publishing.py

@@ -79,7 +79,8 @@ async def apublish_package(repository_pk, metadata, crate_path):
     # Cargo.toml within the tarball, then extract everything from the Cargo.toml itself.
     # See: https://github.com/rust-lang/cargo/issues/14492
     #      https://github.com/rust-lang/crates.io/pull/7238
-    cargo_toml = extract_cargo_toml(artifact.file.path, metadata["name"], metadata["vers"])
+    with artifact.file.open("rb") as f:
+        cargo_toml = extract_cargo_toml(f, metadata["name"], metadata["vers"])
     package = cargo_toml.get("package", {})
 
     name = package["name"]

pulp_rust/app/utils.py

@@ -7,13 +7,19 @@
     import tomli as tomllib
 
 
-def extract_cargo_toml(crate_path, crate_name, version):
-    """Extract and parse Cargo.toml from a .crate tarball."""
+def extract_cargo_toml(fileobj, crate_name, version):
+    """Extract and parse Cargo.toml from a .crate tarball.
+
+    Args:
+        fileobj: A file-like object containing the .crate tarball data.
+        crate_name: The crate name (used to locate Cargo.toml inside the tarball).
+        version: The crate version (used to locate Cargo.toml inside the tarball).
+    """
     expected_path = f"{crate_name}-{version}/Cargo.toml"
-    with tarfile.open(crate_path, "r:gz") as tar:
+    with tarfile.open(fileobj=fileobj, mode="r:gz") as tar:
         cargo_toml_file = tar.extractfile(expected_path)
         if cargo_toml_file is None:
-            raise FileNotFoundError(f"No Cargo.toml found in {crate_path} at {expected_path}")
+            raise FileNotFoundError(f"No Cargo.toml found at {expected_path}")
         return tomllib.load(cargo_toml_file)
 
 

pulp_rust/tests/functional/api/test_upload.py

@@ -29,7 +29,8 @@ def test_upload_and_index_fidelity(
     crate_path, cksum = download_crate_from_upstream(crate_name, crate_version)
 
     # 2. Parse metadata from the .crate file
-    cargo_toml = extract_cargo_toml(crate_path, crate_name, crate_version)
+    with open(crate_path, "rb") as f:
+        cargo_toml = extract_cargo_toml(f, crate_name, crate_version)
     deps = extract_dependencies(cargo_toml)
     features = cargo_toml.get("features", {})
     links = cargo_toml.get("package", {}).get("links")

pulp_rust/tests/functional/utils.py

@@ -129,7 +129,8 @@ def build_publish_metadata(crate_path, crate_name, crate_version):
     Cargo uses "version_req" (not "req") and "explicit_name_in_toml" (not "package")
     per the Cargo registry web API spec.
     """
-    cargo_toml = extract_cargo_toml(crate_path, crate_name, crate_version)
+    with open(crate_path, "rb") as f:
+        cargo_toml = extract_cargo_toml(f, crate_name, crate_version)
     deps = extract_dependencies(cargo_toml)
 
     return {

pulp_rust/tests/unit/test_utils.py

@@ -207,7 +207,8 @@ class TestExtractCargoToml:
     def test_basic_extraction(self):
         toml_content = b'[package]\nname = "foo"\nversion = "1.0.0"\n'
         path = _make_crate_tarball("foo", "1.0.0", toml_content)
-        result = extract_cargo_toml(path, "foo", "1.0.0")
+        with open(path, "rb") as f:
+            result = extract_cargo_toml(f, "foo", "1.0.0")
         assert result["package"]["name"] == "foo"
         assert result["package"]["version"] == "1.0.0"
 
@@ -216,7 +217,8 @@ def test_with_dependencies(self):
             b'[package]\nname = "bar"\nversion = "0.1.0"\n' b'\n[dependencies]\nserde = "1.0"\n'
         )
         path = _make_crate_tarball("bar", "0.1.0", toml_content)
-        result = extract_cargo_toml(path, "bar", "0.1.0")
+        with open(path, "rb") as f:
+            result = extract_cargo_toml(f, "bar", "0.1.0")
         assert "serde" in result["dependencies"]
 
     def test_with_features(self):
@@ -225,7 +227,8 @@ def test_with_features(self):
             b'\n[features]\ndefault = ["std"]\nstd = []\n'
         )
         path = _make_crate_tarball("baz", "2.0.0", toml_content)
-        result = extract_cargo_toml(path, "baz", "2.0.0")
+        with open(path, "rb") as f:
+            result = extract_cargo_toml(f, "baz", "2.0.0")
         assert result["features"] == {"default": ["std"], "std": []}
 
     def test_missing_cargo_toml_raises(self):
@@ -241,18 +244,21 @@ def test_missing_cargo_toml_raises(self):
         tmp.flush()
 
         with pytest.raises(KeyError):
-            extract_cargo_toml(tmp.name, "foo", "1.0.0")
+            with open(tmp.name, "rb") as f:
+                extract_cargo_toml(f, "foo", "1.0.0")
 
     def test_with_rust_version(self):
         toml_content = b'[package]\nname = "qux"\nversion = "1.0.0"\nrust-version = "1.56.0"\n'
         path = _make_crate_tarball("qux", "1.0.0", toml_content)
-        result = extract_cargo_toml(path, "qux", "1.0.0")
+        with open(path, "rb") as f:
+            result = extract_cargo_toml(f, "qux", "1.0.0")
         assert result["package"]["rust-version"] == "1.56.0"
 
     def test_with_links(self):
         toml_content = b'[package]\nname = "zlib-sys"\nversion = "0.1.0"\nlinks = "z"\n'
         path = _make_crate_tarball("zlib-sys", "0.1.0", toml_content)
-        result = extract_cargo_toml(path, "zlib-sys", "0.1.0")
+        with open(path, "rb") as f:
+            result = extract_cargo_toml(f, "zlib-sys", "0.1.0")
         assert result["package"]["links"] == "z"