diff --git a/build.py b/build.py index 9f36416..43a9973 100644 --- a/build.py +++ b/build.py @@ -28,7 +28,7 @@ use_plugin("python.distutils") default_task = "publish" name = "ddadevops" -version = "0.9.2-dev" +version = "0.9.2" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" description = __doc__ authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")] diff --git a/src/main/python/ddadevops/aws_backend_properties_mixin.py b/src/main/python/ddadevops/aws_backend_properties_mixin.py index d114638..396d9a8 100644 --- a/src/main/python/ddadevops/aws_backend_properties_mixin.py +++ b/src/main/python/ddadevops/aws_backend_properties_mixin.py @@ -24,6 +24,7 @@ class AwsBackendPropertiesMixin(DevopsTerraformBuild): def copy_build_resources_from_package(self): super().copy_build_resources_from_package() + self.copy_build_resource_file_from_package('provider_registry.tf') self.copy_build_resource_file_from_package('aws_provider.tf') self.copy_build_resource_file_from_package( 'aws_backend_properties_vars.tf') diff --git a/src/main/resources/terraform/aws_provider.tf b/src/main/resources/terraform/aws_provider.tf index 7f0e5d6..dc58d9a 100644 --- a/src/main/resources/terraform/aws_provider.tf +++ b/src/main/resources/terraform/aws_provider.tf @@ -1,12 +1,3 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 3.0" - } - } -} - provider "aws" { region = var.region } diff --git a/src/main/resources/terraform/hetzner_provider.tf b/src/main/resources/terraform/hetzner_provider.tf index d8099e4..4a5d3fe 100644 --- a/src/main/resources/terraform/hetzner_provider.tf +++ b/src/main/resources/terraform/hetzner_provider.tf @@ -1,14 +1,4 @@ # Configure the Hetzner Cloud Provider -terraform { - required_providers { - hcloud = { - source = "hetznercloud/hcloud" # this whole block is important - version = "1.23.0" - } - } - required_version = ">= 0.13" -} - provider "hcloud" { token = var.hetzner_api_key }