Skip to content

Commit f328f49

Browse files
committed
Drop default_region from env-config
Not currently used and may be different in the future.
1 parent 15b43ee commit f328f49

6 files changed

Lines changed: 21 additions & 31 deletions

File tree

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module "dev_config" {
2-
source = "./env-config"
3-
project_name = local.project_name
4-
app_name = local.app_name
5-
default_region = module.project_config.default_region
6-
environment = "dev"
7-
network_name = "dev"
8-
domain_name = local.app_name
9-
has_database = local.has_database
2+
source = "./env-config"
3+
project_name = local.project_name
4+
app_name = local.app_name
5+
environment = "dev"
6+
network_name = "dev"
7+
domain_name = local.app_name
8+
has_database = local.has_database
109
}

infra/{{app_name}}/app-config/env-config/database.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
locals {
22
database_config = var.has_database ? {
3-
region = var.default_region
43
# TODO: this is supposed to be globally (across Azure) unique, should we
54
# additionally prefix with project_config.owner?
65
cluster_name = "${var.project_name}-${var.app_name}-${var.environment}"

infra/{{app_name}}/app-config/env-config/service.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
locals {
22
service_config = {
33
service_name = "${var.app_name}-${var.environment}"
4-
region = var.default_region
54
cpu = var.service_cpu
65
memory = var.service_memory
76
desired_instance_count = var.service_desired_instance_count

infra/{{app_name}}/app-config/env-config/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ variable "environment" {
1111
type = string
1212
}
1313

14-
variable "default_region" {
15-
description = "default region for the project"
16-
type = string
17-
}
18-
1914
variable "has_database" {
2015
type = bool
2116
}

infra/{{app_name}}/app-config/prod.tf

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
module "prod_config" {
2-
source = "./env-config"
3-
project_name = local.project_name
4-
app_name = local.app_name
5-
default_region = module.project_config.default_region
6-
environment = "prod"
7-
network_name = "prod"
8-
domain_name = "my-project-subdomain.foo.com"
9-
has_database = local.has_database
2+
source = "./env-config"
3+
project_name = local.project_name
4+
app_name = local.app_name
5+
environment = "prod"
6+
network_name = "prod"
7+
domain_name = "my-project-subdomain.foo.com"
8+
has_database = local.has_database
109

1110
service_cpu = 1
1211
service_memory = "2Gi"
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module "staging_config" {
2-
source = "./env-config"
3-
project_name = local.project_name
4-
app_name = local.app_name
5-
default_region = module.project_config.default_region
6-
environment = "staging"
7-
network_name = "staging"
8-
domain_name = local.app_name
9-
has_database = local.has_database
2+
source = "./env-config"
3+
project_name = local.project_name
4+
app_name = local.app_name
5+
environment = "staging"
6+
network_name = "staging"
7+
domain_name = local.app_name
8+
has_database = local.has_database
109
}

0 commit comments

Comments
 (0)