Skip to content
This repository was archived by the owner on Nov 26, 2025. It is now read-only.

Added validation 'db_use_mtls' variable and updated min tf req to 1.9.0 #374

Closed
wants to merge 1 commit into from
Closed

Added validation 'db_use_mtls' variable and updated min tf req to 1.9.0 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/auto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
persist-credentials: false

- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 0.14.7
terraform_version: 1.9.0

- name: Format all .tf files recursively
run: |
Expand All @@ -46,21 +46,21 @@ jobs:
persist-credentials: false

- name: Setup Terraform Lint
uses: terraform-linters/setup-tflint@ba6bb2989f94daf58a4cc6eac2c1ca7398a678bf # v3.0.0
uses: terraform-linters/setup-tflint@ae78205cfffec9e8d93fd2b3115c7e9d3166d4b6 # v5.0.0
with:
tflint_version: v0.26.0
tflint_version: v0.59.1

- name: Lint root module
run: |
tflint --config ${{ github.workspace }}/.tflint.hcl ${{ github.workspace }}
tflint --config ${{ github.workspace }}/.tflint.hcl --chdir ${{ github.workspace }}

- name: Lint modules directory in a loop
run: |
for m in $(ls -1d modules/*/)
do
tflint \
--config ${{ github.workspace }}/.tflint.hcl \
${{ github.workspace }}/${m}
--chdir ${{ github.workspace }}/${m}
done

- name: Lint tests directory in a loop
Expand All @@ -69,7 +69,7 @@ jobs:
do
tflint \
--config ${{ github.workspace }}/.tflint.hcl \
${{ github.workspace }}/${m}
--chdir ${{ github.workspace }}/${m}
done

- name: Lint examples directory in a loop
Expand All @@ -78,5 +78,5 @@ jobs:
do
tflint \
--config ${{ github.workspace }}/.tflint.hcl \
${{ github.workspace }}/${m}
--chdir ${{ github.workspace }}/${m}
done
2 changes: 1 addition & 1 deletion .tflint.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: MPL-2.0

config {
module = false
call_module_type = "none"
force = false
disabled_by_default = false
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ As the goal for this main module is to provide a drop-in solution for installing

This module is intended to run in an AWS account with minimal preparation, however it does have the following pre-requisites:

### Terraform version >= 0.14
### Terraform version >= 1.9.0
Copy link

@tauhid621 tauhid621 Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could there be any implications of the version bump for existing infra which uses this module?

Copy link
Author

@skj-skj skj-skj Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, as cross referencing variable in validation block is available from 1.9.0, so consumer of this module needs to use terraform version 1.9.0+


This module requires Terraform version `0.14` or greater to be installed on the running machine.
This module requires Terraform version `1.9.0` or greater to be installed on the running machine.

### Credentials / Permissions

Expand Down
1 change: 0 additions & 1 deletion locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ locals {
standard_db = try(module.database[0], local.default_database)

selected_database = (
Copy link

@tauhid621 tauhid621 Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if we used to get error from this earlier?
If yes, was it during a later stage?

Copy link
Author

@skj-skj skj-skj Sep 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, earlier also we used to get error, but it wasn't descriptive
image

and yes it was running at later stage, as previously it will create plan for resouce blocks and reads from data blocks which uses/depends on db_use_mtls variable. it will now only run these blocks when validation pass.

var.enable_aurora && var.db_use_mtls ? error("Both enable_aurora and db_use_mtls cannot be true.") :
var.enable_aurora ? local.aurora_database :
var.db_use_mtls ? local.mtls_database :
local.standard_db
Expand Down
4 changes: 2 additions & 2 deletions modules/redis-sentinel/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ locals {
redis_username = local.redis_username
redis_password = local.redis_password
}))
lbname = "${aws_route53_record.sentinel.fqdn}"
lbname = aws_route53_record.sentinel.fqdn
compose = var.enable_sentinel_mtls ? base64encode(templatefile(local.compose_path_tls, {
redis_sentinel_port = var.redis_sentinel_port
redis_port = var.redis_port
Expand All @@ -30,7 +30,7 @@ locals {
redis_sentinel_leader_name = var.sentinel_leader
redis_sentinel_port = var.redis_sentinel_port
redis_port = var.redis_port
lbname = "${aws_route53_record.sentinel.fqdn}"
lbname = aws_route53_record.sentinel.fqdn
})) : base64encode(templatefile(local.sentinel_start_script_path, {
redis_sentinel_password = local.sentinel_password
redis_sentinel_username = local.sentinel_username
Expand Down
4 changes: 4 additions & 0 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@ variable "db_use_mtls" {
type = bool
description = "Whether or not to use mutual TLS to access database. Defaults to false if no value is given."
default = false
validation {
condition = !(var.db_use_mtls && var.enable_aurora)
error_message = "Both db_use_mtls and enable_aurora cannot be true at the same time."
}
}

variable "postgres_ca_certificate_secret_id" {
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: MPL-2.0

terraform {
required_version = ">= 0.14"
required_version = ">= 1.9.0"
required_providers {
aws = {
source = "hashicorp/aws"
Expand Down
Loading