diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 09fd8af..63b3026 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.1 +current_version = 1.0.2 commit = True message = Bumps version to {new_version} tag = False diff --git a/.github/dependabot.yml b/.github/dependabot.yml index be00012..9b2566c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,17 +6,17 @@ updates: interval: daily open-pull-requests-limit: 10 - package-ecosystem: terraform - directory: "/tests/create_attachment" + directory: "/tests/cross-account-vpc-attachment" schedule: interval: daily open-pull-requests-limit: 10 -- package-ecosystem: pip - directory: "/" +- package-ecosystem: terraform + directory: "/tests/cross-region-peering-attachment" schedule: interval: daily open-pull-requests-limit: 10 -- package-ecosystem: gomod - directory: "/tests" +- package-ecosystem: terraform + directory: "/tests/tgw" schedule: interval: daily open-pull-requests-limit: 10 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de037c2..d47c9b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ - name: Update terraform dependencies on: + workflow_dispatch: schedule: - cron: '0 6 * * *' @@ -12,5 +12,9 @@ jobs: - name: update terraform dependencies uses: plus3it/dependabot-terraform-action@p3-implementation with: - github_dependency_token: 4224d33b8569bec8473980bb1bdb982639426a92 - + github_dependency_token: ${{ secrets.GH_READONLY_TOKEN }} + directory: | + / + /tests/cross-account-vpc-attachment + /tests/cross-region-peering-attachment + /tests/tgw diff --git a/.gitignore b/.gitignore index 39ed771..ff18f26 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,8 @@ .tardigrade-ci tardigrade-ci/ -# eclint -.git/ - # terratest tests/go.* + +# terraform lock file +.terraform.lock.hcl diff --git a/README.md b/README.md index fea8456..14bde9d 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,14 @@ This module includes several submodules for different workflows and use cases. | Name | Version | |------|---------| -| terraform | >= 0.13.0 | +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/main.tf b/main.tf index 733bb04..61c107f 100644 --- a/main.tf +++ b/main.tf @@ -1,7 +1,3 @@ -terraform { - required_version = ">= 0.13.0" -} - resource "aws_ec2_transit_gateway" "this" { amazon_side_asn = var.amazon_side_asn auto_accept_shared_attachments = var.auto_accept_shared_attachments diff --git a/modules/cross-account-vpc-attachment/README.md b/modules/cross-account-vpc-attachment/README.md index c0ad130..f424230 100644 --- a/modules/cross-account-vpc-attachment/README.md +++ b/modules/cross-account-vpc-attachment/README.md @@ -5,13 +5,16 @@ Terraform module for managing a cross-account Transit Gateway VPC Attachment. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws.owner | n/a | +| aws.owner | >= 3.0 | ## Inputs diff --git a/modules/cross-account-vpc-attachment/versions.tf b/modules/cross-account-vpc-attachment/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/cross-account-vpc-attachment/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/cross-region-peering-attachment/README.md b/modules/cross-region-peering-attachment/README.md index 79ac593..4eae273 100644 --- a/modules/cross-region-peering-attachment/README.md +++ b/modules/cross-region-peering-attachment/README.md @@ -6,7 +6,10 @@ may be the same or different accounts, but must be different regions. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers diff --git a/modules/cross-region-peering-attachment/versions.tf b/modules/cross-region-peering-attachment/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/cross-region-peering-attachment/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/peering-accepter/README.md b/modules/peering-accepter/README.md index 64b4ca5..05a7630 100644 --- a/modules/peering-accepter/README.md +++ b/modules/peering-accepter/README.md @@ -5,13 +5,16 @@ Terraform module for managing a Transit Gateway Peering Attachment Accepter. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/modules/peering-accepter/versions.tf b/modules/peering-accepter/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/peering-accepter/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/peering-attachment/README.md b/modules/peering-attachment/README.md index 40910a0..f2c5046 100644 --- a/modules/peering-attachment/README.md +++ b/modules/peering-attachment/README.md @@ -5,13 +5,16 @@ Terraform module for managing a Transit Gateway Peering Attachment. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/modules/peering-attachment/versions.tf b/modules/peering-attachment/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/peering-attachment/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/route-table/README.md b/modules/route-table/README.md index 4be6643..9edd4e6 100644 --- a/modules/route-table/README.md +++ b/modules/route-table/README.md @@ -5,13 +5,16 @@ Terraform module for managing a Transit Gateway Route Table. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/modules/route-table/versions.tf b/modules/route-table/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/route-table/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/route/README.md b/modules/route/README.md index 0c546b0..240e7d9 100644 --- a/modules/route/README.md +++ b/modules/route/README.md @@ -5,13 +5,16 @@ Terraform module for managing a Transit Gateway Route. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/modules/route/versions.tf b/modules/route/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/route/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/vpc-accepter/README.md b/modules/vpc-accepter/README.md index cc5c198..e53ceca 100644 --- a/modules/vpc-accepter/README.md +++ b/modules/vpc-accepter/README.md @@ -7,13 +7,16 @@ Gateway route table association or propagations, and VPC routes. ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/modules/vpc-accepter/versions.tf b/modules/vpc-accepter/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/vpc-accepter/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/modules/vpc-attachment/README.md b/modules/vpc-attachment/README.md index 79dba3c..dc41023 100644 --- a/modules/vpc-attachment/README.md +++ b/modules/vpc-attachment/README.md @@ -6,13 +6,16 @@ as well as any Transit Gateway route table association or propagations, and VPC ## Requirements -No requirements. +| Name | Version | +|------|---------| +| terraform | >= 0.13 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | n/a | +| aws | >= 3.0 | ## Inputs diff --git a/modules/vpc-attachment/versions.tf b/modules/vpc-attachment/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/modules/vpc-attachment/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +} diff --git a/requirements/dev.txt b/requirements/dev.txt deleted file mode 100644 index 7d4d4c6..0000000 --- a/requirements/dev.txt +++ /dev/null @@ -1 +0,0 @@ -black==21.5b0 diff --git a/tests/cross-account-vpc-attachment/main.tf b/tests/cross-account-vpc-attachment/main.tf index 59b7eaf..def9363 100644 --- a/tests/cross-account-vpc-attachment/main.tf +++ b/tests/cross-account-vpc-attachment/main.tf @@ -168,7 +168,7 @@ module "ram_share_accepter" { } module "vpc_member" { - source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v2.57.0" + source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v3.0.0" name = "tardigrade-tgw-${local.id}" cidr = "10.1.0.0/16" @@ -177,7 +177,7 @@ module "vpc_member" { } module "vpc_owner" { - source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v2.57.0" + source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v3.0.0" providers = { aws = aws.owner } diff --git a/tests/tgw/main.tf b/tests/tgw/main.tf index 6b31780..3afd81a 100644 --- a/tests/tgw/main.tf +++ b/tests/tgw/main.tf @@ -132,7 +132,7 @@ locals { } module "vpc1" { - source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v2.57.0" + source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v3.0.0" name = "tardigrade-testing-vpc1-${local.id}" cidr = "10.0.0.0/16" @@ -141,7 +141,7 @@ module "vpc1" { } module "vpc2" { - source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v2.57.0" + source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v3.0.0" name = "tardigrade-testing-vpc2-${local.id}" cidr = "10.1.0.0/16" diff --git a/versions.tf b/versions.tf new file mode 100644 index 0000000..34260e6 --- /dev/null +++ b/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 3.0" + } + } +}