Skip to content

Commit

Permalink
Tidy up generated files
Browse files Browse the repository at this point in the history
- Rename development config files to test config
- Replace some missing constants
  - Domain bits are still missing, not needed right now: #FRONT_DOOR_NAME# #DOMAINS_RESOURCE_GROUP_NAME#
- Remove Redis module
  • Loading branch information
AbigailMcP committed May 9, 2024
1 parent 4ed3baf commit df344ab
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 69 deletions.
7 changes: 0 additions & 7 deletions terraform/application/config/development.tfvars.json

This file was deleted.

14 changes: 7 additions & 7 deletions terraform/application/config/production.tfvars.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"cluster": "production",
"namespace": "#NAMESPACE_PREFIX#-production",
"environment": "production",
"enable_postgres_backup_storage" : true,
"enable_monitoring": true,
"external_url": "https://#DNS_ZONE_NAME#/healthcheck",
"statuscake_contact_groups": [282453]
"cluster": "production",
"namespace": "srtl-production",
"environment": "production",
"enable_postgres_backup_storage": true,
"enable_monitoring": true,
"external_url": "https://claim-additional-teaching-payment.service.gov.uk/healthcheck",
"statuscake_contact_groups": [282453]
}
8 changes: 4 additions & 4 deletions terraform/application/config/review.tfvars.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cluster": "test",
"namespace": "#NAMESPACE_PREFIX#-development",
"deploy_azure_backing_services": false,
"enable_postgres_ssl" : false
"cluster": "test",
"namespace": "srtl-development",
"deploy_azure_backing_services": false,
"enable_postgres_ssl": false
}
7 changes: 7 additions & 0 deletions terraform/application/config/test.tfvars.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"cluster": "test",
"namespace": "srtl-test",
"environment": "test",
"deploy_azure_backing_services": false,
"enable_postgres_ssl": false
}
File renamed without changes.
17 changes: 0 additions & 17 deletions terraform/application/database.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,3 @@ module "postgres" {
azure_enable_backup_storage = var.enable_postgres_backup_storage
server_version = "14"
}


module "redis-cache" {
source = "./vendor/modules/aks//aks/redis"

namespace = var.namespace
environment = var.environment
azure_resource_prefix = var.azure_resource_prefix
service_short = var.service_short
config_short = var.config_short
service_name = var.service_name
cluster_configuration_map = module.cluster_data.configuration_map
use_azure = var.deploy_azure_backing_services
azure_enable_monitoring = var.enable_monitoring
azure_patch_schedule = [{ "day_of_week" : "Sunday", "start_hour_utc" : 01 }]
server_version = "6"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
{
"hosted_zone": {
"#DNS_ZONE_NAME#": {
"claim-additional-teaching-payment.service.gov.uk": {
"front_door_name": "#FRONT_DOOR_NAME#",
"resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#",
"domains": [
"apex"
],
"cached_paths": [
"/assets/*"
],
"domains": ["apex"],
"cached_paths": ["/assets/*"],
"environment_short": "pd",
"origin_hostname": "#SERVICE_NAME#-production.teacherservices.cloud"
"origin_hostname": "claim-additional-payments-for-teaching-production.teacherservices.cloud"
}
}
}
12 changes: 12 additions & 0 deletions terraform/domains/environment_domains/config/test.tfvars.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"hosted_zone": {
"claim-additional-teaching-payment.service.gov.uk": {
"front_door_name": "#FRONT_DOOR_NAME#",
"resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#",
"domains": ["test"],
"cached_paths": ["/assets/*"],
"environment_short": "test",
"origin_hostname": "claim-additional-payments-for-teaching-test.test.teacherservices.cloud"
}
}
}
20 changes: 10 additions & 10 deletions terraform/domains/infrastructure/config/zones.tfvars.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"hosted_zone": {
"#DNS_ZONE_NAME#": {
"caa_records": {},
"txt_records": {},
"resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#",
"front_door_name": "#FRONT_DOOR_NAME#"
}
},
"deploy_default_records": false
}
"hosted_zone": {
"claim-additional-teaching-payment.service.gov.uk": {
"caa_records": {},
"txt_records": {},
"resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#",
"front_door_name": "#FRONT_DOOR_NAME#"
}
},
"deploy_default_records": false
}

0 comments on commit df344ab

Please sign in to comment.