Send tar instead of gzipped tar file (required for RHDH plugins) (#540)

* mount private unshared label

* Send only tar file instead of gzipped tar file

Author: audgirka

src/ansible_dev_tools/resources/server/creator_v1.py

@@ -25,7 +25,7 @@ def create_tar_file(init_path: Path, tar_file: Path) -> None:
         init_path: The directory path to create the tar file from.
         tar_file: The output tar file path.
     """
-    with tarfile.open(tar_file, "w:gz") as tar:
+    with tarfile.open(tar_file, "w") as tar:
         tar.add(str(init_path), arcname=".")
 
 
@@ -44,7 +44,7 @@ def _response_from_tar(self, tar_file: Path) -> FileResponse:
         fs = FileSystemStorage(str(tar_file.parent))
         response = FileResponse(
             fs.open(tar_file.name, "rb"),
-            content_type="application/tar+gzip",
+            content_type="application/tar",
             status=201,
         )
         response["Content-Disposition"] = f'attachment; filename="{tar_file.name}"'
@@ -156,7 +156,7 @@ def collection(self, collection: str, project: str) -> Path:
             project=project,
         )
         Init(config).run()
-        tar_file = self.tmp_dir / f"{collection}.tar.gz"
+        tar_file = self.tmp_dir / f"{collection}.tar"
         create_tar_file(init_path, tar_file)
         return tar_file
 
@@ -187,6 +187,6 @@ def playbook(
             subcommand="init",
         )
         Init(config).run()
-        tar_file = self.tmp_dir / f"{scm_org}-{scm_project}.tar.gz"
+        tar_file = self.tmp_dir / f"{scm_org}-{scm_project}.tar"
         create_tar_file(init_path, tar_file)
         return tar_file

src/ansible_dev_tools/resources/server/creator_v2.py

@@ -25,7 +25,7 @@ def create_tar_file(init_path: Path, tar_file: Path) -> None:
         init_path: The directory path to create the tar file from.
         tar_file: The output tar file path.
     """
-    with tarfile.open(tar_file, "w:gz") as tar:
+    with tarfile.open(tar_file, "w") as tar:
         tar.add(str(init_path), arcname=".")
 
 
@@ -44,7 +44,7 @@ def _response_from_tar(self, tar_file: Path) -> FileResponse:
         fs = FileSystemStorage(str(tar_file.parent))
         response = FileResponse(
             fs.open(tar_file.name, "rb"),
-            content_type="application/tar+gzip",
+            content_type="application/tar",
             status=201,
         )
         response["Content-Disposition"] = f'attachment; filename="{tar_file.name}"'
@@ -156,7 +156,7 @@ def collection(self, collection: str, project: str) -> Path:
             project=project,
         )
         Init(config).run()
-        tar_file = self.tmp_dir / f"{collection}.tar.gz"
+        tar_file = self.tmp_dir / f"{collection}.tar"
         create_tar_file(init_path, tar_file)
         return tar_file
 
@@ -187,6 +187,6 @@ def playbook(
             subcommand="init",
         )
         Init(config).run()
-        tar_file = self.tmp_dir / f"{namespace}-{collection_name}.tar.gz"
+        tar_file = self.tmp_dir / f"{namespace}-{collection_name}.tar"
         create_tar_file(init_path, tar_file)
         return tar_file

src/ansible_dev_tools/resources/server/data/openapi.yaml

@@ -27,7 +27,7 @@ paths:
         "201":
           description: Created
           content:
-            application/tar+gzip:
+            application/tar:
               schema:
                 AnyValue: {}
         "400":
@@ -49,7 +49,7 @@ paths:
         "201":
           description: Created
           content:
-            application/tar+gzip:
+            application/tar:
               schema:
                 AnyValue: {}
         "400":
@@ -71,7 +71,7 @@ paths:
         "201":
           description: Created
           content:
-            application/tar+gzip:
+            application/tar:
               schema:
                 AnyValue: {}
         "400":
@@ -93,7 +93,7 @@ paths:
         "201":
           description: Created
           content:
-            application/tar+gzip:
+            application/tar:
               schema:
                 AnyValue: {}
         "400":

