Minot fixes

Signed-off-by: Alina Buzachis <[email protected]>

Author: alinabuzachis

core/tests/test_controller_helpers.py

@@ -65,7 +65,7 @@ def mock_download_failure():
     "collection_name, version, expected_uri",
     [
         (
-            "another-collection",
+            "another.collection",
             "2.0.0",
             (
                 "http://localhost:44926/api/galaxy/v3/plugin/ansible/content/published/"
@@ -77,7 +77,7 @@ def mock_download_failure():
             "0.1.0-beta",
             (
                 "http://localhost:44926/api/galaxy/v3/plugin/ansible/content/published/"
-                "collections/artifacts/edge.case-0.1.0-beta.tar.gz"
+                "collections/artifacts/edge-case-0.1.0-beta.tar.gz"
             ),
         ),
     ],
@@ -99,7 +99,7 @@ def test_download_collection_success(mock_download_success):
 
     collection_name = "my_namespace.my_collection"
     version = "1.0.0"
-    expected_path = os.path.join("/mock/temp/dir", "my_namespace-my_collection-1.0.0")
+    expected_path = os.path.join("/mock/temp/dir", "my_namespace.my_collection-1.0.0")
 
     with download_collection(collection_name, version) as path:
         # Assert that the correct path was yielded

core/utils/controller/helpers.py

@@ -14,22 +14,21 @@
 logger = logging.getLogger(__name__)
 
 
-def build_collection_uri(collection: str, version: str) -> str:
+def build_collection_uri(collection_name: str, version: str) -> str:
     """
     Builds the full URI for a given collection and version.
 
     Args:
-        collection (str): The collection name.
+        collection_name (str): The collection name.
         version (str): The version string.
 
     Returns:
         str: The full URI to the collection artifact.
     """
+    collection = collection_name.replace(".", "-")
     path = "/api/galaxy/v3/plugin/ansible/content/published/collections/artifacts"
     filename = f"{collection}-{version}.tar.gz"
 
-    print("Filename", filename)
-
     return urljoin(f"{settings.AAP_URL}/", f"{path}/{filename}")
 
 
@@ -47,11 +46,10 @@ def download_collection(collection_name: str, version: str) -> Iterator[str]:
         The path to the extracted collection files.
     """
     response = None
-    collection = collection_name.replace(".", "-")
     temp_base_dir = tempfile.mkdtemp()
-    collection_path = os.path.join(temp_base_dir, f"{collection}-{version}")
+    collection_path = os.path.join(temp_base_dir, f"{collection_name}-{version}")
     os.makedirs(collection_path, exist_ok=True)
-    path = build_collection_uri(collection, version)
+    path = build_collection_uri(collection_name, version)
 
     try:
         response = get(path)
@@ -62,4 +60,6 @@ def download_collection(collection_name: str, version: str) -> Iterator[str]:
         logger.info(f"Collection extracted to {collection_path}")
         yield collection_path  # Yield the path to the caller
     finally:
+        if response:
+            response.close()  # Explicitly close the response object
         shutil.rmtree(temp_base_dir)