Compare commits
No commits in common. "62e3f58f8112e24fd94e6b9aedf796968ce6b9c4" and "2e5e1ea0ee3b7980f81133ae6477bf15aaad5859" have entirely different histories.
62e3f58f81
...
2e5e1ea0ee
20 changed files with 89 additions and 454 deletions
|
@ -4,9 +4,8 @@ stages:
|
||||||
- image
|
- image
|
||||||
|
|
||||||
.py: &py
|
.py: &py
|
||||||
image: "domaindrivenarchitecture/ddadevops-python:4.3.2-dev2023-08-16-16-16-48"
|
image: "domaindrivenarchitecture/ddadevops-python:4.1.0"
|
||||||
before_script:
|
before_script:
|
||||||
- export RELEASE_ARTIFACT_TOKEN=$RELEASE_ARTIFACT_TOKEN
|
|
||||||
- python --version
|
- python --version
|
||||||
- pip install -r requirements.txt
|
- pip install -r requirements.txt
|
||||||
|
|
||||||
|
@ -44,7 +43,7 @@ pypi-stable:
|
||||||
<<: *tag_only
|
<<: *tag_only
|
||||||
stage: upload
|
stage: upload
|
||||||
script:
|
script:
|
||||||
- pyb -P version=$CI_COMMIT_TAG publish upload publish_artifacts
|
- pyb -P version=$CI_COMMIT_TAG publish upload
|
||||||
|
|
||||||
clj-cljs-image-publish:
|
clj-cljs-image-publish:
|
||||||
<<: *img
|
<<: *img
|
||||||
|
@ -60,6 +59,7 @@ clj-image-publish:
|
||||||
script:
|
script:
|
||||||
- cd infrastructure/clj && pyb image publish
|
- cd infrastructure/clj && pyb image publish
|
||||||
|
|
||||||
|
|
||||||
python-image-publish:
|
python-image-publish:
|
||||||
<<: *img
|
<<: *img
|
||||||
<<: *tag_only
|
<<: *tag_only
|
||||||
|
|
12
build.py
12
build.py
|
@ -33,7 +33,7 @@ default_task = "dev"
|
||||||
name = "ddadevops"
|
name = "ddadevops"
|
||||||
MODULE = "not-used"
|
MODULE = "not-used"
|
||||||
PROJECT_ROOT_PATH = "."
|
PROJECT_ROOT_PATH = "."
|
||||||
version = "4.3.2-dev6"
|
version = "4.3.2-dev"
|
||||||
summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
|
summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
|
||||||
description = __doc__
|
description = __doc__
|
||||||
authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]
|
authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]
|
||||||
|
@ -103,10 +103,6 @@ def initialize(project):
|
||||||
"infrastructure/clj-cljs/build.py",
|
"infrastructure/clj-cljs/build.py",
|
||||||
"infrastructure/clj/build.py",
|
"infrastructure/clj/build.py",
|
||||||
],
|
],
|
||||||
"release_artifacts": [],
|
|
||||||
"release_artifact_server_url": "https://repo.prod.meissa.de",
|
|
||||||
"release_organisation": "meissa",
|
|
||||||
"release_repository_name": "dda-devops-build",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build = ReleaseMixin(project, input)
|
build = ReleaseMixin(project, input)
|
||||||
|
@ -182,12 +178,6 @@ def tag(project):
|
||||||
build.tag_bump_and_push_release()
|
build.tag_bump_and_push_release()
|
||||||
|
|
||||||
|
|
||||||
@task
|
|
||||||
def publish_artifacts(project):
|
|
||||||
build = get_devops_build(project)
|
|
||||||
build.publish_artifacts()
|
|
||||||
|
|
||||||
|
|
||||||
def release(project):
|
def release(project):
|
||||||
prepare(project)
|
prepare(project)
|
||||||
tag(project)
|
tag(project)
|
||||||
|
|
|
@ -88,15 +88,6 @@ classDiagram
|
||||||
release_type
|
release_type
|
||||||
release_main_branch
|
release_main_branch
|
||||||
release_current_branch
|
release_current_branch
|
||||||
release_artifact_server_url
|
|
||||||
release_organisation
|
|
||||||
release_repository_name
|
|
||||||
release_artifact_token
|
|
||||||
}
|
|
||||||
class Artifact {
|
|
||||||
path_str
|
|
||||||
path()
|
|
||||||
type()
|
|
||||||
}
|
}
|
||||||
class Credentials {
|
class Credentials {
|
||||||
<<AggregateRoot>>
|
<<AggregateRoot>>
|
||||||
|
@ -139,7 +130,6 @@ classDiagram
|
||||||
TerraformDomain *-- "0..1" ProviderAws: providers
|
TerraformDomain *-- "0..1" ProviderAws: providers
|
||||||
Release o-- "0..1" BuildFile: primary_build_file
|
Release o-- "0..1" BuildFile: primary_build_file
|
||||||
Release o-- "0..n" BuildFile: secondary_build_files
|
Release o-- "0..n" BuildFile: secondary_build_files
|
||||||
Release "1" *-- "0..n" Artifact: release_artifacts
|
|
||||||
Release "1" *-- "1" Version: version
|
Release "1" *-- "1" Version: version
|
||||||
BuildFile *-- "1" Version: version
|
BuildFile *-- "1" Version: version
|
||||||
C4k *-- DnsRecord: dns_record
|
C4k *-- DnsRecord: dns_record
|
||||||
|
|
|
@ -5,4 +5,3 @@ RUN apk add --no-cache build-base rust python3 python3-dev py3-pip py3-setuptool
|
||||||
RUN python3 -m pip install -U pip;
|
RUN python3 -m pip install -U pip;
|
||||||
RUN pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection;
|
RUN pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 pyyaml inflection;
|
||||||
RUN pip3 install coverage flake8 flake8-polyfill mypy mypy-extensions pycodestyle pyflakes pylint pytest pytest-cov pytest-datafiles types-setuptools types-PyYAML;
|
RUN pip3 install coverage flake8 flake8-polyfill mypy mypy-extensions pycodestyle pyflakes pylint pytest pytest-cov pytest-datafiles types-setuptools types-PyYAML;
|
||||||
RUN pip3 install --upgrade ddadevops --pre
|
|
||||||
|
|
|
@ -1,26 +1,18 @@
|
||||||
import json
|
|
||||||
from typing import List
|
from typing import List
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from ..infrastructure import GitApi, ArtifactDeploymentApi, BuildFileRepository
|
from ..infrastructure import GitApi, BuildFileRepository
|
||||||
from ..domain import Version, Release, ReleaseType, Artifact
|
from ..domain import Version, Release, ReleaseType
|
||||||
|
|
||||||
|
|
||||||
class ReleaseService:
|
class ReleaseService:
|
||||||
def __init__(
|
def __init__(self, git_api: GitApi, build_file_repository: BuildFileRepository):
|
||||||
self,
|
|
||||||
git_api: GitApi,
|
|
||||||
artifact_deployment_api: ArtifactDeploymentApi,
|
|
||||||
build_file_repository: BuildFileRepository,
|
|
||||||
):
|
|
||||||
self.git_api = git_api
|
self.git_api = git_api
|
||||||
self.artifact_deployment_api = artifact_deployment_api
|
|
||||||
self.build_file_repository = build_file_repository
|
self.build_file_repository = build_file_repository
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def prod(cls, base_dir: str):
|
def prod(cls, base_dir: str):
|
||||||
return cls(
|
return cls(
|
||||||
GitApi(),
|
GitApi(),
|
||||||
ArtifactDeploymentApi(),
|
|
||||||
BuildFileRepository(base_dir),
|
BuildFileRepository(base_dir),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -61,36 +53,6 @@ class ReleaseService:
|
||||||
)
|
)
|
||||||
self.git_api.push_follow_tags()
|
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(),
|
|
||||||
str(release.release_artifact_token),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
artifacts_sums = []
|
|
||||||
for artifact in release.release_artifacts:
|
|
||||||
sha256 = self.artifact_deployment_api.calculate_sha256(artifact.path())
|
|
||||||
sha512 = self.artifact_deployment_api.calculate_sha512(artifact.path())
|
|
||||||
artifacts_sums += [Artifact(sha256), Artifact(sha512)]
|
|
||||||
|
|
||||||
artifacts = release.release_artifacts + artifacts_sums
|
|
||||||
print(artifacts)
|
|
||||||
for artifact in artifacts:
|
|
||||||
print(str)
|
|
||||||
self.artifact_deployment_api.add_asset_to_release(
|
|
||||||
release.forgejo_release_asset_api_endpoint(release_id),
|
|
||||||
artifact.path(),
|
|
||||||
artifact.type(),
|
|
||||||
str(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__(
|
def __set_version_and_commit__(
|
||||||
self, version: Version, build_file_ids: List[str], message: str
|
self, version: Version, build_file_ids: List[str], message: str
|
||||||
):
|
):
|
||||||
|
|
56
src/main/python/ddadevops/artifact_deployment_mixin.py
Normal file
56
src/main/python/ddadevops/artifact_deployment_mixin.py
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
from pybuilder.core import Project
|
||||||
|
from .devops_build import DevopsBuild
|
||||||
|
|
||||||
|
# """
|
||||||
|
# Functional Req:
|
||||||
|
|
||||||
|
# General process for deploying prebuilt (meissa) binaries to our own repo server.
|
||||||
|
|
||||||
|
# [-1]
|
||||||
|
# Building is handled by other entities
|
||||||
|
# is another pybuilder task
|
||||||
|
# the binary is reachable with devops.build_path()
|
||||||
|
# we might need to establish a "build" that does lein builds for us
|
||||||
|
# we might need to establish a "build" that does gradlew build for us
|
||||||
|
# same for all other projects that produce binaries
|
||||||
|
# currently the c4k_build.py just creates the auth and config yamls
|
||||||
|
|
||||||
|
# [0]
|
||||||
|
# get artifact deployment url
|
||||||
|
# Base url: https://repo.prod.meissa.de/api/v1/repos/
|
||||||
|
# Changeable: /meissa/provs/
|
||||||
|
# persitent suffix to url: releases
|
||||||
|
# name is accessible from input
|
||||||
|
|
||||||
|
# [1]
|
||||||
|
# get release token
|
||||||
|
# could be an api token for repo.prod.meissa.de
|
||||||
|
# credential mapping as described in the docs
|
||||||
|
|
||||||
|
# [2]
|
||||||
|
# get release tag
|
||||||
|
# is the version of the project
|
||||||
|
# get from gitApi
|
||||||
|
|
||||||
|
# [3]
|
||||||
|
# post a json message containting [2] to [0], watching stdout for answers
|
||||||
|
# authorized by [1]
|
||||||
|
# validate if [3] was successful by reading stdout
|
||||||
|
# or create error message containing ID of release
|
||||||
|
|
||||||
|
# [4]
|
||||||
|
# get release-id from stdout of [3]
|
||||||
|
# print release-id
|
||||||
|
|
||||||
|
# [5]
|
||||||
|
# generate sha256 sums & generate sha512 sums of results of [-1]
|
||||||
|
|
||||||
|
# [6]
|
||||||
|
# push results of [-1] & [5] to [0]/[4]
|
||||||
|
|
||||||
|
# """
|
||||||
|
|
||||||
|
|
||||||
|
class ArtifactDeploymentMixin(DevopsBuild):
|
||||||
|
def __init__(self, project: Project, inp: dict):
|
||||||
|
super().__init__(project, inp)
|
|
@ -17,7 +17,6 @@ from .provider_hetzner import Hetzner
|
||||||
from .provider_aws import Aws
|
from .provider_aws import Aws
|
||||||
from .provs_k3s import K3s
|
from .provs_k3s import K3s
|
||||||
from .release import Release
|
from .release import Release
|
||||||
from .artifact import Artifact
|
|
||||||
from .credentials import Credentials, CredentialMapping, GopassType
|
from .credentials import Credentials, CredentialMapping, GopassType
|
||||||
from .version import Version
|
from .version import Version
|
||||||
from .build_file import BuildFileType, BuildFile
|
from .build_file import BuildFileType, BuildFile
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
from enum import Enum
|
|
||||||
from pathlib import Path
|
|
||||||
from .common import (
|
|
||||||
Validateable,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ArtifactType(Enum):
|
|
||||||
TEXT = 0
|
|
||||||
JAR = 1
|
|
||||||
|
|
||||||
|
|
||||||
class Artifact(Validateable):
|
|
||||||
def __init__(self, path: str):
|
|
||||||
self.path_str = path
|
|
||||||
|
|
||||||
def path(self) -> Path:
|
|
||||||
return Path(self.path_str)
|
|
||||||
|
|
||||||
def type(self) -> str:
|
|
||||||
suffix = self.path().suffix
|
|
||||||
match suffix:
|
|
||||||
case ".jar":
|
|
||||||
return "application/x-java-archive"
|
|
||||||
case ".js":
|
|
||||||
return "application/x-javascript"
|
|
||||||
case _:
|
|
||||||
return "text/plain"
|
|
||||||
|
|
||||||
def validate(self):
|
|
||||||
result = []
|
|
||||||
result += self.__validate_is_not_empty__("path_str")
|
|
||||||
try:
|
|
||||||
Path(self.path_str)
|
|
||||||
except Exception as e:
|
|
||||||
result += [f"path was not a valid: {e}"]
|
|
||||||
return result
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return str(self.path())
|
|
||||||
|
|
||||||
def __eq__(self, other):
|
|
||||||
return other and self.__str__() == other.__str__()
|
|
||||||
|
|
||||||
def __hash__(self) -> int:
|
|
||||||
return self.__str__().__hash__()
|
|
|
@ -8,7 +8,7 @@ from .provider_digitalocean import Digitalocean
|
||||||
from .provider_hetzner import Hetzner
|
from .provider_hetzner import Hetzner
|
||||||
from .c4k import C4k
|
from .c4k import C4k
|
||||||
from .image import Image
|
from .image import Image
|
||||||
from .release import ReleaseType, Release
|
from .release import ReleaseType
|
||||||
from ..infrastructure import BuildFileRepository, CredentialsApi, EnvironmentApi, GitApi
|
from ..infrastructure import BuildFileRepository, CredentialsApi, EnvironmentApi, GitApi
|
||||||
|
|
||||||
|
|
||||||
|
@ -69,7 +69,6 @@ class InitService:
|
||||||
Path(primary_build_file_id)
|
Path(primary_build_file_id)
|
||||||
)
|
)
|
||||||
version = primary_build_file.get_version()
|
version = primary_build_file.get_version()
|
||||||
default_mappings += Release.get_mapping_default()
|
|
||||||
|
|
||||||
credentials = Credentials(inp, default_mappings)
|
credentials = Credentials(inp, default_mappings)
|
||||||
authorization = self.authorization(credentials)
|
authorization = self.authorization(credentials)
|
||||||
|
@ -112,8 +111,9 @@ class InitService:
|
||||||
result = {}
|
result = {}
|
||||||
for name in credentials.mappings.keys():
|
for name in credentials.mappings.keys():
|
||||||
mapping = credentials.mappings[name]
|
mapping = credentials.mappings[name]
|
||||||
if self.environment_api.is_defined(mapping.name_for_environment()):
|
env_value = self.environment_api.get(mapping.name_for_environment())
|
||||||
result[name] = self.environment_api.get(mapping.name_for_environment())
|
if env_value:
|
||||||
|
result[name] = env_value
|
||||||
else:
|
else:
|
||||||
if mapping.gopass_type() == GopassType.FIELD:
|
if mapping.gopass_type() == GopassType.FIELD:
|
||||||
result[name] = self.credentials_api.gopass_field_from_path(
|
result[name] = self.credentials_api.gopass_field_from_path(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from typing import Optional, List, Dict
|
from typing import Optional, List
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from .common import (
|
from .common import (
|
||||||
Validateable,
|
Validateable,
|
||||||
|
@ -7,9 +7,6 @@ from .common import (
|
||||||
from .version import (
|
from .version import (
|
||||||
Version,
|
Version,
|
||||||
)
|
)
|
||||||
from .artifact import (
|
|
||||||
Artifact,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Release(Validateable):
|
class Release(Validateable):
|
||||||
|
@ -24,13 +21,6 @@ class Release(Validateable):
|
||||||
"release_secondary_build_files", []
|
"release_secondary_build_files", []
|
||||||
)
|
)
|
||||||
self.version = version
|
self.version = version
|
||||||
self.release_artifact_server_url = inp.get("release_artifact_server_url")
|
|
||||||
self.release_organisation = inp.get("release_organisation")
|
|
||||||
self.release_repository_name = inp.get("release_repository_name")
|
|
||||||
self.release_artifact_token = inp.get("release_artifact_token")
|
|
||||||
self.release_artifacts = []
|
|
||||||
for a in inp.get("release_artifacts", []):
|
|
||||||
self.release_artifacts.append(Artifact(a))
|
|
||||||
|
|
||||||
def update_release_type(self, release_type: ReleaseType):
|
def update_release_type(self, release_type: ReleaseType):
|
||||||
self.release_type = release_type
|
self.release_type = release_type
|
||||||
|
@ -63,44 +53,10 @@ class Release(Validateable):
|
||||||
and self.release_type != ReleaseType.NONE
|
and self.release_type != ReleaseType.NONE
|
||||||
and self.release_main_branch != self.release_current_branch
|
and self.release_main_branch != self.release_current_branch
|
||||||
):
|
):
|
||||||
result.append(
|
result.append(f"Releases are allowed only on {self.release_main_branch}")
|
||||||
f"Releases are allowed only on {self.release_main_branch}"
|
|
||||||
)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def validate_for_artifact(self):
|
|
||||||
result = []
|
|
||||||
result += self.__validate_is_not_empty__("release_artifact_server_url")
|
|
||||||
result += self.__validate_is_not_empty__("release_organisation")
|
|
||||||
result += self.__validate_is_not_empty__("release_repository_name")
|
|
||||||
result += self.__validate_is_not_empty__("release_artifact_token")
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def build_files(self) -> List[str]:
|
def build_files(self) -> List[str]:
|
||||||
result = [self.release_primary_build_file]
|
result = [self.release_primary_build_file]
|
||||||
result += self.release_secondary_build_files
|
result += self.release_secondary_build_files
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def forgejo_release_api_endpoint(self) -> str:
|
|
||||||
validation = self.validate_for_artifact()
|
|
||||||
if validation != []:
|
|
||||||
raise RuntimeError(f"not valid for creating artifacts: {validation}")
|
|
||||||
|
|
||||||
server_url = self.release_artifact_server_url.removeprefix("/").removesuffix(
|
|
||||||
"/"
|
|
||||||
)
|
|
||||||
organisation = self.release_organisation.removeprefix("/").removesuffix("/")
|
|
||||||
repository = self.release_repository_name.removeprefix("/").removesuffix("/")
|
|
||||||
return f"{server_url}/api/v1/repos/{organisation}/{repository}/releases"
|
|
||||||
|
|
||||||
def forgejo_release_asset_api_endpoint(self, release_id: int) -> str:
|
|
||||||
return f"{self.forgejo_release_api_endpoint()}/{release_id}/assets"
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_mapping_default(cls) -> List[Dict[str, str]]:
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
"gopass_path": "server/meissa/repo/buero-rw",
|
|
||||||
"name": "release_artifact_token",
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
|
@ -32,6 +32,12 @@ class Version(Validateable):
|
||||||
self.snapshot_suffix = snapshot_suffix
|
self.snapshot_suffix = snapshot_suffix
|
||||||
self.default_snapshot_suffix = default_snapshot_suffix
|
self.default_snapshot_suffix = default_snapshot_suffix
|
||||||
|
|
||||||
|
def __eq__(self, other):
|
||||||
|
return other and self.to_string() == other.to_string()
|
||||||
|
|
||||||
|
def __hash__(self) -> int:
|
||||||
|
return self.to_string().__hash__()
|
||||||
|
|
||||||
def is_snapshot(self):
|
def is_snapshot(self):
|
||||||
return self.snapshot_suffix is not None
|
return self.snapshot_suffix is not None
|
||||||
|
|
||||||
|
@ -133,9 +139,3 @@ class Version(Validateable):
|
||||||
snapshot_suffix=None,
|
snapshot_suffix=None,
|
||||||
version_str=None,
|
version_str=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
def __eq__(self, other):
|
|
||||||
return other and self.to_string() == other.to_string()
|
|
||||||
|
|
||||||
def __hash__(self) -> int:
|
|
||||||
return self.to_string().__hash__()
|
|
||||||
|
|
|
@ -7,6 +7,5 @@ from .infrastructure import (
|
||||||
CredentialsApi,
|
CredentialsApi,
|
||||||
GitApi,
|
GitApi,
|
||||||
TerraformApi,
|
TerraformApi,
|
||||||
ArtifactDeploymentApi,
|
|
||||||
)
|
)
|
||||||
from .repository import DevopsRepository, BuildFileRepository
|
from .repository import DevopsRepository, BuildFileRepository
|
||||||
|
|
|
@ -58,21 +58,23 @@ class ImageApi:
|
||||||
)
|
)
|
||||||
|
|
||||||
def drun(self, name: str):
|
def drun(self, name: str):
|
||||||
run(
|
self.execution_api.execute_live(
|
||||||
f'docker run -it --entrypoint="" {name} /bin/bash',
|
f'docker run -it --entrypoint="" {name} /bin/bash'
|
||||||
shell=True,
|
|
||||||
check=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def dockerhub_login(self, username: str, password: str):
|
def dockerhub_login(self, username: str, password: str):
|
||||||
self.execution_api.execute_secure(
|
self.execution_api.execute_secure(
|
||||||
f"docker login --username {username} --password {password}",
|
f"docker login --username {username} --password {password}",
|
||||||
"docker login --username ***** --password *****",
|
"docker login --username ***** --password *****"
|
||||||
)
|
)
|
||||||
|
|
||||||
def dockerhub_publish(self, name: str, username: str, tag: str):
|
def dockerhub_publish(self, name: str, username: str, tag: str):
|
||||||
self.execution_api.execute_live(f"docker tag {name} {username}/{name}:{tag}")
|
self.execution_api.execute_live(
|
||||||
self.execution_api.execute_live(f"docker push {username}/{name}:{tag}")
|
f"docker tag {name} {username}/{name}:{tag}"
|
||||||
|
)
|
||||||
|
self.execution_api.execute_live(
|
||||||
|
f"docker push {username}/{name}:{tag}"
|
||||||
|
)
|
||||||
|
|
||||||
def test(self, name: str, path: Path):
|
def test(self, name: str, path: Path):
|
||||||
self.execution_api.execute_live(
|
self.execution_api.execute_live(
|
||||||
|
@ -93,24 +95,14 @@ class ExecutionApi:
|
||||||
check=check,
|
check=check,
|
||||||
stdout=PIPE,
|
stdout=PIPE,
|
||||||
stderr=PIPE,
|
stderr=PIPE,
|
||||||
text=True,
|
text=True).stdout
|
||||||
).stdout
|
|
||||||
output = output.rstrip()
|
output = output.rstrip()
|
||||||
except CalledProcessError as exc:
|
except CalledProcessError as exc:
|
||||||
print(
|
print(f"Command failed with code: {exc.returncode} and message: {exc.stderr}")
|
||||||
f"Command failed with code: {exc.returncode} and message: {exc.stderr}"
|
|
||||||
)
|
|
||||||
raise exc
|
raise exc
|
||||||
return output
|
return output
|
||||||
|
|
||||||
def execute_secure(
|
def execute_secure(self, command: str, sanitized_command: str, dry_run=False, shell=True, check=True):
|
||||||
self,
|
|
||||||
command: str,
|
|
||||||
sanitized_command: str,
|
|
||||||
dry_run=False,
|
|
||||||
shell=True,
|
|
||||||
check=True,
|
|
||||||
):
|
|
||||||
try:
|
try:
|
||||||
output = self.execute(command, dry_run, shell, check)
|
output = self.execute(command, dry_run, shell, check)
|
||||||
return output
|
return output
|
||||||
|
@ -136,9 +128,6 @@ class EnvironmentApi:
|
||||||
def get(self, key):
|
def get(self, key):
|
||||||
return environ.get(key)
|
return environ.get(key)
|
||||||
|
|
||||||
def is_defined(self, key):
|
|
||||||
return key in environ
|
|
||||||
|
|
||||||
|
|
||||||
class CredentialsApi:
|
class CredentialsApi:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -217,51 +206,3 @@ class GitApi:
|
||||||
|
|
||||||
class TerraformApi:
|
class TerraformApi:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ArtifactDeploymentApi:
|
|
||||||
def __init__(self):
|
|
||||||
self.execution_api = ExecutionApi()
|
|
||||||
|
|
||||||
def create_forgejo_release(self, api_endpoint_url: str, tag: str, token: str):
|
|
||||||
return self.execution_api.execute_secure(
|
|
||||||
f'curl -X "POST" "{api_endpoint_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}" '
|
|
||||||
+ '-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
|
|
||||||
) # noqa: E501
|
|
||||||
|
|
||||||
def add_asset_to_release(
|
|
||||||
self,
|
|
||||||
api_endpoint_url: str,
|
|
||||||
attachment: Path,
|
|
||||||
attachment_type: str,
|
|
||||||
token: str,
|
|
||||||
):
|
|
||||||
return self.execution_api.execute_secure(
|
|
||||||
f'curl -X "POST" "{api_endpoint_url}" '
|
|
||||||
+ 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}" '
|
|
||||||
+ '-H "accept: application/json" '
|
|
||||||
+ '-H "Content-Type: multipart/form-data" '
|
|
||||||
+ f'-F "attachment=@{attachment};type={attachment_type}"',
|
|
||||||
)
|
|
||||||
|
|
||||||
def calculate_sha256(self, path: Path):
|
|
||||||
shasum = f"{path}.sha256"
|
|
||||||
self.execution_api.execute(
|
|
||||||
f"sha256sum {path} > {shasum}",
|
|
||||||
)
|
|
||||||
return shasum
|
|
||||||
|
|
||||||
def calculate_sha512(self, path: Path):
|
|
||||||
shasum = f"{path}.sha512"
|
|
||||||
self.execution_api.execute(
|
|
||||||
f"sha512sum {path} > {shasum}",
|
|
||||||
)
|
|
||||||
return shasum
|
|
||||||
|
|
|
@ -26,8 +26,3 @@ class ReleaseMixin(DevopsBuild):
|
||||||
devops = self.devops_repo.get_devops(self.project)
|
devops = self.devops_repo.get_devops(self.project)
|
||||||
release = devops.mixins[MixinType.RELEASE]
|
release = devops.mixins[MixinType.RELEASE]
|
||||||
self.release_service.tag_bump_and_push_release(release)
|
self.release_service.tag_bump_and_push_release(release)
|
||||||
|
|
||||||
def publish_artifacts(self):
|
|
||||||
devops = self.devops_repo.get_devops(self.project)
|
|
||||||
release = devops.mixins[MixinType.RELEASE]
|
|
||||||
self.release_service.publish_artifacts(release)
|
|
||||||
|
|
|
@ -1,22 +1,18 @@
|
||||||
import pytest
|
import pytest
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from src.main.python.ddadevops.domain import (
|
from src.main.python.ddadevops.domain import (
|
||||||
ReleaseType,
|
ReleaseType,
|
||||||
MixinType,
|
MixinType,
|
||||||
)
|
)
|
||||||
from src.test.python.domain.helper import (
|
from src.test.python.domain.helper import (
|
||||||
BuildFileRepositoryMock,
|
BuildFileRepositoryMock,
|
||||||
GitApiMock,
|
GitApiMock,
|
||||||
ArtifactDeploymentApiMock,
|
|
||||||
build_devops,
|
build_devops,
|
||||||
)
|
)
|
||||||
from src.main.python.ddadevops.application import ReleaseService
|
from src.main.python.ddadevops.application import ReleaseService
|
||||||
|
|
||||||
|
|
||||||
def test_sould_update_release_type():
|
def test_sould_update_release_type():
|
||||||
sut = ReleaseService(
|
sut = ReleaseService(GitApiMock(), BuildFileRepositoryMock("build.py"))
|
||||||
GitApiMock(), ArtifactDeploymentApiMock(), BuildFileRepositoryMock("build.py")
|
|
||||||
)
|
|
||||||
devops = build_devops({})
|
devops = build_devops({})
|
||||||
release = devops.mixins[MixinType.RELEASE]
|
release = devops.mixins[MixinType.RELEASE]
|
||||||
sut.update_release_type(release, "MAJOR")
|
sut.update_release_type(release, "MAJOR")
|
||||||
|
@ -24,40 +20,3 @@ def test_sould_update_release_type():
|
||||||
|
|
||||||
with pytest.raises(Exception):
|
with pytest.raises(Exception):
|
||||||
sut.update_release_type(release, "NOT_EXISTING")
|
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 "http://repo.test/api/v1/repos/orga/repo/releases/2345/assets" == mock.add_asset_to_release_api_endpoint
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
|
@ -53,11 +53,6 @@ def devops_config(overrides: dict) -> dict:
|
||||||
"release_current_branch": "my_feature",
|
"release_current_branch": "my_feature",
|
||||||
"release_primary_build_file": "./package.json",
|
"release_primary_build_file": "./package.json",
|
||||||
"release_secondary_build_file": [],
|
"release_secondary_build_file": [],
|
||||||
"release_artifacts": [],
|
|
||||||
"release_artifact_token": "release_artifact_token",
|
|
||||||
"release_artifact_server_url": None,
|
|
||||||
"release_organisation": None,
|
|
||||||
"release_repository_name": None,
|
|
||||||
"credentials_mappings": [
|
"credentials_mappings": [
|
||||||
{
|
{
|
||||||
"gopass_path": "a/path",
|
"gopass_path": "a/path",
|
||||||
|
@ -104,9 +99,6 @@ class EnvironmentApiMock:
|
||||||
def get(self, key):
|
def get(self, key):
|
||||||
return self.mappings.get(key, None)
|
return self.mappings.get(key, None)
|
||||||
|
|
||||||
def is_defined(self, key):
|
|
||||||
return key in self.mappings
|
|
||||||
|
|
||||||
|
|
||||||
class CredentialsApiMock:
|
class CredentialsApiMock:
|
||||||
def __init__(self, mappings):
|
def __init__(self, mappings):
|
||||||
|
@ -158,28 +150,3 @@ class GitApiMock:
|
||||||
|
|
||||||
def checkout(self, branch: str):
|
def checkout(self, branch: str):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ArtifactDeploymentApiMock:
|
|
||||||
def __init__(self, release=""):
|
|
||||||
self.release = release
|
|
||||||
self.create_forgejo_release_count = 0
|
|
||||||
self.add_asset_to_release_count = 0
|
|
||||||
self.add_asset_to_release_api_endpoint = ""
|
|
||||||
|
|
||||||
def create_forgejo_release(self, api_endpoint: str, tag: str, token: str):
|
|
||||||
self.create_forgejo_release_count += 1
|
|
||||||
return self.release
|
|
||||||
|
|
||||||
def add_asset_to_release(
|
|
||||||
self, api_endpoint: str, attachment: str, attachment_type: str, token: str
|
|
||||||
):
|
|
||||||
self.add_asset_to_release_api_endpoint = api_endpoint
|
|
||||||
self.add_asset_to_release_count += 1
|
|
||||||
pass
|
|
||||||
|
|
||||||
def calculate_sha256(self, path: Path):
|
|
||||||
return f"{path}.sha256"
|
|
||||||
|
|
||||||
def calculate_sha512(self, path: Path):
|
|
||||||
return f"{path}.sha512"
|
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
import pytest
|
|
||||||
from pybuilder.core import Project
|
|
||||||
from pathlib import Path
|
|
||||||
from src.main.python.ddadevops.domain import (
|
|
||||||
Validateable,
|
|
||||||
DnsRecord,
|
|
||||||
Devops,
|
|
||||||
BuildType,
|
|
||||||
MixinType,
|
|
||||||
Artifact,
|
|
||||||
Image,
|
|
||||||
)
|
|
||||||
from .helper import build_devops, devops_config
|
|
||||||
|
|
||||||
|
|
||||||
def test_sould_validate_release():
|
|
||||||
sut = Artifact("x")
|
|
||||||
assert sut.is_valid()
|
|
||||||
|
|
||||||
sut = Artifact(None)
|
|
||||||
assert not sut.is_valid()
|
|
||||||
|
|
||||||
def test_should_calculate_type():
|
|
||||||
sut = Artifact("x.jar")
|
|
||||||
assert "application/x-java-archive" == sut.type()
|
|
||||||
|
|
||||||
sut = Artifact("x.js")
|
|
||||||
assert "application/x-javascript" == sut.type()
|
|
||||||
|
|
||||||
sut = Artifact("x.jar.sha256")
|
|
||||||
assert "text/plain" == sut.type()
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ from src.main.python.ddadevops.domain import (
|
||||||
Version,
|
Version,
|
||||||
BuildType,
|
BuildType,
|
||||||
MixinType,
|
MixinType,
|
||||||
Artifact,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -51,7 +50,6 @@ def test_devops_creation():
|
||||||
assert sut is not None
|
assert sut is not None
|
||||||
assert sut.specialized_builds[BuildType.C4K] is not None
|
assert sut.specialized_builds[BuildType.C4K] is not None
|
||||||
|
|
||||||
def test_release_devops_creation():
|
|
||||||
sut = DevopsFactory().build_devops(
|
sut = DevopsFactory().build_devops(
|
||||||
{
|
{
|
||||||
"stage": "test",
|
"stage": "test",
|
||||||
|
@ -69,30 +67,6 @@ def test_release_devops_creation():
|
||||||
assert sut is not None
|
assert sut is not None
|
||||||
assert sut.mixins[MixinType.RELEASE] is not None
|
assert sut.mixins[MixinType.RELEASE] is not None
|
||||||
|
|
||||||
sut = DevopsFactory().build_devops(
|
|
||||||
{
|
|
||||||
"stage": "test",
|
|
||||||
"name": "mybuild",
|
|
||||||
"module": "test_image",
|
|
||||||
"project_root_path": "../../..",
|
|
||||||
"build_types": [],
|
|
||||||
"mixin_types": ["RELEASE"],
|
|
||||||
"release_main_branch": "main",
|
|
||||||
"release_current_branch": "my_feature",
|
|
||||||
"release_config_file": "project.clj",
|
|
||||||
"release_artifacts": ["x.jar"],
|
|
||||||
"release_artifact_token": "y",
|
|
||||||
"release_artifact_server_url": "https://repo.prod.meissa.de",
|
|
||||||
"release_organisation": "meissa",
|
|
||||||
"release_repository_name": "provs",
|
|
||||||
},
|
|
||||||
Version.from_str("1.0.0", "SNAPSHOT"),
|
|
||||||
)
|
|
||||||
|
|
||||||
release = sut.mixins[MixinType.RELEASE]
|
|
||||||
assert release is not None
|
|
||||||
assert Artifact("x.jar") == release.release_artifacts[0]
|
|
||||||
|
|
||||||
|
|
||||||
def test_on_merge_input_should_win():
|
def test_on_merge_input_should_win():
|
||||||
sut = DevopsFactory()
|
sut = DevopsFactory()
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import pytest
|
|
||||||
from pybuilder.core import Project
|
from pybuilder.core import Project
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from src.main.python.ddadevops.domain import (
|
from src.main.python.ddadevops.domain import (
|
||||||
|
@ -62,74 +61,3 @@ def test_sould_calculate_build_files():
|
||||||
Version.from_str("1.3.1-SNAPSHOT", "SNAPSHOT"),
|
Version.from_str("1.3.1-SNAPSHOT", "SNAPSHOT"),
|
||||||
)
|
)
|
||||||
assert ["project.clj", "package.json"] == sut.build_files()
|
assert ["project.clj", "package.json"] == sut.build_files()
|
||||||
|
|
||||||
|
|
||||||
def test_should_calculate_forgejo_release_api_endpoint():
|
|
||||||
sut = Release(
|
|
||||||
devops_config(
|
|
||||||
{
|
|
||||||
"release_artifacts": [],
|
|
||||||
"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"
|
|
||||||
== sut.forgejo_release_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"
|
|
||||||
== sut.forgejo_release_api_endpoint()
|
|
||||||
)
|
|
||||||
assert(
|
|
||||||
"/meissa/"
|
|
||||||
== sut.release_organisation
|
|
||||||
)
|
|
||||||
|
|
||||||
with pytest.raises(Exception):
|
|
||||||
sut = Release(
|
|
||||||
devops_config(
|
|
||||||
{
|
|
||||||
"release_artifact_server_url": "https://repo.prod.meissa.de",
|
|
||||||
"release_organisation": None,
|
|
||||||
"release_repository_name": "provs",
|
|
||||||
}
|
|
||||||
),
|
|
||||||
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)
|
|
||||||
)
|
|
||||||
|
|
|
@ -14,8 +14,6 @@ def test_release_mixin(tmp_path):
|
||||||
copy_resource(Path("package.json"), tmp_path)
|
copy_resource(Path("package.json"), tmp_path)
|
||||||
project = Project(str_tmp_path, name="name")
|
project = Project(str_tmp_path, name="name")
|
||||||
|
|
||||||
os.environ["RELEASE_ARTIFACT_TOKEN"] = "ratoken"
|
|
||||||
|
|
||||||
sut = ReleaseMixin(
|
sut = ReleaseMixin(
|
||||||
project,
|
project,
|
||||||
devops_config(
|
devops_config(
|
||||||
|
|
Loading…
Reference in a new issue