meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

Fix CI: Remove whitespaces, add newlines

Browse source
This commit is contained in:
erik 2023-04-20 16:50:31 +02:00
parent 83a7c7ad7d
commit 580bf81c15
19 changed files with 40 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/python/ddadevops/application/__init__.py
View file

@ -1,2 +1,2 @@
from .image_build_service import ImageBuildService
from .release_mixin_services import TagAndPushReleaseService, PrepareReleaseService
from .release_mixin_services import TagAndPushReleaseService, PrepareReleaseService

2
src/main/python/ddadevops/devops_build.py
View file

@ -21,7 +21,7 @@ def get_devops_build(project):
@deprecation.deprecated(deprecated_in="3.2")
# TODO: Remove from here!
# TODO: Remove from here! # pylint: disable=W0511
def get_tag_from_latest_commit():
try:
value = run(

2
src/main/python/ddadevops/domain/__init__.py
View file

@ -1,4 +1,4 @@
from .common import Validateable, DnsRecord, Devops
from .image import Image
from .c4k import C4k
from .release import Release, ReleaseConfig, ReleaseType, Version, EnvironmentKeys
from .release import Release, ReleaseConfig, ReleaseType, Version, EnvironmentKeys

4
src/main/python/ddadevops/domain/release.py
View file

@ -69,13 +69,13 @@ class ReleaseConfig(Validateable):
main_branch: str,
config_file: str,
devops: Devops,
release_version: Optional[str | None] = None,
release_version: Optional[str | None] = None,
bump_version: Optional[str | None] = None
):
self.main_branch = main_branch
self.config_file = config_file
self.release_version = release_version
self.bump_version = bump_version
self.bump_version = bump_version
self.devops = devops
class Release():

2
src/main/python/ddadevops/infrastructure/__init__.py
View file

@ -1 +1 @@
from .infrastructure import FileApi, ImageApi, ResourceApi, ExecutionApi, ProjectRepository
from .infrastructure import FileApi, ImageApi, ResourceApi, ExecutionApi, ProjectRepository

2
src/main/python/ddadevops/infrastructure/infrastructure.py
View file

@ -32,7 +32,7 @@ class ProjectRepository:
def get_release(self, project) -> ReleaseConfig:
return project.get_property("release_build")
def set_release(self, project, build: ReleaseConfig):
project.set_property("release_build", build)

2
src/main/python/ddadevops/infrastructure/release_mixin/__init__.py
View file

@ -1,2 +1,2 @@
from .infrastructure_api import FileHandler, SystemApi, EnvironmentApi, GitApi, JsonFileHandler, GradleFileHandler, PythonFileHandler, ClojureFileHandler
from .repo import VersionRepository, ReleaseRepository, ReleaseTypeRepository
from .repo import VersionRepository, ReleaseRepository, ReleaseTypeRepository

10
src/main/python/ddadevops/infrastructure/release_mixin/infrastructure_api.py
View file

@ -197,11 +197,11 @@ class SystemApi():
stderr=sub.PIPE,
text=True,
encoding="UTF-8")
if stream.stdout is not None:
if stream.stdout is not None:
self.stdout = stream.stdout.readlines()
else:
self.stdout = None
if stream.stderr is not None:
if stream.stderr is not None:
self.stderr = stream.stderr.readlines()
else:
self.stderr = None
@ -246,7 +246,7 @@ class GitApi():
def init(self, default_branch: str = "main"):
self.system_api.run_checked('git', 'init', '-b', default_branch)
def set_user_config(self, email: str, name: str):
self.system_api.run_checked('git', 'config', 'user.email', email)
self.system_api.run_checked('git', 'config', 'user.name', name)
@ -279,6 +279,6 @@ class EnvironmentApi():
def get(self, key):
return self.environ.get(key)
def set(self, key, value):
self.environ[key] = value
self.environ[key] = value

14
src/main/python/ddadevops/infrastructure/release_mixin/repo.py
View file

