Skip to content

Commit

Permalink
use the broker web task definition for cron, but with containerOverrides
Browse files Browse the repository at this point in the history
  • Loading branch information
@briskt
briskt committed Sep 9, 2024
1 parent f62aef6 commit 587c671
Showing 1 changed file with 16 additions and 131 deletions.
147 changes: 16 additions & 131 deletions terraform/040-id-broker/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,133 +212,28 @@ module "ecsservice" {
task_role_arn = one(module.ecs_role[*].role_arn)
}

/*
* Create ECS service
*/
locals {
task_def_cron = templatefile("${path.module}/task-definition.json", {
appconfig_app_id = local.appconfig_app_id
appconfig_env_id = local.appconfig_env_id
appconfig_config_id = local.appconfig_config_id
api_access_keys = local.api_access_keys
abandoned_user_abandoned_period = var.abandoned_user_abandoned_period
abandoned_user_best_practice_url = var.abandoned_user_best_practice_url
abandoned_user_deactivate_instructions_url = var.abandoned_user_deactivate_instructions_url
app_env = var.app_env
app_name = var.app_name
aws_region = local.aws_region
cloudwatch_log_group_name = var.cloudwatch_log_group_name
cpu = var.cpu_cron
contingent_user_duration = var.contingent_user_duration
db_name = var.db_name
docker_image = var.docker_image
email_repeat_delay_days = var.email_repeat_delay_days
email_service_accessToken = var.email_service_accessToken
email_service_assertValidIp = var.email_service_assertValidIp
email_service_baseUrl = var.email_service_baseUrl
email_service_validIpRanges = join(",", var.email_service_validIpRanges)
email_signature = var.email_signature
ga_api_secret = var.ga_api_secret
ga_client_id = var.ga_client_id
ga_measurement_id = var.ga_measurement_id
google_config = local.google_vars
help_center_url = var.help_center_url
hibp_check_interval = var.hibp_check_interval
hibp_check_on_login = var.hibp_check_on_login
hibp_grace_period = var.hibp_grace_period
hibp_tracking_only = var.hibp_tracking_only
hibp_notification_bcc = var.hibp_notification_bcc
hr_notifications_email = var.hr_notifications_email
idp_display_name = var.idp_display_name
idp_name = var.idp_name
inactive_user_period = var.inactive_user_period
inactive_user_deletion_enable = var.inactive_user_deletion_enable
invite_email_delay_seconds = var.invite_email_delay_seconds
invite_grace_period = var.invite_grace_period
invite_lifespan = var.invite_lifespan
lost_security_key_email_days = var.lost_security_key_email_days
memory = var.memory_cron
method_add_interval = var.method_add_interval
method_codeLength = var.method_codeLength
method_gracePeriod = var.method_gracePeriod
method_lifetime = var.method_lifetime
method_maxAttempts = var.method_maxAttempts
mfa_add_interval = var.mfa_add_interval
mfa_allow_disable = var.mfa_allow_disable
mfa_lifetime = var.mfa_lifetime
mfa_manager_bcc = var.mfa_manager_bcc
mfa_manager_help_bcc = var.mfa_manager_help_bcc
mfa_required_for_new_users = var.mfa_required_for_new_users
mfa_totp_apibaseurl = var.mfa_totp_apibaseurl
mfa_totp_apikey = var.mfa_totp_apikey
mfa_totp_apisecret = var.mfa_totp_apisecret
mfa_webauthn_apibaseurl = var.mfa_webauthn_apibaseurl
mfa_webauthn_apikey = var.mfa_webauthn_apikey
mfa_webauthn_apisecret = var.mfa_webauthn_apisecret
mfa_webauthn_appid = var.mfa_webauthn_appid
mfa_webauthn_rpdisplayname = var.mfa_webauthn_rpdisplayname
mfa_webauthn_rpid = var.mfa_webauthn_rpid
rp_origins = var.rp_origins
minimum_backup_codes_before_nag = var.minimum_backup_codes_before_nag
mysql_host = var.mysql_host
mysql_pass = var.mysql_pass
mysql_user = var.mysql_user
name = "cron"
notification_email = var.notification_email
password_expiration_grace_period = var.password_expiration_grace_period
password_lifespan = var.password_lifespan
password_mfa_lifespan_extension = var.password_mfa_lifespan_extension
password_profile_url = var.password_profile_url
password_reuse_limit = var.password_reuse_limit
profile_review_interval = var.profile_review_interval
run_task = var.run_task
send_get_backup_codes_emails = var.send_get_backup_codes_emails
send_invite_emails = var.send_invite_emails
send_lost_security_key_emails = var.send_lost_security_key_emails
send_method_purged_emails = var.send_method_purged_emails
send_method_reminder_emails = var.send_method_reminder_emails
send_mfa_disabled_emails = var.send_mfa_disabled_emails
send_mfa_enabled_emails = var.send_mfa_enabled_emails
send_mfa_option_added_emails = var.send_mfa_option_added_emails
send_mfa_option_removed_emails = var.send_mfa_option_removed_emails
send_mfa_rate_limit_emails = var.send_mfa_rate_limit_emails
send_password_changed_emails = var.send_password_changed_emails
send_password_expired_emails = var.send_password_expired_emails
send_password_expiring_emails = var.send_password_expiring_emails
send_refresh_backup_codes_emails = var.send_refresh_backup_codes_emails
send_welcome_emails = var.send_welcome_emails
sentry_dsn = var.sentry_dsn
subject_for_abandoned_users = var.subject_for_abandoned_users
subject_for_get_backup_codes = var.subject_for_get_backup_codes
subject_for_invite = var.subject_for_invite
subject_for_lost_security_key = var.subject_for_lost_security_key
subject_for_method_purged = var.subject_for_method_purged
subject_for_method_reminder = var.subject_for_method_reminder
subject_for_method_verify = var.subject_for_method_verify
subject_for_mfa_disabled = var.subject_for_mfa_disabled
subject_for_mfa_enabled = var.subject_for_mfa_enabled
subject_for_mfa_manager = var.subject_for_mfa_manager
subject_for_mfa_manager_help = var.subject_for_mfa_manager_help
subject_for_mfa_option_added = var.subject_for_mfa_option_added
subject_for_mfa_option_removed = var.subject_for_mfa_option_removed
subject_for_mfa_rate_limit = var.subject_for_mfa_rate_limit
subject_for_password_changed = var.subject_for_password_changed
subject_for_password_expired = var.subject_for_password_expired
subject_for_password_expiring = var.subject_for_password_expiring
subject_for_refresh_backup_codes = var.subject_for_refresh_backup_codes
subject_for_welcome = var.subject_for_welcome
support_email = var.support_email
support_name = var.support_name
})
}

