Skip to content

Commit dfde270

Browse files
Merge pull request #174 from companieshouse/fix/update-listener-rule
fix: update listener rule and remove log_level
2 parents f893ad8 + 3d2e5b5 commit dfde270

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

terraform/groups/ecs-service/locals.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Define all hardcoded local variable and local variables looked up from data resources
1+
# Define all hardcoded local variable and local variables looked up from data resources
22
locals {
33
stack_name = "order-service" # this must match the stack name the service deploys into
44
name_prefix = "${local.stack_name}-${var.environment}"
@@ -9,7 +9,7 @@ locals {
99
docker_repo = "orders.api.ch.gov.uk"
1010
kms_alias = "alias/${var.aws_profile}/environment-services-kms"
1111
lb_listener_rule_priority = 95
12-
lb_listener_paths = ["/orders-api/*","/orders/*","/checkouts/*","/basket/*" ]
12+
lb_listener_paths = ["/orders-api/*","/orders/*","/checkouts/*","/basket*" ]
1313
healthcheck_path = "/orders-api/healthcheck" #healthcheck path for order-api
1414
healthcheck_matcher = "200"
1515
vpc_name = local.stack_secrets["vpc_name"]
@@ -64,8 +64,7 @@ locals {
6464
task_secrets = concat(local.service_secret_list,local.global_secret_list,[])
6565

6666
task_environment = concat(local.ssm_global_version_map,local.ssm_service_version_map,[
67-
{ "name" : "PORT", "value" : local.container_port },
68-
{ "name" : "LOGLEVEL", "value" : var.log_level }
67+
{ "name" : "PORT", "value" : local.container_port }
6968
])
7069

7170
# get eric secrets from global secrets map

terraform/groups/ecs-service/profiles/development-eu-west-2/cidev/vars

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ aws_profile = "development-eu-west-2"
33

44
# service configs
55
use_set_environment_files = true
6-
log_level = "trace"

terraform/groups/ecs-service/profiles/live-eu-west-2/live/vars

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ aws_profile = "live-eu-west-2"
33

44
# service configs
55
use_set_environment_files = true
6-
log_level = "info"

terraform/groups/ecs-service/profiles/staging-eu-west-2/staging/vars

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ aws_profile = "staging-eu-west-2"
33

44
# service configs
55
use_set_environment_files = true
6-
log_level = "debug"
76

87
# Scheduled scaling of tasks
98
service_autoscale_enabled = true

terraform/groups/ecs-service/variables.tf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,7 @@ variable "use_set_environment_files" {
126126
default = true
127127
description = "Toggle default global and shared environment files"
128128
}
129-
variable "log_level" {
130-
default = "info"
131-
type = string
132-
description = "The log level for services to use: trace, debug, info or error"
133-
}
129+
134130
variable "orders_api_version" {
135131
type = string
136132
description = "The version of the orders.api.ch.gov.uk container to run."

0 commit comments

Comments
 (0)