Skip to content

Commit 24dd4b1

Browse files
committed
add Terraform 0.13 compatibility
1 parent d60ec1c commit 24dd4b1

File tree

4 files changed

+76
-14
lines changed

4 files changed

+76
-14
lines changed

.gitignore

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,38 @@
1-
# Compiled files
2-
*.tfplan
1+
# Created by https://www.toptal.com/developers/gitignore/api/terraform
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=terraform
33

4+
### Terraform ###
5+
# Local .terraform directories
6+
**/.terraform/*
7+
8+
# .tfstate files
49
*.tfstate
5-
*.tfstate.backup
10+
*.tfstate.*
611

7-
terraform.tfvars
8-
**/.terraform/*
12+
# Crash log files
13+
crash.log
14+
15+
# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
16+
# .tfvars files are managed as part of configuration and so should be included in
17+
# version control.
18+
#
19+
# example.tfvars
20+
21+
# Ignore override files as they are usually used to override resources locally and so
22+
# are not checked in
23+
override.tf
24+
override.tf.json
25+
*_override.tf
26+
*_override.tf.json
27+
28+
# Include override files you do wish to add to version control using negated pattern
29+
# !example_override.tf
30+
31+
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
32+
# example: *tfplan*
33+
34+
# End of https://www.toptal.com/developers/gitignore/api/terraform
35+
36+
37+
### This is a Terraform module, the dependency lock file must not be included
38+
.terraform.lock.hcl

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [2.1.0] - 2021-01-13
8+
9+
- Add Terraform 0.13 compatibility
10+
- enable required Google Cloud Platform service APIs
11+
- update required project IAM roles granted to the service account
12+
713
## [2.0.0] - 2019-09-18
814

915
- 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.
1319

1420
- Initial release
1521

16-
[Unreleased]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v2.0.0...HEAD
22+
[Unreleased]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v2.1.0...HEAD
23+
[2.1.0]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v2.0.0...v2.1.0
1724
[2.0.0]: https://github.com/nephosolutions/terraform-google-gcp-project/compare/v1.0.0...v2.0.0
1825
[1.0.0]: https://github.com/nephosolutions/terraform-google-gcp-project/releases/tag/v1.0.0

README.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,35 @@ This Terraform module integrates a Google Cloud Platform project into Datadog
77
```hcl
88
module "datadog_integration" {
99
source = "nephosolutions/datadog-integration/google"
10-
version = "2.0.0"
10+
version = "2.1.0"
1111
1212
project_id = "..."
1313
}
1414
```
1515

1616
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
17+
## Requirements
18+
19+
| Name | Version |
20+
|------|---------|
21+
| terraform | >= 0.12.26 |
22+
| datadog | >= 1.9 |
23+
| google | >= 2.10 |
24+
| random | >= 2.0 |
25+
26+
## Providers
27+
28+
| Name | Version |
29+
|------|---------|
30+
| datadog | >= 1.9 |
31+
| google | >= 2.10 |
32+
1733
## Inputs
1834

1935
| Name | Description | Type | Default | Required |
20-
|------|-------------|:----:|:-----:|:-----:|
21-
| host\_filters | List of key:value pairs for host tags / labels to filter Datadog montoring | list(string) | `[]` | no |
22-
| project\_id | The ID of the GCP project that the service account will be created in. | string | `""` | no |
36+
|------|-------------|------|---------|:--------:|
37+
| host\_filters | List of key:value pairs for host tags / labels to filter Datadog montoring | `list(string)` | `[]` | no |
38+
| project\_id | The ID of the GCP project that the service account will be created in. | `string` | `""` | no |
2339

2440
## Outputs
2541

versions.tf

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,18 @@
1414

1515
terraform {
1616
required_providers {
17-
datadog = ">= 1.9"
18-
google = ">= 2.10"
19-
random = ">= 2.0"
17+
datadog = {
18+
source = "datadog/datadog"
19+
version = ">= 1.9"
20+
}
21+
google = {
22+
source = "hashicorp/google"
23+
version = ">= 2.10"
24+
}
25+
random = {
26+
source = "hashicorp/random"
27+
version = ">= 2.0"
28+
}
2029
}
21-
required_version = ">= 0.12.6"
30+
required_version = ">= 0.12.26"
2231
}

0 commit comments

Comments
 (0)