Skip to content

Commit

Permalink
Merge pull request #7601 from ministryofjustice/remove-newtech-pdfgen…
Browse files Browse the repository at this point in the history
…erator-services

chore: Comment out newtech and pdf_creation modules
  • Loading branch information
andrewmooreio authored Aug 23, 2024
2 parents 8c1b1da + dc64eaf commit 7fc0b86
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 89 deletions.
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 7fc0b86

Please sign in to comment.