Skip to content

Commit

Permalink
add Terraform 0.13 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
strebitz committed Jan 13, 2021
1 parent d60ec1c commit 24dd4b1
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 14 deletions.
40 changes: 35 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
24 changes: 20 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "..."
}
```

<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## 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

Expand Down
17 changes: 13 additions & 4 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 24dd4b1

Please sign in to comment.