diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 259def4..7f9f794 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,9 +9,9 @@ repos: exclude: common/*.tf exclude: version.tf exclude: examples - - id: terraform_tflint - args: [ "--args=--config=__GIT_WORKING_DIR__/.tflint.hcl"] - exclude: examples +# - id: terraform_tflint +# args: [ "--args=--config=__GIT_WORKING_DIR__/.tflint.hcl"] +# exclude: examples - repo: https://github.com/pre-commit/pre-commit-hooks rev: v3.4.0 hooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9986d8b..1c49de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -119,3 +119,9 @@ - fix up vpn_config_output ## Version 2.x + +* 2.0.0 -- 2022-05-09 + - common + - change versions.tf to add trevx/ldap + - flowlogs-role + - source aws-iam-role?ref=tf-upgrade diff --git a/common/version.tf b/common/version.tf index e9c9d85..6b49608 100644 --- a/common/version.tf +++ b/common/version.tf @@ -1,3 +1,3 @@ locals { - _module_version = "1.6.3" + _module_version = "2.0.0" } diff --git a/common/versions.tf b/common/versions.tf index 9fb912a..0459582 100644 --- a/common/versions.tf +++ b/common/versions.tf @@ -1,4 +1,3 @@ -# for tf 0.13+, ignored in tf 0.12 terraform { required_providers { aws = { @@ -17,6 +16,10 @@ terraform { source = "hashicorp/template" version = ">= 2.0" } + ldap = { + source = "trevex/ldap" + version = ">= 0.5.4" + } } - # required_version = ">= 0.13" + required_version = ">= 0.13" } diff --git a/flowlogs-role/README.md b/flowlogs-role/README.md index 67b0450..2cedace 100644 --- a/flowlogs-role/README.md +++ b/flowlogs-role/README.md @@ -15,19 +15,26 @@ module "role_flowlogs" { ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 0.13 | +| [aws](#requirement\_aws) | >= 3.66.0 | +| [ldap](#requirement\_ldap) | >= 0.5.4 | +| [null](#requirement\_null) | >= 3.0 | +| [random](#requirement\_random) | >= 3.0 | +| [template](#requirement\_template) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | n/a | +| [aws](#provider\_aws) | >= 3.66.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [flowlogs](#module\_flowlogs) | git@github.e.it.census.gov:terraform-modules/aws-iam-role.git | | +| [flowlogs](#module\_flowlogs) | git@github.e.it.census.gov:terraform-modules/aws-iam-role.git | tf-upgrade | ## Resources diff --git a/flowlogs-role/main.tf b/flowlogs-role/main.tf index 8d5777c..e808267 100644 --- a/flowlogs-role/main.tf +++ b/flowlogs-role/main.tf @@ -32,7 +32,7 @@ locals { } module "flowlogs" { - source = "git@github.e.it.census.gov:terraform-modules/aws-iam-role.git" + source = "git@github.e.it.census.gov:terraform-modules/aws-iam-role.git?ref=tf-upgrade" role_name = "inf-flowlogs" enable_ldap_creation = false