From dc64eaf7ab34398d9176e4a28f8409c60f0fe811 Mon Sep 17 00:00:00 2001 From: Andrew Moore Date: Fri, 23 Aug 2024 10:28:58 +0100 Subject: [PATCH] chore: Comment out newtech and pdf_creation modules --- .../modules/delius_environment/newtech.tf | 80 +++++++-------- .../modules/delius_environment/pdfcreation.tf | 98 +++++++++---------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/terraform/environments/delius-core/modules/delius_environment/newtech.tf b/terraform/environments/delius-core/modules/delius_environment/newtech.tf index c3bdd49b55b..89a086266ca 100644 --- a/terraform/environments/delius-core/modules/delius_environment/newtech.tf +++ b/terraform/environments/delius-core/modules/delius_environment/newtech.tf @@ -1,54 +1,54 @@ -module "newtech" { - source = "../helpers/delius_microservice" +# module "newtech" { +# source = "../helpers/delius_microservice" - name = "newtech" - certificate_arn = local.certificate_arn - alb_security_group_id = aws_security_group.delius_frontend_alb_security_group.id - env_name = var.env_name +# name = "newtech" +# certificate_arn = local.certificate_arn +# alb_security_group_id = aws_security_group.delius_frontend_alb_security_group.id +# env_name = var.env_name - container_vars_default = {} - container_vars_env_specific = try(var.delius_microservice_configs.newtech.container_vars_env_specific, {}) +# container_vars_default = {} +# container_vars_env_specific = try(var.delius_microservice_configs.newtech.container_vars_env_specific, {}) - container_secrets_default = {} - container_secrets_env_specific = try(var.delius_microservice_configs.newtech.container_secrets_env_specific, {}) +# container_secrets_default = {} +# container_secrets_env_specific = try(var.delius_microservice_configs.newtech.container_secrets_env_specific, {}) - desired_count = 0 +# desired_count = 0 - container_port_config = [ - { - containerPort = var.delius_microservice_configs.newtech.container_port - protocol = "tcp" - } - ] +# container_port_config = [ +# { +# containerPort = var.delius_microservice_configs.newtech.container_port +# protocol = "tcp" +# } +# ] - ecs_cluster_arn = module.ecs.ecs_cluster_arn - db_ingress_security_groups = [] - cluster_security_group_id = aws_security_group.cluster.id +# ecs_cluster_arn = module.ecs.ecs_cluster_arn +# db_ingress_security_groups = [] +# cluster_security_group_id = aws_security_group.cluster.id - bastion_sg_id = module.bastion_linux.bastion_security_group - tags = var.tags - microservice_lb = aws_lb.delius_core_frontend - microservice_lb_https_listener_arn = aws_lb_listener.listener_https.arn +# bastion_sg_id = module.bastion_linux.bastion_security_group +# tags = var.tags +# microservice_lb = aws_lb.delius_core_frontend +# microservice_lb_https_listener_arn = aws_lb_listener.listener_https.arn - alb_listener_rule_paths = ["/newtech", "/newtech/*"] - platform_vars = var.platform_vars - container_image = "${var.platform_vars.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/delius-core-new-tech-web:${var.delius_microservice_configs.newtech.image_tag}" - account_config = var.account_config - health_check_path = "/newtech" - account_info = var.account_info +# alb_listener_rule_paths = ["/newtech", "/newtech/*"] +# platform_vars = var.platform_vars +# container_image = "${var.platform_vars.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/delius-core-new-tech-web:${var.delius_microservice_configs.newtech.image_tag}" +# account_config = var.account_config +# health_check_path = "/newtech" +# account_info = var.account_info - ignore_changes_service_task_definition = false +# ignore_changes_service_task_definition = false - providers = { - aws.core-vpc = aws.core-vpc - aws.core-network-services = aws.core-network-services - } +# providers = { +# aws.core-vpc = aws.core-vpc +# aws.core-network-services = aws.core-network-services +# } - log_error_pattern = "ERROR" - sns_topic_arn = aws_sns_topic.delius_core_alarms.arn - frontend_lb_arn_suffix = aws_lb.delius_core_frontend.arn_suffix - enable_platform_backups = var.enable_platform_backups -} +# log_error_pattern = "ERROR" +# sns_topic_arn = aws_sns_topic.delius_core_alarms.arn +# frontend_lb_arn_suffix = aws_lb.delius_core_frontend.arn_suffix +# enable_platform_backups = var.enable_platform_backups +# } resource "aws_ssm_parameter" "pdfcreation_secret" { name = "/${var.env_name}/delius/newtech/web/params_secret_key" diff --git a/terraform/environments/delius-core/modules/delius_environment/pdfcreation.tf b/terraform/environments/delius-core/modules/delius_environment/pdfcreation.tf index b12f23be080..c22fc08b2a0 100644 --- a/terraform/environments/delius-core/modules/delius_environment/pdfcreation.tf +++ b/terraform/environments/delius-core/modules/delius_environment/pdfcreation.tf @@ -1,65 +1,65 @@ -module "pdf_creation" { - source = "../helpers/delius_microservice" +# module "pdf_creation" { +# source = "../helpers/delius_microservice" - name = "pdf-creation" - certificate_arn = local.certificate_arn - alb_security_group_id = aws_security_group.delius_frontend_alb_security_group.id - env_name = var.env_name +# name = "pdf-creation" +# certificate_arn = local.certificate_arn +# alb_security_group_id = aws_security_group.delius_frontend_alb_security_group.id +# env_name = var.env_name - target_group_protocol_version = "HTTP1" +# target_group_protocol_version = "HTTP1" - health_check = { - command = [ - "CMD-SHELL", - "health=$(curl -sf http://localhost:8080/healthcheck || exit 1) && echo $health | jq -e '.status == \"OK\"'" - ] - interval = 30 - timeout = 5 - retries = 2 - startPeriod = 30 - } +# health_check = { +# command = [ +# "CMD-SHELL", +# "health=$(curl -sf http://localhost:8080/healthcheck || exit 1) && echo $health | jq -e '.status == \"OK\"'" +# ] +# interval = 30 +# timeout = 5 +# retries = 2 +# startPeriod = 30 +# } - container_port_config = [ - { - containerPort = var.delius_microservice_configs.pdf_creation.container_port - protocol = "tcp" - } - ] +# container_port_config = [ +# { +# containerPort = var.delius_microservice_configs.pdf_creation.container_port +# protocol = "tcp" +# } +# ] - container_vars_default = {} - container_vars_env_specific = try(var.delius_microservice_configs.pdf_creation.container_vars_env_specific, {}) +# container_vars_default = {} +# container_vars_env_specific = try(var.delius_microservice_configs.pdf_creation.container_vars_env_specific, {}) - container_secrets_default = { - # JAVA_TOOL_OPTIONS = module.ssm_params_pdf_creation.arn_map["JAVA_TOOL_OPTIONS"] - } - container_secrets_env_specific = try(var.delius_microservice_configs.pdf_creation.container_secrets_env_specific, {}) +# container_secrets_default = { +# # JAVA_TOOL_OPTIONS = module.ssm_params_pdf_creation.arn_map["JAVA_TOOL_OPTIONS"] +# } +# container_secrets_env_specific = try(var.delius_microservice_configs.pdf_creation.container_secrets_env_specific, {}) - desired_count = 1 +# desired_count = 1 - ecs_cluster_arn = module.ecs.ecs_cluster_arn - db_ingress_security_groups = [] - cluster_security_group_id = aws_security_group.cluster.id +# ecs_cluster_arn = module.ecs.ecs_cluster_arn +# db_ingress_security_groups = [] +# cluster_security_group_id = aws_security_group.cluster.id - bastion_sg_id = module.bastion_linux.bastion_security_group - tags = var.tags +# bastion_sg_id = module.bastion_linux.bastion_security_group +# tags = var.tags - platform_vars = var.platform_vars - container_image = "${var.platform_vars.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/delius-core-new-tech-pdfgenerator:${var.delius_microservice_configs.pdf_creation.image_tag}" - account_config = var.account_config - account_info = var.account_info +# platform_vars = var.platform_vars +# container_image = "${var.platform_vars.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/delius-core-new-tech-pdfgenerator:${var.delius_microservice_configs.pdf_creation.image_tag}" +# account_config = var.account_config +# account_info = var.account_info - ignore_changes_service_task_definition = false +# ignore_changes_service_task_definition = false - providers = { - aws.core-vpc = aws.core-vpc - aws.core-network-services = aws.core-network-services - } +# providers = { +# aws.core-vpc = aws.core-vpc +# aws.core-network-services = aws.core-network-services +# } - log_error_pattern = "ERROR" - sns_topic_arn = aws_sns_topic.delius_core_alarms.arn - frontend_lb_arn_suffix = aws_lb.delius_core_frontend.arn_suffix - enable_platform_backups = var.enable_platform_backups -} +# log_error_pattern = "ERROR" +# sns_topic_arn = aws_sns_topic.delius_core_alarms.arn +# frontend_lb_arn_suffix = aws_lb.delius_core_frontend.arn_suffix +# enable_platform_backups = var.enable_platform_backups +# } module "ssm_params_pdf_creation" { source = "../helpers/ssm_params"