@ -8,28 +8,28 @@ class VersionRepository():
def __init__(self, file):
self.file = file
self.file_handler = None
def load_file(self):
self.file_handler = FileHandler.from_file_path(self.file)
return self.file_handler
def write_file(self, version_string):
if self.file_handler is None:
raise Exception('Version was not created by load_file method.')
raise Exception('Version was not created by load_file method.')
else:
self.file_handler.write(version_string)
def parse_file(self):
version_list, is_snapshot = self.file_handler.parse()
return version_list, is_snapshot
def get_version(self) -> Version:
self.file_handler = self.load_file()
version_list, is_snapshot = self.parse_file()
version = Version(self.file, version_list)
version.is_snapshot = is_snapshot
return version
class ReleaseTypeRepository():
@ -50,7 +50,7 @@ class ReleaseTypeRepository():
releaseTypeRepo = cls(environment_api=environment_api)
releaseTypeRepo.get_from_env = True
return releaseTypeRepo
def __get_release_type_git(self) -> ReleaseType | None:
latest_commit = self.git_api.get_latest_commit()
@ -87,7 +87,7 @@ class ReleaseTypeRepository():
elif self.get_from_env:
return self.__get_release_type_environment()
else:
raise ValueError('No valid api passed to ReleaseTypeRepository')
raise ValueError('No valid api passed to ReleaseTypeRepository')
class ReleaseRepository():
def __init__(self, version_repository: VersionRepository, release_type_repository: ReleaseTypeRepository, main_branch: str):

2
src/test/python/release_mixin/__init__.py
View file

@ -1,2 +1,2 @@
from .mock_infrastructure import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository
from .mock_infrastructure_api import MockGitApi
from .mock_infrastructure_api import MockGitApi

4
src/test/python/release_mixin/helper.py
View file

@ -6,8 +6,8 @@ class Helper():
def __init__(self, file_name = 'config.json'):
self.TEST_FILE_NAME = file_name
self.TEST_FILE_ROOT = Path('src/test/resources/')
self.TEST_FILE_PATH = self.TEST_FILE_ROOT / self.TEST_FILE_NAME
self.TEST_FILE_PATH = self.TEST_FILE_ROOT / self.TEST_FILE_NAME
def copy_files(self, source: Path, target: Path):
api = SystemApi()
api.run_checked('cp', source, target)
api.run_checked('cp', source, target)

1
src/test/python/release_mixin/mock_domain.py
View file

@ -39,4 +39,3 @@ class MockRelease():
def is_valid(self, main_branch):
return len(self.validate(main_branch)) < 1

6
src/test/python/release_mixin/mock_infrastructure.py
View file

@ -9,14 +9,14 @@ class MockVersionRepository():
self.file = None
self.file_handler = None
self.write_file_count = 0
def load_file(self):
pass
def write_file(self, version_string):
self.write_file_count += 1
pass
def parse_file(self):
pass
@ -39,4 +39,4 @@ class MockReleaseRepository():
def get_release(self) -> MockRelease:
self.get_release_count += 1
return MockRelease(self.release_type_repository.get_release_type(), self.version_repository.get_version(), self.main_branch)
return MockRelease(self.release_type_repository.get_release_type(), self.version_repository.get_version(), self.main_branch)

8
src/test/python/release_mixin/mock_infrastructure_api.py
View file

@ -17,7 +17,7 @@ class MockGitApi():
self.system_api = MockSystemApi()
self.get_latest_commit_count = 0
self.commit_string = commit_string
self.tag_annotated_count = 0
self.tag_annotated_count = 0
self.add_file_count = 0
self.commit_count = 0
self.push_count = 0
@ -30,9 +30,9 @@ class MockGitApi():
return self.commit_string
def tag_annotated(self, annotation: str, message: str, count: int):
self.tag_annotated_count += 1
self.tag_annotated_count += 1
return " "
def tag_annotated_second_last(self, annotation: str, message: str):
self.tag_annotated(annotation, message, 1)
return " "
@ -70,4 +70,4 @@ class MockEnvironmentApi():
return self.environ.get(name)
def set(self, name, value):
self.environ[name] = value
self.environ[name] = value

3
src/test/python/release_mixin/test_infrastructure.py
View file

@ -15,7 +15,7 @@ def test_version_repository(tmp_path):
def test_release_repository(tmp_path):
# init
# init
th = Helper()
th.copy_files( th.TEST_FILE_PATH, tmp_path)
version_repo = VersionRepository(th.TEST_FILE_PATH)
@ -83,4 +83,3 @@ def test_release_type_repository_env():
release_type = sut.get_release_type()
except:
assert release_type == None

