From 24dd4b1712f87d7770914ddf6f87afbe90331fe4 Mon Sep 17 00:00:00 2001 From: Sebastian Trebitz Date: Wed, 13 Jan 2021 20:16:22 +0100 Subject: [PATCH] add Terraform 0.13 compatibility --- .gitignore | 40 +++++++++++++++++++++++++++++++++++----- CHANGELOG.md | 9 ++++++++- README.md | 24 ++++++++++++++++++++---- versions.tf | 17 +++++++++++++---- 4 files changed, 76 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 8220326..e0d0d8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,38 @@ -# Compiled files -*.tfplan +# Created by https://www.toptal.com/developers/gitignore/api/terraform +# Edit at https://www.toptal.com/developers/gitignore?templates=terraform +### Terraform ### +# Local .terraform directories +**/.terraform/* + +# .tfstate files *.tfstate -*.tfstate.backup +*.tfstate.* -terraform.tfvars -**/.terraform/* +# Crash log files +crash.log + +# Ignore any .tfvars files that are generated automatically for each Terraform run. Most +# .tfvars files are managed as part of configuration and so should be included in +# version control. +# +# example.tfvars + +# Ignore override files as they are usually used to override resources locally and so +# are not checked in +override.tf +override.tf.json +*_override.tf +*_override.tf.json + +# Include override files you do wish to add to version control using negated pattern +# !example_override.tf + +# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan +# example: *tfplan* + +# End of https://www.toptal.com/developers/gitignore/api/terraform + + +### This is a Terraform module, the dependency lock file must not be included +.terraform.lock.hcl diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb29f5..746230a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [2.1.0] - 2021-01-13 + +- Add Terraform 0.13 compatibility +- enable required Google Cloud Platform service APIs +- update required project IAM roles granted to the service account + ## [2.0.0] - 2019-09-18 - Update to nephosolutions/iam-service-account/google v3.0.0 @@ -13,6 +19,7 @@ All notable changes to this project will be documented in this file. - Initial release -[Unreleased]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v2.0.0...HEAD +[Unreleased]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v2.1.0...HEAD +[2.1.0]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v2.0.0...v2.1.0 [2.0.0]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v1.0.0...v2.0.0 [1.0.0]: https://github.com/nephosolutions/terraform-google-gcp-project/releases/tag/v1.0.0 diff --git a/README.md b/README.md index 154e23a..9b7a8b1 100644 --- a/README.md +++ b/README.md @@ -7,19 +7,35 @@ This Terraform module integrates a Google Cloud Platform project into Datadog ```hcl module "datadog_integration" { source = "nephosolutions/datadog-integration/google" - version = "2.0.0" + version = "2.1.0" project_id = "..." } ``` +## Requirements + +| Name | Version | +|------|---------| +| terraform | >= 0.12.26 | +| datadog | >= 1.9 | +| google | >= 2.10 | +| random | >= 2.0 | + +## Providers + +| Name | Version | +|------|---------| +| datadog | >= 1.9 | +| google | >= 2.10 | + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| host\_filters | List of key:value pairs for host tags / labels to filter Datadog montoring | list(string) | `[]` | no | -| project\_id | The ID of the GCP project that the service account will be created in. | string | `""` | no | +|------|-------------|------|---------|:--------:| +| host\_filters | List of key:value pairs for host tags / labels to filter Datadog montoring | `list(string)` | `[]` | no | +| project\_id | The ID of the GCP project that the service account will be created in. | `string` | `""` | no | ## Outputs diff --git a/versions.tf b/versions.tf index 536e82f..d086bf5 100644 --- a/versions.tf +++ b/versions.tf @@ -14,9 +14,18 @@ terraform { required_providers { - datadog = ">= 1.9" - google = ">= 2.10" - random = ">= 2.0" + datadog = { + source = "datadog/datadog" + version = ">= 1.9" + } + google = { + source = "hashicorp/google" + version = ">= 2.10" + } + random = { + source = "hashicorp/random" + version = ">= 2.0" + } } - required_version = ">= 0.12.6" + required_version = ">= 0.12.26" }