Skip to content
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

Release 12.9.0 -- simplify scheduled tasks #260

Merged
merged 9 commits into from
Sep 12, 2024
+103 −393
Merged

Release 12.9.0 -- simplify scheduled tasks #260

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
f62aef6
extract a task module for ECS scheduled tasks
briskt Sep 9, 2024
587c671
use the broker web task definition for cron, but with containerOverrides
briskt Sep 9, 2024
abbd0d0
missed removing one of the moved resources
briskt Sep 9, 2024
904c683
left the unique_name but I meant to remove it
briskt Sep 9, 2024
7842dd5
add back the unique_name
briskt Sep 9, 2024
b1659e6
Merge remote-tracking branch 'origin/main' into task-module
briskt Sep 10, 2024
d2547be
remove moved blocks for scheduled task resources
briskt Sep 10, 2024
8d84c7f
update terraform-modules and AWS provider
briskt Sep 10, 2024
f42c57d
use published task module and update AWS to v5
briskt Sep 11, 2024
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 terraform/000-core/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Create ECS cluster
*/
module "ecscluster" {
source = "github.com/silinternational/terraform-modules//aws/ecs/cluster?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecs/cluster?ref=8.13.1"
cluster_name = var.cluster_name
}

Expand Down
2 changes: 1 addition & 1 deletion terraform/000-core/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
cloudflare = {
source = "cloudflare/cloudflare"
Expand Down
16 changes: 10 additions & 6 deletions terraform/010-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
* Create VPC
*/
module "vpc" {
source = "github.com/silinternational/terraform-modules//aws/vpc?ref=8.7.0"
source = "silinternational/vpc/aws"
version = "~> 1.0"

app_name = var.app_name
app_env = var.app_env
aws_zones = var.aws_zones
Expand All @@ -20,7 +22,7 @@ module "vpc" {
* Security group to limit traffic to Cloudflare IPs
*/
module "cloudflare-sg" {
source = "github.com/silinternational/terraform-modules//aws/cloudflare-sg?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/cloudflare-sg?ref=8.13.1"
vpc_id = module.vpc.id
}

Expand All @@ -41,7 +43,7 @@ data "aws_ami" "ecs_ami" {
* Create auto-scaling group
*/
module "asg" {
source = "github.com/silinternational/terraform-modules//aws/asg?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/asg?ref=8.13.1"
app_name = var.app_name
app_env = var.app_env
aws_instance = var.aws_instance
Expand All @@ -65,7 +67,9 @@ data "aws_acm_certificate" "wildcard" {
* Create application load balancer for public access
*/
module "alb" {
source = "github.com/silinternational/terraform-modules//aws/alb?ref=8.7.0"
source = "silinternational/alb/aws"
version = "~> 1.0"

app_name = var.app_name
app_env = var.app_env
internal = "false"
Expand All @@ -79,7 +83,7 @@ module "alb" {
* Create application load balancer for internal use
*/
module "internal_alb" {
source = "github.com/silinternational/terraform-modules//aws/alb?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/alb?ref=8.13.1"
alb_name = "alb-${var.app_name}-${var.app_env}-int"
app_name = var.app_name
app_env = var.app_env
Expand Down Expand Up @@ -111,7 +115,7 @@ module "ecs-service-cloudwatch-dashboard" {
count = var.create_dashboard ? 1 : 0

source = "silinternational/ecs-service-cloudwatch-dashboard/aws"
version = "~> 3.0.1"
version = "~> 3.1"

cluster_name = var.ecs_cluster_name
dashboard_name = "${var.app_name}-${var.app_env}-${data.aws_region.current.name}"
Expand Down
2 changes: 1 addition & 1 deletion terraform/010-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
}
}
2 changes: 1 addition & 1 deletion terraform/020-database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "random_id" "db_root_pass" {
}

module "rds" {
source = "github.com/silinternational/terraform-modules//aws/rds/mariadb?ref=8.8.0"
source = "github.com/silinternational/terraform-modules//aws/rds/mariadb?ref=8.13.1"
app_name = var.app_name
app_env = var.app_env
db_name = var.db_name
Expand Down
2 changes: 1 addition & 1 deletion terraform/020-database/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
random = {
source = "hashicorp/random"
Expand Down
8 changes: 4 additions & 4 deletions terraform/022-ecr/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* id-broker
*/
module "ecr_idbroker" {
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.13.1"
repo_name = "${var.idp_name}/id-broker"
ecsInstanceRole_arn = var.ecsInstanceRole_arn
ecsServiceRole_arn = var.ecsServiceRole_arn
Expand All @@ -15,7 +15,7 @@ module "ecr_idbroker" {
* pw-api
*/
module "ecr_pwapi" {
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.13.1"
repo_name = "${var.idp_name}/pw-api"
ecsInstanceRole_arn = var.ecsInstanceRole_arn
ecsServiceRole_arn = var.ecsServiceRole_arn
Expand All @@ -28,7 +28,7 @@ module "ecr_pwapi" {
* simplesamlphp
*/
module "ecr_simplesamlphp" {
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.13.1"
repo_name = "${var.idp_name}/simplesamlphp"
ecsInstanceRole_arn = var.ecsInstanceRole_arn
ecsServiceRole_arn = var.ecsServiceRole_arn
Expand All @@ -41,7 +41,7 @@ module "ecr_simplesamlphp" {
* id-sync
*/
module "ecr_idsync" {
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecr?ref=8.13.1"
repo_name = "${var.idp_name}/id-sync"
ecsInstanceRole_arn = var.ecsInstanceRole_arn
ecsServiceRole_arn = var.ecsServiceRole_arn
Expand Down
2 changes: 1 addition & 1 deletion terraform/022-ecr/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
}
}
2 changes: 1 addition & 1 deletion terraform/030-phpmyadmin/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "phpmyadmin" {
source = "silinternational/phpmyadmin/aws"
version = "~> 1.1.3"
version = "~> 1.2"
app_name = "${var.idp_name}-${var.app_name}"
app_env = var.app_env
vpc_id = var.vpc_id
Expand Down
2 changes: 1 addition & 1 deletion terraform/030-phpmyadmin/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
cloudflare = {
source = "cloudflare/cloudflare"
Expand Down
4 changes: 2 additions & 2 deletions terraform/031-email-service/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ locals {
}

module "ecsservice_api" {
source = "github.com/silinternational/terraform-modules//aws/ecs/service-only?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecs/service-only?ref=8.13.1"
cluster_id = var.ecs_cluster_id
service_name = "${var.idp_name}-${var.app_name}-api"
service_env = var.app_env
Expand Down Expand Up @@ -188,7 +188,7 @@ locals {
}

module "ecsservice_cron" {
source = "github.com/silinternational/terraform-modules//aws/ecs/service-no-alb?ref=8.7.0"
source = "github.com/silinternational/terraform-modules//aws/ecs/service-no-alb?ref=8.13.1"
cluster_id = var.ecs_cluster_id
service_name = "${var.idp_name}-${var.app_name}-cron"
service_env = var.app_env
Expand Down
2 changes: 1 addition & 1 deletion terraform/031-email-service/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
cloudflare = {
source = "cloudflare/cloudflare"
Expand Down
87 changes: 14 additions & 73 deletions terraform/032-db-backup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,50 +113,19 @@ locals {
})
}

/*
* Create role for scheduled running of cron task definitions.
*/
resource "aws_iam_role" "ecs_events" {
name = "ecs_events-${var.idp_name}-${var.app_name}-${var.app_env}"

assume_role_policy = jsonencode(
{
Version = "2012-10-17"
Statement = [
{
Sid = ""
Effect = "Allow"
Principal = {
Service = "events.amazonaws.com"
},
Action = "sts:AssumeRole"
},
]
}
)
}

resource "aws_iam_role_policy" "ecs_events_run_task_with_any_role" {
name = "ecs_events_run_task_with_any_role"
role = aws_iam_role.ecs_events.id

policy = jsonencode(
{
Version = "2012-10-17"
Statement = [
{
Effect = "Allow"
Action = "iam:PassRole"
Resource = "*"
},
{
Effect = "Allow"
Action = "ecs:RunTask"
Resource = "${aws_ecs_task_definition.cron_td.arn_without_revision}:*"
},
]
}
)
module "backup_task" {
source = "silinternational/scheduled-ecs-task/aws"
version = "0.1.0"

name = "${var.idp_name}-${var.app_name}-${var.app_env}"
event_rule_description = "Start scheduled backup"
event_schedule = local.event_schedule
ecs_cluster_arn = var.ecs_cluster_id
task_definition_arn = aws_ecs_task_definition.cron_td.arn
tags = {
app_name = var.app_name
app_env = var.app_env
}
}

/*
Expand All @@ -172,42 +141,14 @@ locals {
event_schedule = var.cron_schedule != "" ? var.cron_schedule : var.event_schedule
}

/*
* CloudWatch configuration to start scheduled backup.
*/
resource "aws_cloudwatch_event_rule" "event_rule" {
name = "${var.idp_name}-${var.app_name}-${var.app_env}"
description = "Start scheduled backup"

schedule_expression = local.event_schedule

tags = {
app_name = var.app_name
app_env = var.app_env
}
}

resource "aws_cloudwatch_event_target" "backup_event_target" {
target_id = "${var.idp_name}-${var.app_name}-${var.app_env}"
rule = aws_cloudwatch_event_rule.event_rule.name
arn = var.ecs_cluster_id
role_arn = aws_iam_role.ecs_events.arn

ecs_target {
task_count = 1
launch_type = "EC2"
task_definition_arn = aws_ecs_task_definition.cron_td.arn
}
}

/*
* AWS backup
*/
module "aws_backup" {
count = var.enable_aws_backup ? 1 : 0

source = "silinternational/backup/aws"
version = "0.2.0"
version = "~> 0.2.0"

app_name = var.idp_name
app_env = var.app_env
Expand Down
2 changes: 1 addition & 1 deletion terraform/032-db-backup/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
version = ">= 4.0.0, < 6.0.0"
}
}
}
Loading
Loading