6
src/test/python/release_mixin/test_infrastructure_api.py
View file

@ -11,13 +11,13 @@ def change_test_dir( tmp_path: Path, monkeypatch: pt.MonkeyPatch):
monkeypatch.chdir(tmp_path)
def test_environment_api():
# init
# init
env_api = EnvironmentApi()
key = "TEST_ENV_KEY"
value = "data"
env_api.set(key, value)
#test
#test
assert env_api.get(key) == value
def test_git_api(tmp_path: Path, monkeypatch: pt.MonkeyPatch):
@ -26,7 +26,7 @@ def test_git_api(tmp_path: Path, monkeypatch: pt.MonkeyPatch):
th.copy_files(th.TEST_FILE_PATH, tmp_path)
# change the context of the script execution to tmp_path
change_test_dir(tmp_path, monkeypatch)
change_test_dir(tmp_path, monkeypatch)
git_api = GitApi()
git_api.init()

8
src/test/python/release_mixin/test_release_mixin.py
View file

@ -25,7 +25,7 @@ def initialize_with_object(project, CONFIG_FILE):
devops = Devops(STAGE, PROJECT_ROOT_PATH, MODULE, "release_test", BUILD_DIR_NAME)
release_config = ReleaseConfig(MAIN_BRANCH, CONFIG_FILE, devops)
build = MyBuild(project, release_config=release_config)
return build
return build
def test_release_mixin_git(tmp_path: Path, monkeypatch: pt.MonkeyPatch):
@ -34,7 +34,7 @@ def test_release_mixin_git(tmp_path: Path, monkeypatch: pt.MonkeyPatch):
th.copy_files(th.TEST_FILE_PATH, tmp_path)
th.TEST_FILE_PATH = tmp_path / th.TEST_FILE_NAME
change_test_dir(tmp_path, monkeypatch)
change_test_dir(tmp_path, monkeypatch)
project = Project(tmp_path)
git_api = GitApi()
@ -57,7 +57,7 @@ def test_release_mixin_environment(tmp_path: Path, monkeypatch: pt.MonkeyPatch):
th.copy_files(th.TEST_FILE_PATH, tmp_path)
th.TEST_FILE_PATH = tmp_path / th.TEST_FILE_NAME
change_test_dir(tmp_path, monkeypatch)
change_test_dir(tmp_path, monkeypatch)
project = Project(tmp_path)
git_api = GitApi()
@ -68,7 +68,7 @@ def test_release_mixin_environment(tmp_path: Path, monkeypatch: pt.MonkeyPatch):
environment_api = EnvironmentApi()
environment_api.set("DDADEVOPS_RELEASE_TYPE", "MAJOR")
build = initialize_with_object(project, th.TEST_FILE_PATH)
build.prepare_release()
release_version = build.prepare_release_service.release_repo.version_repository.get_version()

2
src/test/python/release_mixin/test_services.py
View file

@ -25,7 +25,7 @@ def test_prepare_release_service():
assert prepare_release_service.release_repo.version_repository.write_file_count == 2
assert prepare_release_service.git_api.add_file_count == 2
assert prepare_release_service.git_api.commit_count == 2
def test_tag_and_push_release_service():
# init
mock_release_repo = MockReleaseRepository(MockVersionRepository(), MockReleaseTypeRepository(MockGitApi()), 'main')

3
src/test/python/test_c4k_mixin.py
View file

@ -28,7 +28,7 @@ def test_c4k_mixin(tmp_path):
add_c4k_mixin_config(project_config, config, auth, grafana_cloud_user='user', grafana_cloud_password='password')
assert project_config.get('C4kMixin') is not None
mixin = MyC4kMixin(project, project_config)
mixin.initialize_build_dir()
assert mixin.build_path() == f'{tmp_path_str}/{build_dir}/{project_name}/{module_name}'
@ -44,4 +44,3 @@ def test_c4k_mixin(tmp_path):
mixin.write_c4k_auth()
assert os.path.exists(f'{mixin.build_path()}/out_c4k_auth.yaml')