From bf4f31cfcc5b0ea7ca7b550eec5a946f2e018d0c Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 15:20:21 +0200 Subject: [PATCH 1/7] Drop support for TF before 1.0 --- README.md | 6 +++--- examples/custom-vpc-with-vault/README.md | 6 +++--- examples/custom-vpc-with-vault/main.tf | 2 +- examples/custom-vpc-with-vault/versions.tf | 4 ++-- main.tf | 2 +- modules/consul-cluster/README.md | 10 +++++----- modules/consul-cluster/security-groups.tf | 4 ++-- modules/consul-cluster/versions.tf | 4 ++-- modules/vault-cluster/README.md | 6 +++--- modules/vault-cluster/versions.tf | 4 ++-- versions.tf | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 214b746..c8ce74e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ module "aws_vault" { | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4 | +| [aws](#provider\_aws) | >= 5 | | [template](#provider\_template) | n/a | @@ -55,8 +55,8 @@ module "aws_vault" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 4 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 5 | diff --git a/examples/custom-vpc-with-vault/README.md b/examples/custom-vpc-with-vault/README.md index f520d60..75546d8 100644 --- a/examples/custom-vpc-with-vault/README.md +++ b/examples/custom-vpc-with-vault/README.md @@ -22,8 +22,8 @@ Note that this example may create resources which can cost money (AWS Elastic IP | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 5 | ## Providers @@ -33,7 +33,7 @@ No providers. | Name | Source | Version | |------|--------|---------| -| [aws\_vpc](#module\_aws\_vpc) | github.com/Flaconi/terraform-modules-vpc | v2.1.0 | +| [aws\_vpc](#module\_aws\_vpc) | github.com/Flaconi/terraform-modules-vpc | v3.0.0 | | [aws\_vault](#module\_aws\_vault) | ../.. | n/a | ## Resources diff --git a/examples/custom-vpc-with-vault/main.tf b/examples/custom-vpc-with-vault/main.tf index a479278..e6d1e8d 100644 --- a/examples/custom-vpc-with-vault/main.tf +++ b/examples/custom-vpc-with-vault/main.tf @@ -2,7 +2,7 @@ # VPC # ------------------------------------------------------------------------------------------------- module "aws_vpc" { - source = "github.com/Flaconi/terraform-modules-vpc?ref=v2.1.0" + source = "github.com/Flaconi/terraform-modules-vpc?ref=v3.0.0" # VPC Definition vpc_cidr = "40.10.0.0/16" diff --git a/examples/custom-vpc-with-vault/versions.tf b/examples/custom-vpc-with-vault/versions.tf index f0001a1..5ef3c40 100644 --- a/examples/custom-vpc-with-vault/versions.tf +++ b/examples/custom-vpc-with-vault/versions.tf @@ -2,8 +2,8 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3" + version = ">= 5" } } - required_version = ">= 0.13" + required_version = ">= 1.0" } diff --git a/main.tf b/main.tf index 8a3b6e9..8dc3fee 100644 --- a/main.tf +++ b/main.tf @@ -33,7 +33,7 @@ module "consul_iam_policies_servers" { } module "vault_elb" { - source = "github.com/Flaconi/terraform-aws-elb?ref=v1.1.0" + source = "github.com/Flaconi/terraform-aws-elb?ref=v2.0.0" name = var.vault_cluster_name vpc_id = var.vpc_id diff --git a/modules/consul-cluster/README.md b/modules/consul-cluster/README.md index 041c4b2..24ec55c 100644 --- a/modules/consul-cluster/README.md +++ b/modules/consul-cluster/README.md @@ -16,23 +16,23 @@ rules. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 4 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 5 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4 | +| [aws](#provider\_aws) | >= 5 | | [null](#provider\_null) | n/a | ## Modules | Name | Source | Version | |------|--------|---------| -| [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 | +| [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 | | [iam\_policies](#module\_iam\_policies) | github.com/hashicorp/terraform-aws-consul//modules/consul-iam-policies | v0.11.0 | -| [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 | +| [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 | ## Resources diff --git a/modules/consul-cluster/security-groups.tf b/modules/consul-cluster/security-groups.tf index 7dc9c7a..4bd085a 100644 --- a/modules/consul-cluster/security-groups.tf +++ b/modules/consul-cluster/security-groups.tf @@ -1,6 +1,6 @@ module "attach_security_group" { source = "terraform-aws-modules/security-group/aws" - version = "4.7.0" + version = "5.1.0" name = "${var.cluster_name}-att" description = "Null Placeholder security group for other instances to use as destination to access ${var.cluster_name}" @@ -38,7 +38,7 @@ module "attach_security_group" { module "lc_security_group" { source = "terraform-aws-modules/security-group/aws" - version = "4.7.0" + version = "5.1.0" name = var.cluster_name description = "Security group for the ${var.cluster_name} launch configuration" diff --git a/modules/consul-cluster/versions.tf b/modules/consul-cluster/versions.tf index 716ce4e..5ef3c40 100644 --- a/modules/consul-cluster/versions.tf +++ b/modules/consul-cluster/versions.tf @@ -2,8 +2,8 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4" + version = ">= 5" } } - required_version = ">= 0.13" + required_version = ">= 1.0" } diff --git a/modules/vault-cluster/README.md b/modules/vault-cluster/README.md index f0ea953..11a1b49 100644 --- a/modules/vault-cluster/README.md +++ b/modules/vault-cluster/README.md @@ -36,14 +36,14 @@ machines. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 4 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 5 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4 | +| [aws](#provider\_aws) | >= 5 | | [null](#provider\_null) | n/a | ## Modules diff --git a/modules/vault-cluster/versions.tf b/modules/vault-cluster/versions.tf index 716ce4e..5ef3c40 100644 --- a/modules/vault-cluster/versions.tf +++ b/modules/vault-cluster/versions.tf @@ -2,8 +2,8 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4" + version = ">= 5" } } - required_version = ">= 0.13" + required_version = ">= 1.0" } diff --git a/versions.tf b/versions.tf index 716ce4e..5ef3c40 100644 --- a/versions.tf +++ b/versions.tf @@ -2,8 +2,8 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4" + version = ">= 5" } } - required_version = ">= 0.13" + required_version = ">= 1.0" } From 6fff941be89db88307e07e0a2ce9510f21b2c670 Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 15:20:38 +0200 Subject: [PATCH 2/7] Update Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a425945..1648352 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,9 @@ TF_MODULES = $(sort $(dir $(wildcard $(CURRENT_DIR)modules/*/))) # Container versions # ------------------------------------------------------------------------------------------------- TF_VERSION = 1.0.11 -TFDOCS_VERSION = 0.16.0-0.31 -FL_VERSION = 0.4 -JL_VERSION = 1.6.0-0.5 +TFDOCS_VERSION = 0.16.0-0.34 +FL_VERSION = latest-0.8 +JL_VERSION = 1.6.0-0.14 # ------------------------------------------------------------------------------------------------- From 97896ff7fa299126e3ce42d9dac6dd642bc8c966 Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 15:20:53 +0200 Subject: [PATCH 3/7] Fix release-drafter permissions --- .github/workflows/release-drafter.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index e627dfd..11b9d8f 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -6,8 +6,13 @@ on: branches: - master +permissions: + contents: read + jobs: update_release_draft: + permissions: + contents: write runs-on: ubuntu-latest steps: - uses: release-drafter/release-drafter@v5 From 19c5455226717597f69e1d282f6509deb9f783a3 Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 15:35:51 +0200 Subject: [PATCH 4/7] Update sg modules --- modules/vault-cluster/security-groups.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/vault-cluster/security-groups.tf b/modules/vault-cluster/security-groups.tf index b64bd88..991a2ff 100644 --- a/modules/vault-cluster/security-groups.tf +++ b/modules/vault-cluster/security-groups.tf @@ -1,6 +1,6 @@ module "attach_security_group" { source = "terraform-aws-modules/security-group/aws" - version = "4.7.0" + version = "5.1.0" name = "${var.cluster_name}-att" description = "Null Placeholder security group for other instances to use as destination to access ${var.cluster_name}" @@ -38,7 +38,7 @@ module "attach_security_group" { module "lc_security_group" { source = "terraform-aws-modules/security-group/aws" - version = "4.7.0" + version = "5.1.0" name = var.cluster_name description = "Security group for the ${var.cluster_name} launch configuration" From 4ce0e508aba8f7af73064b97dd6350dd1443d0a5 Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 15:36:18 +0200 Subject: [PATCH 5/7] Update sg modules --- modules/vault-cluster/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/vault-cluster/README.md b/modules/vault-cluster/README.md index 11a1b49..8cd7d5e 100644 --- a/modules/vault-cluster/README.md +++ b/modules/vault-cluster/README.md @@ -50,8 +50,8 @@ machines. | Name | Source | Version | |------|--------|---------| -| [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 | -| [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 4.7.0 | +| [attach\_security\_group](#module\_attach\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 | +| [lc\_security\_group](#module\_lc\_security\_group) | terraform-aws-modules/security-group/aws | 5.1.0 | ## Resources From 40a115a71f8c54b414b1fb22b59c7cb2a341daf0 Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 15:56:55 +0200 Subject: [PATCH 6/7] Update examples --- examples/custom-vpc-with-vault/README.md | 2 +- examples/custom-vpc-with-vault/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/custom-vpc-with-vault/README.md b/examples/custom-vpc-with-vault/README.md index 75546d8..0a27a7b 100644 --- a/examples/custom-vpc-with-vault/README.md +++ b/examples/custom-vpc-with-vault/README.md @@ -33,7 +33,7 @@ No providers. | Name | Source | Version | |------|--------|---------| -| [aws\_vpc](#module\_aws\_vpc) | github.com/Flaconi/terraform-modules-vpc | v3.0.0 | +| [aws\_vpc](#module\_aws\_vpc) | github.com/Flaconi/terraform-modules-vpc | v4.0.0 | | [aws\_vault](#module\_aws\_vault) | ../.. | n/a | ## Resources diff --git a/examples/custom-vpc-with-vault/main.tf b/examples/custom-vpc-with-vault/main.tf index e6d1e8d..58e0875 100644 --- a/examples/custom-vpc-with-vault/main.tf +++ b/examples/custom-vpc-with-vault/main.tf @@ -2,7 +2,7 @@ # VPC # ------------------------------------------------------------------------------------------------- module "aws_vpc" { - source = "github.com/Flaconi/terraform-modules-vpc?ref=v3.0.0" + source = "github.com/Flaconi/terraform-modules-vpc?ref=v4.0.0" # VPC Definition vpc_cidr = "40.10.0.0/16" From 9837a4e1d0ad0edb0f21af4fbb432db317e39bbc Mon Sep 17 00:00:00 2001 From: Sergey Novikov Date: Wed, 7 Jun 2023 17:19:40 +0200 Subject: [PATCH 7/7] Fix AMI filter --- README.md | 2 +- variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c8ce74e..f66bce9 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,7 @@ Default: ```json [ - "vault-consul-ubuntu-*" + "vault-consul-ubuntu18-*" ] ``` diff --git a/variables.tf b/variables.tf index c7e8544..25db109 100644 --- a/variables.tf +++ b/variables.tf @@ -120,7 +120,7 @@ variable "kms_alias_name" { variable "ami_name_filter" { description = "Name filter to help pick the AMI." - default = ["vault-consul-ubuntu-*"] + default = ["vault-consul-ubuntu18-*"] type = list(string) }