src/main/python/ddadevops/application/release_mixin_services.py

@@ -1,4 +1,3 @@
-import json
 from typing import List
 from pathlib import Path
 from ..infrastructure import GitApi, ArtifactDeploymentApi, BuildFileRepository
@@ -62,44 +61,16 @@ class ReleaseService:
         self.git_api.push_follow_tags()
 
     def publish_artifacts(self, release: Release):
-        release_id = self.__parse_forgejo_release_id__(
-            self.artifact_deployment_api.create_forgejo_release(
-                release.forgejo_release_api_endpoint(),
-                release.version.to_string(),
-                release.release_artifact_token,
-            )
-        )
-
-        artifacts_to_attach = []
         for artifact_path in release.release_artifacts:
             self.artifact_deployment_api.calculate_checksums(artifact_path)
-            # TODO: make api more explizit to have the path calculation & decision which shas to take clear
+        self.artifact_deployment_api.create_forgejo_release(
-            artifacts_to_attach += [{
+            release.forgejo_release_api_endpoint(),
-                "path": artifact_path,
+            release.version.to_string(),
-                # TODO: it will not always be a jar file -> move type to release input-side.
+            release.release_artifact_token
-                "type": "application/x-java-archive",
+        )
-            },
+        # create release
-            {
+        # add artifacts to release
-                "path": f"{artifact_path}.sha256",
+        pass
-                "type": "text/plain",
-            },
-            {
-                "path": f"{artifact_path}.sha512",
-                "type": "text/plain",
-            }]
-
-        # TODO: use structure created above
-        for artifact in artifacts_to_attach:
-            self.artifact_deployment_api.add_asset_to_release(
-                release.forgejo_release_asset_api_endpoint(release_id),
-                "todo",
-                "todo",
-                release.release_artifact_token,
-            )
-
-    def __parse_forgejo_release_id__(self, release_response: str) -> int:
-        parsed = json.loads(release_response)
-        return parsed["id"]
 
     def __set_version_and_commit__(
         self, version: Version, build_file_ids: List[str], message: str

src/main/python/ddadevops/domain/release.py

@@ -77,7 +77,7 @@ class Release(Validateable):
         result += self.release_secondary_build_files
         return result
 
-    def forgejo_release_api_endpoint(self) -> str:
+    def forgejo_release_api_endpoint(self):
         validation = self.validate_for_artifact()
         if validation != []:
             raise RuntimeError(f"not valid for creating artifacts: {validation}")
@@ -89,9 +89,6 @@ class Release(Validateable):
         repository = self.release_repository_name.removeprefix("/").removesuffix("/")
         return f"{server_url}/api/v1/repos/{organisation}/{repository}/releases"
 
-    def forgejo_release_asset_api_endpoint(self, id: int) -> str:
-        return f"{self.forgejo_release_api_endpoint()}/{id}/assets"
-
     @classmethod
     def get_mapping_default(cls) -> List[Dict[str, str]]:
         return [

src/main/python/ddadevops/infrastructure/infrastructure.py

@@ -218,30 +218,31 @@ class ArtifactDeploymentApi:
     def __init__(self):
         self.execution_api = ExecutionApi()
 
-    def create_forgejo_release(self, api_endpoint_url: str, tag: str, token: str):
+    def create_forgejo_release(self, target_url: str, tag: str, token: str):
         return self.execution_api.execute_secure(
-            f'curl -X "POST" "{api_endpoint_url}" '
+            f'curl -X "POST" "{target_url}" '
             + '-H "accept: application/json" -H "Content-Type: application/json" '
             + f'-d "{{ "body": "Provides files for release {tag} Attention: The "Source Code"-files below are not up-to-date!", "tag_name": "{tag}"}}" '  # noqa: E501
             + f'-H "Authorization: token {token}"',
-            sanitized_command=f'curl -X "POST" "{api_endpoint_url}" '
+            sanitized_command=f'curl -X "POST" "{target_url}" '
             + '-H "accept: application/json" -H "Content-Type: application/json" '
             + f'-d "{{ "body": "Provides files for release {tag} Attention: The "Source Code"-files below are not up-to-date!", "tag_name": "{tag}"}}" ',
         )  # noqa: E501
 
-    def add_asset_to_release(
+    def post_asset(
         self,
-        api_endpoint_url: str,
+        target_url: str,
+        release_id: str,
         attachment: str,
         attachment_type: str,
         token: str,
     ):
         return self.execution_api.execute_secure(
-            f'curl -X "POST" "{api_endpoint_url}" '
+            f'curl -X "POST" "{target_url}/{release_id}/assets" '  # {target_url}/{release_id}/assets move to Domain
             + f'-H "accept: application/json" -H "Authorization: token {token}" '
             + '-H "Content-Type: multipart/form-data" '
             + f'-F "attachment=@{attachment};type={attachment_type}"',
-            sanitized_command=f'curl -X "POST" "{api_endpoint_url}" '
+            sanitized_command=f'curl -X "POST" "{target_url}/{release_id}/assets" '  # see above
             + '-H "accept: application/json" '
             + '-H "Content-Type: multipart/form-data" '
             + f'-F "attachment=@{attachment};type={attachment_type}"',

src/test/python/application/test_release_mixin_services.py

@@ -1,7 +1,7 @@
 import pytest
 from pathlib import Path
 from src.main.python.ddadevops.domain import (
-    ReleaseType,
+    ReleaseType, 
     MixinType,
 )
 from src.test.python.domain.helper import (
@@ -12,11 +12,8 @@ from src.test.python.domain.helper import (
 )
 from src.main.python.ddadevops.application import ReleaseService
 
-
 def test_sould_update_release_type():
-    sut = ReleaseService(
+    sut = ReleaseService(GitApiMock(), ArtifactDeploymentApiMock(), BuildFileRepositoryMock("build.py"))
-        GitApiMock(), ArtifactDeploymentApiMock(), BuildFileRepositoryMock("build.py")
-    )
     devops = build_devops({})
     release = devops.mixins[MixinType.RELEASE]
     sut.update_release_type(release, "MAJOR")
@@ -24,40 +21,3 @@ def test_sould_update_release_type():
 
     with pytest.raises(Exception):
         sut.update_release_type(release, "NOT_EXISTING")
-
-
-def test_sould_publish_artifacts():
-    mock = ArtifactDeploymentApiMock(release='{"id": 2345}')
-    sut = ReleaseService(GitApiMock(), mock, BuildFileRepositoryMock())
-    devops = build_devops(
-        {
-            "release_artifacts": ["target/art"],
-            "release_artifact_server_url": "http://repo.test/",
-            "release_organisation": "orga",
-            "release_repository_name": "repo",
-        }
-    )
-    release = devops.mixins[MixinType.RELEASE]
-    sut.publish_artifacts(release)
-    assert 2345 == mock.add_asset_to_release_id
-
-def test_sould_throw_exception_if_there_was_an_error_in_publish_artifacts():
-    devops = build_devops(
-        {
-            "release_artifacts": ["target/art"],
-            "release_artifact_server_url": "http://repo.test/",
-            "release_organisation": "orga",
-            "release_repository_name": "repo",
-        }
-    )
-    release = devops.mixins[MixinType.RELEASE]
-    
-    with pytest.raises(Exception):
-        mock = ArtifactDeploymentApiMock(release='')
-        sut = ReleaseService(GitApiMock(), mock, BuildFileRepositoryMock())
-        sut.publish_artifacts(release)
-
-    with pytest.raises(Exception):
-        mock = ArtifactDeploymentApiMock(release='{"message": "there was an error", "url":"some-url"}')
-        sut = ReleaseService(GitApiMock(), mock, BuildFileRepositoryMock())
-        sut.publish_artifacts(release)

src/test/python/domain/helper.py

@@ -158,19 +158,13 @@ class GitApiMock:
 
 
 class ArtifactDeploymentApiMock:
-    def __init__(self, release=""):
+    def __init__(self):
-        self.release = release
+        pass
-        self.create_forgejo_release_count = 0
-        self.add_asset_to_release_count = 0
-        self.add_asset_to_release_id = ""
 
-    def create_forgejo_release(self, target_url: str, tag: str, token: str):
+    def post_release(self, target_url: str, tag: str, token: str):
-        self.create_forgejo_release_count += 1
+        pass
-        return self.release
 
-    def add_asset_to_release(self, target_url: str, release_id: str, attachment: str, attachment_type: str, token: str):
+    def post_asset(self, target_url: str, release_id: str, attachment: str, attachment_type: str, token: str):
-        self.add_asset_to_release_count += 1
-        self.add_asset_to_release_id = release_id
         pass
 
     def calculate_checksums(self, build_path: str):

src/test/python/domain/test_release.py

@@ -115,21 +115,3 @@ def test_should_calculate_forgejo_release_api_endpoint():
             Version.from_str("1.3.1-SNAPSHOT", "SNAPSHOT"),
         )
         sut.forgejo_release_api_endpoint()
-
-def test_should_calculate_forgejo_release_asset_api_endpoint():
-    sut = Release(
-        devops_config(
-            {
-                "release_artifacts": ["x"],
-                "release_artifact_token": "y", 
-                "release_artifact_server_url": "https://repo.prod.meissa.de",
-                "release_organisation": "meissa",
-                "release_repository_name": "provs",
-            }
-        ),
-        Version.from_str("1.3.1-SNAPSHOT", "SNAPSHOT"),
-    )
-    assert (
-        "https://repo.prod.meissa.de/api/v1/repos/meissa/provs/releases/123/assets"
-        == sut.forgejo_release_asset_api_endpoint(123)
-    )

src/test/python/test_release_mixin.py

@@ -14,8 +14,6 @@ def test_release_mixin(tmp_path):
     copy_resource(Path("package.json"), tmp_path)
     project = Project(str_tmp_path, name="name")
 
-    os.environ["RELEASE_ARTIFACT_TOKEN"] = "ratoken"
-
     sut = ReleaseMixin(
         project,
         devops_config(