Skip to content

Commit

Permalink
feat!: Upgraded version of Terraform, AWS Provider, and added gRPC_tl…
Browse files Browse the repository at this point in the history
…s port for Consul v1.14.x (#284)

Co-authored-by: Ralph Stoichita <ralph.stoichita@hdi.de>
Co-authored-by: Anton Babenko <anton@antonbabenko.com>
  • Loading branch information
3 people committed Jun 1, 2023
1 parent a0abc9d commit 0093dca
Show file tree
Hide file tree
Showing 134 changed files with 197 additions and 196 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.76.0
rev: v1.80.0
hooks:
- id: terraform_fmt
- id: terraform_validate
Expand All @@ -9,7 +9,7 @@ repos:
args:
- '--args=--lockfile=false'
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-merge-conflict
- id: end-of-file-fixer
6 changes: 3 additions & 3 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/complete/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand All @@ -40,7 +40,7 @@ Note that this example may create resources which cost money. Run `terraform des
| <a name="module_main_sg"></a> [main\_sg](#module\_main\_sg) | ../../ | n/a |
| <a name="module_only_rules"></a> [only\_rules](#module\_only\_rules) | ../../ | n/a |
| <a name="module_prefix_list"></a> [prefix\_list](#module\_prefix\_list) | ../../ | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |

## Resources

Expand Down
2 changes: 1 addition & 1 deletion examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data "aws_security_group" "default" {
##################################################
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0"
version = "~> 5.0"

name = "complete-sg-demo-vpc"
cidr = "10.20.0.0/20"
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/computed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion examples/computed/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/disabled/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion examples/disabled/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/http/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion examples/http/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion examples/rules-only/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion examples/rules-only/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/_templates/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/activemq/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "activemq_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/activemq"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **activemq module** is using are available [here](https://g

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/activemq/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/alertmanager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "alertmanager_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/alertmanager"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **alertmanager module** is using are available [here](https

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/alertmanager/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/carbon-relay-ng/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "carbon_relay-ng_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/carbon-relay-ng"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **carbon-relay-ng module** is using are available [here](ht

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/carbon-relay-ng/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/cassandra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "cassandra_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/cassandra"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **cassandra module** is using are available [here](https://

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/cassandra/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
6 changes: 3 additions & 3 deletions modules/consul/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "consul_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/consul"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **consul module** is using are available [here](https://git

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand All @@ -45,7 +45,7 @@ No resources.
| <a name="input_auto_computed_ingress_with_self"></a> [auto\_computed\_ingress\_with\_self](#input\_auto\_computed\_ingress\_with\_self) | List of maps defining computed ingress rules with self to add automatically | `list(map(string))` | `[]` | no |
| <a name="input_auto_egress_rules"></a> [auto\_egress\_rules](#input\_auto\_egress\_rules) | List of egress rules to add automatically | `list(string)` | <pre>[<br> "all-all"<br>]</pre> | no |
| <a name="input_auto_egress_with_self"></a> [auto\_egress\_with\_self](#input\_auto\_egress\_with\_self) | List of maps defining egress rules with self to add automatically | `list(map(string))` | `[]` | no |
| <a name="input_auto_ingress_rules"></a> [auto\_ingress\_rules](#input\_auto\_ingress\_rules) | List of ingress rules to add automatically | `list(string)` | <pre>[<br> "consul-tcp",<br> "consul-grpc-tcp",<br> "consul-webui-http-tcp",<br> "consul-webui-https-tcp",<br> "consul-dns-tcp",<br> "consul-dns-udp",<br> "consul-serf-lan-tcp",<br> "consul-serf-lan-udp",<br> "consul-serf-wan-tcp",<br> "consul-serf-wan-udp"<br>]</pre> | no |
| <a name="input_auto_ingress_rules"></a> [auto\_ingress\_rules](#input\_auto\_ingress\_rules) | List of ingress rules to add automatically | `list(string)` | <pre>[<br> "consul-tcp",<br> "consul-grpc-tcp",<br> "consul-grpc-tcp-tls",<br> "consul-webui-http-tcp",<br> "consul-webui-https-tcp",<br> "consul-dns-tcp",<br> "consul-dns-udp",<br> "consul-serf-lan-tcp",<br> "consul-serf-lan-udp",<br> "consul-serf-wan-tcp",<br> "consul-serf-wan-udp"<br>]</pre> | no |
| <a name="input_auto_ingress_with_self"></a> [auto\_ingress\_with\_self](#input\_auto\_ingress\_with\_self) | List of maps defining ingress rules with self to add automatically | `list(map(string))` | <pre>[<br> {<br> "rule": "all-all"<br> }<br>]</pre> | no |
| <a name="input_auto_number_of_computed_egress_rules"></a> [auto\_number\_of\_computed\_egress\_rules](#input\_auto\_number\_of\_computed\_egress\_rules) | Number of computed egress rules to create by name | `number` | `0` | no |
| <a name="input_auto_number_of_computed_egress_with_self"></a> [auto\_number\_of\_computed\_egress\_with\_self](#input\_auto\_number\_of\_computed\_egress\_with\_self) | Number of computed egress rules to create where 'self' is defined | `number` | `0` | no |
Expand Down
2 changes: 1 addition & 1 deletion modules/consul/auto_values.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
variable "auto_ingress_rules" {
description = "List of ingress rules to add automatically"
type = list(string)
default = ["consul-tcp", "consul-grpc-tcp", "consul-webui-http-tcp", "consul-webui-https-tcp", "consul-dns-tcp", "consul-dns-udp", "consul-serf-lan-tcp", "consul-serf-lan-udp", "consul-serf-wan-tcp", "consul-serf-wan-udp"]
default = ["consul-tcp", "consul-grpc-tcp", "consul-grpc-tcp-tls", "consul-webui-http-tcp", "consul-webui-https-tcp", "consul-dns-tcp", "consul-dns-udp", "consul-serf-lan-tcp", "consul-serf-lan-udp", "consul-serf-wan-tcp", "consul-serf-wan-udp"]
}

variable "auto_ingress_with_self" {
Expand Down
2 changes: 1 addition & 1 deletion modules/consul/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/dax-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "dax_cluster_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/dax-cluster"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **dax-cluster module** is using are available [here](https:

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/dax-cluster/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/docker-swarm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "docker_swarm_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/docker-swarm"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **docker-swarm module** is using are available [here](https

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/docker-swarm/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "elasticsearch_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/elasticsearch"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **elasticsearch module** is using are available [here](http

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/elasticsearch/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/etcd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "etcd_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/etcd"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **etcd module** is using are available [here](https://githu

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/etcd/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.1"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions modules/grafana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```hcl
module "grafana_security_group" {
source = "terraform-aws-modules/security-group/aws//modules/grafana"
version = "~> 4.0"
version = "~> 5.0"
# omitted...
}
Expand All @@ -18,7 +18,7 @@ All automatic values **grafana module** is using are available [here](https://gi

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.29 |

## Providers
Expand Down

0 comments on commit 0093dca

Please sign in to comment.