diff --git a/.env b/.env index 4223d79..8ab5203 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ BUILD_HARNESS_REPO=ghcr.io/defenseunicorns/build-harness/build-harness # renovate: datasource=github-tags depName=defenseunicorns/build-harness -BUILD_HARNESS_VERSION=2.0.29 +BUILD_HARNESS_VERSION=2.0.43 diff --git a/.github/workflows/slash-command-dispatch.yml b/.github/workflows/slash-command-dispatch.yml index 4f2eb8a..80d5e61 100644 --- a/.github/workflows/slash-command-dispatch.yml +++ b/.github/workflows/slash-command-dispatch.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Get token id: get_workflow_token - uses: peter-murray/workflow-application-token-action@v3 + uses: peter-murray/workflow-application-token-action@v4 with: application_id: ${{ secrets.NARWHAL_BOT_APP_ID }} application_private_key: ${{ secrets.NARWHAL_BOT_SECRET }} @@ -35,7 +35,7 @@ jobs: steps: - name: Get token id: get_workflow_token - uses: peter-murray/workflow-application-token-action@v3 + uses: peter-murray/workflow-application-token-action@v4 with: application_id: ${{ secrets.NARWHAL_BOT_APP_ID }} application_private_key: ${{ secrets.NARWHAL_BOT_SECRET }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54dbd45..da04feb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-added-large-files args: ["--maxkb=1024"] @@ -17,7 +17,7 @@ repos: args: - "--allow-multiple-documents" - repo: https://github.com/sirosen/texthooks - rev: 0.6.6 + rev: 0.6.7 hooks: - id: fix-smartquotes - repo: https://github.com/tekwizely/pre-commit-golang @@ -30,7 +30,7 @@ repos: - "--verbose" - "--allow-parallel-runners" - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.92.0 + rev: v1.96.1 hooks: - id: terraform_fmt args: @@ -40,7 +40,7 @@ repos: - --args=--config=__GIT_WORKING_DIR__/.tflint.hcl - --hook-config=--tf-path=tofu - repo: https://github.com/tofuutils/pre-commit-opentofu - rev: v1.0.3 # Get the latest from: https://github.com/tofuutils/pre-commit-opentofu/releases + rev: v2.1.0 # Get the latest from: https://github.com/tofuutils/pre-commit-opentofu/releases hooks: - id: tofu_docs args: @@ -52,6 +52,6 @@ repos: args: - --args=--config-file __GIT_WORKING_DIR__/.checkov.yml - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 37.431.4 + rev: 38.138.0 hooks: - id: renovate-config-validator diff --git a/README.md b/README.md index 358219c..d08bb15 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ To view examples for how you can leverage this VPC Module, please see the [examp | Name | Source | Version | |------|--------|---------| -| [vpc](#module\_vpc) | git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git | v5.9.0 | -| [vpc\_endpoints](#module\_vpc\_endpoints) | git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git//modules/vpc-endpoints | v5.9.0 | +| [vpc](#module\_vpc) | git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git | v5.14.0 | +| [vpc\_endpoints](#module\_vpc\_endpoints) | git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git//modules/vpc-endpoints | v5.14.0 | ## Resources @@ -53,7 +53,7 @@ To view examples for how you can leverage this VPC Module, please see the [examp | [enable\_ses\_vpce](#input\_enable\_ses\_vpce) | Enable Simple Email Service endpoints for the VPC endpoints. | `bool` | `true` | no | | [flow\_log\_cloudwatch\_log\_group\_retention\_in\_days](#input\_flow\_log\_cloudwatch\_log\_group\_retention\_in\_days) | Specifies the number of days you want to retain log events in the specified log group for VPC flow logs | `number` | `365` | no | | [flow\_log\_log\_format](#input\_flow\_log\_log\_format) | The fields to include in the flow log record, in the order in which they should appear | `string` | `null` | no | -| [instance\_tenancy](#input\_instance\_tenancy) | Tenancy of instances launched into the VPC.
Valid values are "default" or "dedicated".
EKS does not support dedicated tenancy. | `string` | `"default"` | no | +| [instance\_tenancy](#input\_instance\_tenancy) | Tenancy of instances launched into the VPC.
Valid values are "default" or "dedicated".
EKS does not support dedicated tenancy. | `string` | `"default"` | no | | [intra\_subnet\_tags](#input\_intra\_subnet\_tags) | Tags to apply to intra subnets | `map(string)` | `{}` | no | | [intra\_subnets](#input\_intra\_subnets) | List of intra subnets inside the VPC | `list(string)` | `[]` | no | | [ip\_offsets\_per\_subnet](#input\_ip\_offsets\_per\_subnet) | List of offsets for IP reservations in each subnet. | `list(list(number))` | `null` | no | diff --git a/examples/complete/README.md b/examples/complete/README.md index 86aa9a6..c70036d 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -41,7 +41,7 @@ Example that uses the module with many of its configurations. Used in CI E2E tes | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [iam\_role\_permissions\_boundary](#input\_iam\_role\_permissions\_boundary) | ARN of a permissions boundary policy to use when creating IAM roles | `string` | `null` | no | -| [ip\_offsets\_per\_subnet](#input\_ip\_offsets\_per\_subnet) | List of offsets for IP reservations in each subnet. | `list(list(number))` | 
[
  [
    5,
    6
  ],
  [
    5,
    6
  ],
  [
    5
  ]
]
| no | +| [ip\_offsets\_per\_subnet](#input\_ip\_offsets\_per\_subnet) | List of offsets for IP reservations in each subnet. | `list(list(number))` | 
[
  [
    5,
    6
  ],
  [
    5,
    6
  ],
  [
    5
  ]
]
| no | | [name\_prefix](#input\_name\_prefix) | The prefix to use when naming all resources | `string` | `"ci"` | no | | [region](#input\_region) | The AWS region to deploy into | `string` | n/a | yes | | [tags](#input\_tags) | A map of tags to apply to all resources | `map(string)` | `{}` | no | diff --git a/go.mod b/go.mod index cd3d588..0380883 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.2 require ( github.com/defenseunicorns/delivery_aws_iac_utils v0.0.6 - github.com/gruntwork-io/terratest v0.47.0 + github.com/gruntwork-io/terratest v0.47.2 ) require ( @@ -43,7 +43,7 @@ require ( github.com/gruntwork-io/go-commons v0.8.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.5 // indirect + github.com/hashicorp/go-getter v1.7.6 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect diff --git a/go.sum b/go.sum index e40e20e..d22c195 100644 --- a/go.sum +++ b/go.sum @@ -408,6 +408,8 @@ github.com/gruntwork-io/terratest v0.46.16 h1:l+HHuU7lNLwoAl2sP8zkYJy0uoE2Mwha2n github.com/gruntwork-io/terratest v0.46.16/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM= github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c= github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM= +github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ= +github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -419,6 +421,8 @@ github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWS github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4= github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4= +github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= diff --git a/main.tf b/main.tf index 91d9e8a..2172b3c 100644 --- a/main.tf +++ b/main.tf @@ -16,7 +16,7 @@ locals { module "vpc" { #checkov:skip=CKV_TF_1: using ref to a specific version - source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v5.9.0" + source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git?ref=v5.14.0" name = var.name cidr = var.vpc_cidr @@ -87,7 +87,7 @@ resource "aws_ec2_subnet_cidr_reservation" "this" { module "vpc_endpoints" { #checkov:skip=CKV_TF_1: using ref to a specific version count = var.create_default_vpc_endpoints ? 1 : 0 - source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git//modules/vpc-endpoints?ref=v5.9.0" + source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git//modules/vpc-endpoints?ref=v5.14.0" vpc_id = module.vpc.vpc_id security_group_ids = [data.aws_security_group.default.id]