Compare commits

..

No commits in common. "483c2b8bbae784311bcf0f1012301932483e87b9" and "9517e9081e97860c692007e22b365cd2cc6c59e0" have entirely different histories.

9 changed files with 35 additions and 38 deletions

View file

@ -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-dev" version = "4.3.1-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")]

View file

@ -6,7 +6,7 @@ from ddadevops import *
name = "ddadevops" name = "ddadevops"
MODULE = "clj-cljs" MODULE = "clj-cljs"
PROJECT_ROOT_PATH = "../.." PROJECT_ROOT_PATH = "../.."
version = "4.3.2-dev" version = "4.3.1-dev"
@init @init
def initialize(project): def initialize(project):

View file

@ -6,7 +6,7 @@ from ddadevops import *
name = "ddadevops" name = "ddadevops"
MODULE = "clj" MODULE = "clj"
PROJECT_ROOT_PATH = "../.." PROJECT_ROOT_PATH = "../.."
version = "4.3.2-dev" version = "4.3.1-dev"
@init @init
def initialize(project): def initialize(project):

View file

@ -6,7 +6,7 @@ from ddadevops import *
name = "ddadevops" name = "ddadevops"
MODULE = "ddadevops" MODULE = "ddadevops"
PROJECT_ROOT_PATH = "../.." PROJECT_ROOT_PATH = "../.."
version = "4.3.2-dev" version = "4.3.1-dev"
@init @init

View file

@ -6,7 +6,7 @@ from ddadevops import *
name = "ddadevops" name = "ddadevops"
MODULE = "dind" MODULE = "dind"
PROJECT_ROOT_PATH = "../.." PROJECT_ROOT_PATH = "../.."
version = "4.3.2-dev" version = "4.3.1-dev"
@init @init

View file

@ -6,7 +6,7 @@ from ddadevops import *
name = "ddadevops" name = "ddadevops"
MODULE = "python" MODULE = "python"
PROJECT_ROOT_PATH = "../.." PROJECT_ROOT_PATH = "../.."
version = "4.3.2-dev" version = "4.3.1-dev"
@init @init

View file

@ -1,44 +1,47 @@
from pybuilder.core import Project from pybuilder.core import Project
from .devops_build import DevopsBuild from .devops_build import DevopsBuild
from .domain import MixinType
# """ """
# Functional Req: Functional Req:
# General process for deploying prebuilt (meissa) binaries to our own repo server. General process for deploying prebuilt (meissa) binaries to our own repo server.
# [0] [0]
# get artifact deployment url get artifact deployment url
# [1] [1]
# build ubejarServer build ubejarServer
# build ubejarDesktop build ubejarDesktop
# build ubejarSyspec build ubejarSyspec
# [2] [2]
# get release token get release token
# [3] [3]
# get release tag get release tag
# [4] [4]
# post a json message containting [3] to [0], watching stdout for answers post a json message containting [3] to [0], watching stdout for answers
# authorized by [2] authorized by [2]
# validate if [4] was successful by reading stdout validate if [4] was successful by reading stdout
# or create error message containing ID of release or create error message containing ID of release
# [5] [5]
# get release-id get release-id
# print release-id print release-id
# [6] [6]
# generate sha256 sums & generate sha512 sums of results of [1] generate sha256 sums & generate sha512 sums of results of [1]
# [7] [7]
# push results of [1] & [6] to [0]/[5] push results of [1] & [6] to [0]/[5]
"""
# """
class ArtifactDeploymentMixin(DevopsBuild): class ArtifactDeploymentMixin(DevopsBuild):
def __init__(self, project: Project, inp: dict): def __init__(self, project: Project, inp: dict):
super().__init__(project, inp) super().__init__(project, inp)

View file

@ -36,8 +36,6 @@ class Aws(Validateable, CredentialMappingDefault):
result = {} result = {}
if self.aws_as_backend: if self.aws_as_backend:
result = { result = {
"access_key": self.aws_access_key,
"secret_key": self.aws_secret_key,
"bucket": self.aws_bucket, "bucket": self.aws_bucket,
"key": self.__bucket_key__(), "key": self.__bucket_key__(),
"region": self.aws_region, "region": self.aws_region,

View file

@ -41,8 +41,6 @@ def test_should_calculate_backend_config():
{ {
"module": "dns_aws", "module": "dns_aws",
"stage": "prod", "stage": "prod",
"aws_access_key": "aws_access_key",
"aws_secret_key": "aws_secret_key",
"aws_bucket": "meissa-configuration", "aws_bucket": "meissa-configuration",
"aws_bucket_kms_key_id": "arn:aws:kms:eu-central-1:907507348333:alias/meissa-configuration", "aws_bucket_kms_key_id": "arn:aws:kms:eu-central-1:907507348333:alias/meissa-configuration",
"aws_region": "eu-central-1", "aws_region": "eu-central-1",
@ -50,8 +48,6 @@ def test_should_calculate_backend_config():
) )
) )
assert { assert {
"access_key": "aws_access_key",
"secret_key": "aws_secret_key",
"bucket": "meissa-configuration", "bucket": "meissa-configuration",
"key": "prod/dns_aws", "key": "prod/dns_aws",
"kms_key_id": "arn:aws:kms:eu-central-1:907507348333:alias/meissa-configuration", "kms_key_id": "arn:aws:kms:eu-central-1:907507348333:alias/meissa-configuration",