From 99f4e2f94efda1777dbafed4332e47408064cab4 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 28 Jan 2022 10:01:23 +0100 Subject: [PATCH 1/5] use dda_python_terraform instead of outdated ver --- infrastructure/devops-build/image/Dockerfile | 2 +- src/main/python/ddadevops/aws_backend_properties_mixin.py | 2 +- src/main/python/ddadevops/aws_mfa_mixin.py | 2 +- src/main/python/ddadevops/devops_docker_build.py | 2 +- src/main/python/ddadevops/devops_terraform_build.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/infrastructure/devops-build/image/Dockerfile b/infrastructure/devops-build/image/Dockerfile index 0b20733..b9eedf4 100644 --- a/infrastructure/devops-build/image/Dockerfile +++ b/infrastructure/devops-build/image/Dockerfile @@ -3,4 +3,4 @@ FROM docker:latest RUN set -eux; RUN apk add --no-cache build-base rust python3 python3-dev py3-pip py3-setuptools py3-wheel libffi-dev openssl-dev cargo; RUN python3 -m pip install -U pip; -RUN pip3 install pybuilder ddadevops deprecation python-terraform boto3 mfa; \ No newline at end of file +RUN pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 mfa; \ No newline at end of file diff --git a/src/main/python/ddadevops/aws_backend_properties_mixin.py b/src/main/python/ddadevops/aws_backend_properties_mixin.py index 29b3856..7a49bf3 100644 --- a/src/main/python/ddadevops/aws_backend_properties_mixin.py +++ b/src/main/python/ddadevops/aws_backend_properties_mixin.py @@ -1,4 +1,4 @@ -from python_terraform import * +from dda_python_terraform import * from .devops_terraform_build import DevopsTerraformBuild, Terraform diff --git a/src/main/python/ddadevops/aws_mfa_mixin.py b/src/main/python/ddadevops/aws_mfa_mixin.py index e100aaa..26ece3c 100644 --- a/src/main/python/ddadevops/aws_mfa_mixin.py +++ b/src/main/python/ddadevops/aws_mfa_mixin.py @@ -1,4 +1,4 @@ -from python_terraform import * +from dda_python_terraform import * from boto3 import * from .python_util import execute from .aws_backend_properties_mixin import AwsBackendPropertiesMixin diff --git a/src/main/python/ddadevops/devops_docker_build.py b/src/main/python/ddadevops/devops_docker_build.py index bec3977..4b2a431 100644 --- a/src/main/python/ddadevops/devops_docker_build.py +++ b/src/main/python/ddadevops/devops_docker_build.py @@ -30,7 +30,7 @@ class DevopsDockerBuild(DevopsBuild): def __init__(self, project, config): super().__init__(project, config) - project.build_depends_on('python-terraform') + project.build_depends_on('dda-python-terraform') self.dockerhub_user = config['dockerhub_user'] self.dockerhub_password = config['dockerhub_password'] self.use_package_common_files = config['use_package_common_files'] diff --git a/src/main/python/ddadevops/devops_terraform_build.py b/src/main/python/ddadevops/devops_terraform_build.py index 4da1b38..4cea3f1 100644 --- a/src/main/python/ddadevops/devops_terraform_build.py +++ b/src/main/python/ddadevops/devops_terraform_build.py @@ -2,7 +2,7 @@ from os import path from json import load, dumps from subprocess import run from pkg_resources import * -from python_terraform import * +from dda_python_terraform import * from .python_util import filter_none from .devops_build import DevopsBuild, create_devops_build_config import sys @@ -38,7 +38,7 @@ class DevopsTerraformBuild(DevopsBuild): def __init__(self, project, config): super().__init__(project, config) - project.build_depends_on('python-terraform') + project.build_depends_on('dda-python-terraform') self.additional_vars = config['additional_vars'] self.output_json_name = config['output_json_name'] self.use_workspace = config['use_workspace'] From 9cfbb345ccdaf16a70d7af2df830d17bb7625c3c Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 28 Jan 2022 10:03:55 +0100 Subject: [PATCH 2/5] added releasing steps to doc --- doc/releasing.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/releasing.md diff --git a/doc/releasing.md b/doc/releasing.md new file mode 100644 index 0000000..e8cbc0b --- /dev/null +++ b/doc/releasing.md @@ -0,0 +1,8 @@ +adjust version no in build.py to release version no. +git commit -am "release" +git tag -am "release" [release version no] +git push --follow-tags +increase version no in build.py +git commit -am "version bump" +git push +pip3 install --upgrade --user ddadevops \ No newline at end of file From 523407e6d811b946242771d5b6dce1f2f0ac806f Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 28 Jan 2022 10:04:42 +0100 Subject: [PATCH 3/5] release --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index 1db6f07..f5b304f 100644 --- a/build.py +++ b/build.py @@ -28,7 +28,7 @@ use_plugin("python.distutils") default_task = "publish" name = "ddadevops" -version = "0.13.4-dev" +version = "0.14.0" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" description = __doc__ authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")] From 9bff37b5313b6373685236c12b619006439cc78b Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 28 Jan 2022 10:05:26 +0100 Subject: [PATCH 4/5] version bump --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index f5b304f..b1a0479 100644 --- a/build.py +++ b/build.py @@ -28,7 +28,7 @@ use_plugin("python.distutils") default_task = "publish" name = "ddadevops" -version = "0.14.0" +version = "0.14.1-dev" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" description = __doc__ authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")] From 9b4b6bd03c505dd299174ffa5fe113cce1ae1b8c Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 28 Jan 2022 10:09:07 +0100 Subject: [PATCH 5/5] Revert last 4 commits --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index b1a0479..d0979d0 100644 --- a/build.py +++ b/build.py @@ -28,7 +28,7 @@ use_plugin("python.distutils") default_task = "publish" name = "ddadevops" -version = "0.14.1-dev" +version = "0.13.3" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" description = __doc__ authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]