From b24288976ef3de4681f947e18d2fbd4e959c4d82 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Thu, 25 May 2023 14:51:49 +0200 Subject: [PATCH] format --- src/main/python/ddadevops/domain/devops_factory.py | 4 +++- .../ddadevops/domain/digitalocean_terraform.py | 1 - src/test/python/domain/helper.py | 1 - src/test/python/domain/test_devops_factory.py | 11 +++++++---- .../python/domain/test_digitalocean_terraform.py | 14 ++++++++++---- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/python/ddadevops/domain/devops_factory.py b/src/main/python/ddadevops/domain/devops_factory.py index 26eb72f..07ce39a 100644 --- a/src/main/python/ddadevops/domain/devops_factory.py +++ b/src/main/python/ddadevops/domain/devops_factory.py @@ -27,7 +27,9 @@ class DevopsFactory: if BuildType.TERRAFORM in build_types: specialized_builds[BuildType.TERRAFORM] = TerraformDomain(inp) if BuildType.DIGITALOCEAN_TERRAFORM in build_types: - specialized_builds[BuildType.DIGITALOCEAN_TERRAFORM] = DigitaloceanTerraform(inp) + specialized_builds[ + BuildType.DIGITALOCEAN_TERRAFORM + ] = DigitaloceanTerraform(inp) mixins: Dict[MixinType, Validateable] = {} if MixinType.RELEASE in mixin_types: diff --git a/src/main/python/ddadevops/domain/digitalocean_terraform.py b/src/main/python/ddadevops/domain/digitalocean_terraform.py index 98f541c..10585ce 100644 --- a/src/main/python/ddadevops/domain/digitalocean_terraform.py +++ b/src/main/python/ddadevops/domain/digitalocean_terraform.py @@ -19,4 +19,3 @@ class DigitaloceanTerraform(Validateable): result += self.__validate_is_not_empty__("do_spaces_access_id") result += self.__validate_is_not_empty__("do_spaces_secret_key") return result - diff --git a/src/test/python/domain/helper.py b/src/test/python/domain/helper.py index af6a9df..8dde2e8 100644 --- a/src/test/python/domain/helper.py +++ b/src/test/python/domain/helper.py @@ -36,7 +36,6 @@ def devops_config(overrides: dict) -> dict: "do_api_key": "api_key", "do_spaces_access_id": "spaces_id", "do_spaces_secret_key": "spaces_secret", - "release_type": "NONE", "release_main_branch": "main", "release_current_branch": "my_feature", diff --git a/src/test/python/domain/test_devops_factory.py b/src/test/python/domain/test_devops_factory.py index 4d470cb..2ea8d1b 100644 --- a/src/test/python/domain/test_devops_factory.py +++ b/src/test/python/domain/test_devops_factory.py @@ -1,6 +1,9 @@ import pytest from src.main.python.ddadevops.domain import ( - DevopsFactory, Version, BuildType, MixinType + DevopsFactory, + Version, + BuildType, + MixinType, ) @@ -42,7 +45,7 @@ def test_devops_factory(): "c4k_grafana_cloud_user": "user", "c4k_grafana_cloud_password": "password", }, - Version.from_str("1.0.0") + Version.from_str("1.0.0"), ) assert sut is not None assert sut.specialized_builds[BuildType.C4K] is not None @@ -59,7 +62,7 @@ def test_devops_factory(): "do_spaces_access_id": "spaces_id", "do_spaces_secret_key": "spaces_secret", }, - Version.from_str("1.0.0") + Version.from_str("1.0.0"), ) assert sut is not None assert sut.specialized_builds[BuildType.DIGITALOCEAN_TERRAFORM] is not None @@ -77,7 +80,7 @@ def test_devops_factory(): "release_current_branch": "my_feature", "release_config_file": "project.clj", }, - Version.from_str("1.0.0") + Version.from_str("1.0.0"), ) assert sut is not None assert sut.mixins[MixinType.RELEASE] is not None diff --git a/src/test/python/domain/test_digitalocean_terraform.py b/src/test/python/domain/test_digitalocean_terraform.py index 2e3bb32..7e6e6d5 100644 --- a/src/test/python/domain/test_digitalocean_terraform.py +++ b/src/test/python/domain/test_digitalocean_terraform.py @@ -1,15 +1,21 @@ from pybuilder.core import Project from pathlib import Path from src.main.python.ddadevops.domain import ( - BuildType, + BuildType, DigitaloceanTerraform, ) from .helper import devops_config def test_digitalocean_terraform(): - sut = DigitaloceanTerraform(devops_config({'do_api_key': 'api_key', - 'do_spaces_access_id': 'spaces_id', - 'do_spaces_secret_key': 'spaces_secret'})) + sut = DigitaloceanTerraform( + devops_config( + { + "do_api_key": "api_key", + "do_spaces_access_id": "spaces_id", + "do_spaces_secret_key": "spaces_secret", + } + ) + ) assert sut is not None assert sut.is_valid()