format
This commit is contained in:
parent
20edebf61c
commit
b24288976e
5 changed files with 20 additions and 11 deletions
|
@ -27,7 +27,9 @@ class DevopsFactory:
|
||||||
if BuildType.TERRAFORM in build_types:
|
if BuildType.TERRAFORM in build_types:
|
||||||
specialized_builds[BuildType.TERRAFORM] = TerraformDomain(inp)
|
specialized_builds[BuildType.TERRAFORM] = TerraformDomain(inp)
|
||||||
if BuildType.DIGITALOCEAN_TERRAFORM in build_types:
|
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] = {}
|
mixins: Dict[MixinType, Validateable] = {}
|
||||||
if MixinType.RELEASE in mixin_types:
|
if MixinType.RELEASE in mixin_types:
|
||||||
|
|
|
@ -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_access_id")
|
||||||
result += self.__validate_is_not_empty__("do_spaces_secret_key")
|
result += self.__validate_is_not_empty__("do_spaces_secret_key")
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,6 @@ def devops_config(overrides: dict) -> dict:
|
||||||
"do_api_key": "api_key",
|
"do_api_key": "api_key",
|
||||||
"do_spaces_access_id": "spaces_id",
|
"do_spaces_access_id": "spaces_id",
|
||||||
"do_spaces_secret_key": "spaces_secret",
|
"do_spaces_secret_key": "spaces_secret",
|
||||||
|
|
||||||
"release_type": "NONE",
|
"release_type": "NONE",
|
||||||
"release_main_branch": "main",
|
"release_main_branch": "main",
|
||||||
"release_current_branch": "my_feature",
|
"release_current_branch": "my_feature",
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
import pytest
|
import pytest
|
||||||
from src.main.python.ddadevops.domain import (
|
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_user": "user",
|
||||||
"c4k_grafana_cloud_password": "password",
|
"c4k_grafana_cloud_password": "password",
|
||||||
},
|
},
|
||||||
Version.from_str("1.0.0")
|
Version.from_str("1.0.0"),
|
||||||
)
|
)
|
||||||
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
|
||||||
|
@ -59,7 +62,7 @@ def test_devops_factory():
|
||||||
"do_spaces_access_id": "spaces_id",
|
"do_spaces_access_id": "spaces_id",
|
||||||
"do_spaces_secret_key": "spaces_secret",
|
"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 is not None
|
||||||
assert sut.specialized_builds[BuildType.DIGITALOCEAN_TERRAFORM] 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_current_branch": "my_feature",
|
||||||
"release_config_file": "project.clj",
|
"release_config_file": "project.clj",
|
||||||
},
|
},
|
||||||
Version.from_str("1.0.0")
|
Version.from_str("1.0.0"),
|
||||||
)
|
)
|
||||||
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
|
||||||
|
|
|
@ -1,15 +1,21 @@
|
||||||
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 (
|
||||||
BuildType,
|
BuildType,
|
||||||
DigitaloceanTerraform,
|
DigitaloceanTerraform,
|
||||||
)
|
)
|
||||||
from .helper import devops_config
|
from .helper import devops_config
|
||||||
|
|
||||||
|
|
||||||
def test_digitalocean_terraform():
|
def test_digitalocean_terraform():
|
||||||
sut = DigitaloceanTerraform(devops_config({'do_api_key': 'api_key',
|
sut = DigitaloceanTerraform(
|
||||||
'do_spaces_access_id': 'spaces_id',
|
devops_config(
|
||||||
'do_spaces_secret_key': 'spaces_secret'}))
|
{
|
||||||
|
"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 not None
|
||||||
assert sut.is_valid()
|
assert sut.is_valid()
|
||||||
|
|
Loading…
Reference in a new issue