tests/integration/test_server_creator_v1.py

@@ -44,9 +44,9 @@ def test_playbook_v1(server_url: str, tmp_path: Path) -> None:
         timeout=10,
     )
     assert response.status_code == requests.codes.get("created")
-    assert response.headers["Content-Disposition"] == 'attachment; filename="ansible-devops.tar.gz"'
-    assert response.headers["Content-Type"] == "application/tar+gzip"
-    dest_file = tmp_path / "ansible-devops.tar.gz"
+    assert response.headers["Content-Disposition"] == 'attachment; filename="ansible-devops.tar"'
+    assert response.headers["Content-Type"] == "application/tar"
+    dest_file = tmp_path / "ansible-devops.tar"
     with dest_file.open(mode="wb") as tar_file:
         tar_file.write(response.content)
     with tarfile.open(dest_file) as file:
@@ -72,9 +72,9 @@ def test_collection_v1(server_url: str, tmp_path: Path) -> None:
         timeout=10,
     )
     assert response.status_code == requests.codes.get("created")
-    assert response.headers["Content-Disposition"] == 'attachment; filename="namespace.name.tar.gz"'
-    assert response.headers["Content-Type"] == "application/tar+gzip"
-    dest_file = tmp_path / "namespace.name.tar.gz"
+    assert response.headers["Content-Disposition"] == 'attachment; filename="namespace.name.tar"'
+    assert response.headers["Content-Type"] == "application/tar"
+    dest_file = tmp_path / "namespace.name.tar"
     with dest_file.open(mode="wb") as tar_file:
         tar_file.write(response.content)
     with tarfile.open(dest_file) as file:

tests/integration/test_server_creator_v2.py

@@ -44,9 +44,9 @@ def test_playbook_v2(server_url: str, tmp_path: Path) -> None:
         timeout=10,
     )
     assert response.status_code == requests.codes.get("created")
-    assert response.headers["Content-Disposition"] == 'attachment; filename="ansible-devops.tar.gz"'
-    assert response.headers["Content-Type"] == "application/tar+gzip"
-    dest_file = tmp_path / "ansible-devops.tar.gz"
+    assert response.headers["Content-Disposition"] == 'attachment; filename="ansible-devops.tar"'
+    assert response.headers["Content-Type"] == "application/tar"
+    dest_file = tmp_path / "ansible-devops.tar"
     with dest_file.open(mode="wb") as tar_file:
         tar_file.write(response.content)
     with tarfile.open(dest_file) as file:
@@ -72,9 +72,9 @@ def test_collection_v2(server_url: str, tmp_path: Path) -> None:
         timeout=10,
     )
     assert response.status_code == requests.codes.get("created")
-    assert response.headers["Content-Disposition"] == 'attachment; filename="namespace.name.tar.gz"'
-    assert response.headers["Content-Type"] == "application/tar+gzip"
-    dest_file = tmp_path / "namespace.name.tar.gz"
+    assert response.headers["Content-Disposition"] == 'attachment; filename="namespace.name.tar"'
+    assert response.headers["Content-Type"] == "application/tar"
+    dest_file = tmp_path / "namespace.name.tar"
     with dest_file.open(mode="wb") as tar_file:
         tar_file.write(response.content)
     with tarfile.open(dest_file) as file:

tests/unit/test_server_utils.py

@@ -66,7 +66,7 @@ def test_validate_response_pass(collection_request: HttpRequest) -> None:
         collection_request: A Django request object
     """
     response = HttpResponse()
-    response["Content-Type"] = "application/tar+gzip"
+    response["Content-Type"] = "application/tar"
     response.status_code = HTTPStatus.CREATED.value
     response.content = b"Hello, World!"
     result = validate_response(collection_request, response)
@@ -82,7 +82,7 @@ def test_validate_response_fail(collection_request: HttpRequest) -> None:
         collection_request: A Django request object
     """
     response = HttpResponse()
-    response["Content-Type"] = "application/tar+gzip"
+    response["Content-Type"] = "application/tar"
     response.status_code = HTTPStatus.CREATED.value
     result = validate_response(collection_request, response)
     assert result.status_code == HTTPStatus.BAD_REQUEST.value