module "cron_task" {
source = "../task"
name = "${var.idp_name}-${var.app_name}-cron-${var.app_env}-${local.aws_region}"
event_rule_description = "Start broker scheduled tasks"
event_schedule = var.event_schedule
ecs_cluster_arn = var.ecs_cluster_id
task_definition_arn = aws_ecs_task_definition.cron_td.arn
task_definition_arn = module.ecsservice.task_def_arn
event_target_input = jsonencode({
containerOverrides = [
{
name = "web"
cpu = var.cpu_cron
memory = var.memory_cron
environment = [
{
"name" : "RUN_TASK",
"value" : "${var.run_task}"
}
]
}
]
})
tags = {
app_name = var.app_name
app_env = var.app_env
Expand All @@ -355,16 +250,6 @@ moved {
to = module.cron_task.aws_iam_role_policy.this
}

/*
* Create cron task definition
*/
resource "aws_ecs_task_definition" "cron_td" {
family = "${var.idp_name}-${var.app_name}-cron-${var.app_env}"
container_definitions = local.task_def_cron
network_mode = "bridge"
task_role_arn = one(module.ecs_role[*].role_arn)
}

moved {
from = aws_cloudwatch_event_rule.event_rule
to = module.cron_task.aws_cloudwatch_event_rule.this
Expand Down

0 comments on commit 587c671

Please sign in to comment.