Skip to content

feature: Add auto_confirm_sns_subscription flag for civiform_alert_subscription #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
osajulian-dev wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feature: Add auto_confirm_sns_subscription flag for civiform_alert_subscription #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb92235
feature: Add auto_confirm_sns_subscription flag for civiform_alert_su…
osajulian-dev Jul 1, 2025
959de8c
Fix: Apply terraform fmt to alarms.tf
osajulian-dev Jul 1, 2025
b3e5a33
Update Terraform aws to v6 (#490)
renovate[bot] Jun 26, 2025
d6254a0
Update Terraform azurerm to v4.34.0 (#493)
renovate[bot] Jun 27, 2025
5fec4b6
Update Terraform cn-terraform/cloudwatch-logs/aws to v1.0.13 (#494)
renovate[bot] Jun 27, 2025
dc72f89
Update Terraform terraform-aws-modules/vpc/aws to v6 (#492)
renovate[bot] Jun 27, 2025
80e5757
Update Terraform cn-terraform/ecs-cluster/aws to v1.0.12 (#495)
renovate[bot] Jun 27, 2025
067d137
chore: Temporarily enable `auto_confirm_sns_subscription` by default …
osajulian-dev Jul 14, 2025
21c7d71
chore: revert `auto_confirm_sns_subscription` default value to false
osajulian-dev Jul 15, 2025
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
2 changes: 1 addition & 1 deletion cloud/aws/modules/pgadmin/task.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module "pgadmin_container_def" {
}
module "pgadmin_logs" {
source = "cn-terraform/cloudwatch-logs/aws"
version = "1.0.12"
version = "1.0.13"
logs_path = "${local.name_prefix}-logs/"
tags = {
Name = "${var.app_prefix} CiviForm pgAdmin Cloud Watch Logs"
Expand Down
2 changes: 1 addition & 1 deletion cloud/aws/modules/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.100.0"
version = "6.0.0"
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions cloud/aws/templates/aws_oidc/alarms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ resource "aws_sns_topic" "civiform_alert_topic" {
}

resource "aws_sns_topic_subscription" "civiform_alert_subscription" {
count = var.civiform_alarm_email != "" ? 1 : 0
topic_arn = aws_sns_topic.civiform_alert_topic[0].arn
protocol = "email"
endpoint = var.civiform_alarm_email
count = var.civiform_alarm_email != "" ? 1 : 0
topic_arn = aws_sns_topic.civiform_alert_topic[0].arn
protocol = "email"
endpoint = var.civiform_alarm_email
endpoint_auto_confirms = var.auto_confirm_sns_subscription
}

locals {
Expand Down
6 changes: 3 additions & 3 deletions cloud/aws/templates/aws_oidc/app.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "ecs_cluster" {
source = "cn-terraform/ecs-cluster/aws"
version = "1.0.11"
version = "1.0.12"
name = "${var.app_prefix}-civiform"
tags = {
Name = "${var.app_prefix} Civiform ECS Cluster"
Expand All @@ -11,7 +11,7 @@ module "ecs_cluster" {
# TODO: reconcile with other logs bucket. We should only have one.
module "aws_cw_logs" {
source = "cn-terraform/cloudwatch-logs/aws"
version = "1.0.12"
version = "1.0.13"
logs_path = "${var.app_prefix}-civiformlogs/"
tags = {
Name = "${var.app_prefix} Civiform Cloud Watch Logs"
Expand All @@ -21,7 +21,7 @@ module "aws_cw_logs" {

module "aws_scraper_logs" {
source = "cn-terraform/cloudwatch-logs/aws"
version = "1.0.12"
version = "1.0.13"
logs_path = "${var.app_prefix}-civiform-scraper-logs/"
tags = {
Name = "${var.app_prefix} Scraper Logs"
Expand Down
2 changes: 1 addition & 1 deletion cloud/aws/templates/aws_oidc/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.100.0"
version = "6.0.0"
}
}
backend "s3" {}
Expand Down
5 changes: 5 additions & 0 deletions cloud/aws/templates/aws_oidc/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,3 +578,8 @@ variable "delete_automated_db_backups" {
type = bool
default = false
}
variable "auto_confirm_sns_subscription" {
description = "Whether to auto-confirm SNS topic subscription automatically."
type = bool
default = false
}
2 changes: 1 addition & 1 deletion cloud/aws/templates/aws_oidc/vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ locals {

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "5.21.0"
version = "6.0.1"

count = local.enable_managed_vpc ? 1 : 0

Expand Down
2 changes: 1 addition & 1 deletion cloud/azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
azurerm = {
source = "azurerm"
version = "4.33.0"
version = "4.34.0"
}
random = {}
}
Expand Down
4 changes: 2 additions & 2 deletions cloud/azure/templates/azure_saml_ses/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.100.0"
version = "6.0.0"
}
azurerm = {
source = "azurerm"
version = "4.33.0"
version = "4.34.0"
}
random = {}
}
Expand Down