Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ dv_review: dev-cluster
$(eval export TF_VAR_docker_image=$(IMAGE))
$(eval export TF_VAR_app_name=$(APP_NAME))

.PHONY: review
review: test-cluster
$(if $(APP_NAME), , $(error Missing environment variable "APP_NAME", Please specify a pr number for your review app))
$(if $(IMAGE), , $(error Missing environment variable "IMAGE", Please specify an image tag for your review app))
$(eval include global_config/review.sh)
$(eval backend_key=-backend-config=key=$(APP_NAME).tfstate)
$(eval export TF_VAR_docker_image=$(IMAGE))
$(eval export TF_VAR_app_name=$(APP_NAME))

.PHONY: dev
dev: test-cluster
$(eval include global_config/dev.sh)
Expand Down
1 change: 1 addition & 0 deletions TeachingRecordSystem/TeachingRecordSystem.sln
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\Makefile = ..\Makefile
nuget.config = nuget.config
..\README.md = ..\README.md
appsettings.aks_review_shared.json = appsettings.aks_review_shared.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.TestCommon", "tests\TeachingRecordSystem.TestCommon\TeachingRecordSystem.TestCommon.csproj", "{DFE6654C-3222-4B20-A871-79581928D3B2}"
Expand Down
23 changes: 23 additions & 0 deletions TeachingRecordSystem/appsettings.aks_review_shared.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"AccessYourTeachingQualifications": {
"BaseAddress": "https://access-your-teaching-qualifications.education.gov.uk"
},
"AuthorizeAccessIssuer": "https://review.authorise-access-to-a-teaching-record.education.gov.uk/",
"GetAnIdentity": {
"TokenEndpoint": "https://preprod.teaching-identity.education.gov.uk/connect/token",
"BaseAddress": "https://preprod.teaching-identity.education.gov.uk/"
},
"TrnRequests": {
"FlagFurtherChecksRequiredFromUserIds": []
},
"Webhooks": {
"CanonicalDomain": "https://review.teacher-qualifications-api.education.gov.uk",
"SigningKeyId": "key1",
"Keys": [
{
"KeyId": "key1",
"CertificatePem": "-----BEGIN CERTIFICATE-----\nMIIBczCB+qADAgECAgkAoFzQkMgpnsAwCgYIKoZIzj0EAwMwITEfMB0GA1UEAxMW\nVGVhY2hpbmcgUmVjb3JkIFN5c3RlbTAeFw0yNDExMjAxNjQ0MDJaFw0yNTExMjAx\nNjQ0MDJaMCExHzAdBgNVBAMTFlRlYWNoaW5nIFJlY29yZCBTeXN0ZW0wdjAQBgcq\nhkjOPQIBBgUrgQQAIgNiAAR124XNxdr2nucfhIKTL7VqO3mCBYSDpEF6hME0dFel\nW0nNrsgHc8/cCCRuHR/UjAvdsxu2Dj0LHgQ56qK7ZJJiAKkGs4BhTdFb3c2W+kHV\nKaybHSmByYDJbPMTBags1VowCgYIKoZIzj0EAwMDaAAwZQIwTjbMqvWZiehqA5s/\nOJvnDoYQdAMkKwNvRjCHLqnkgqjerL1YP0w383OJaZ01qA6jAjEAtYesJ+lmanjj\nrYf01AQYsA38X4fmWNypki2MkYxQTXAiNKAv3gHCt2hhw651Ac6t\n-----END CERTIFICATE-----"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"EnabledFeatures": [ ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"RootRedirect": ""
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"RecurringJobsEnabled": false,
"DqtReporting": {
"RunService": false
}
}
5 changes: 5 additions & 0 deletions global_config/review.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CONFIG=review
CONFIG_SHORT=rv
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
AZURE_RESOURCE_PREFIX=s189t01
TERRAFORM_MODULES_TAG=main
3 changes: 3 additions & 0 deletions terraform/aks/config/review.backend.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
resource_group_name = "s189t01-trs-rv-rg"
storage_account_name = "s189t01trstfstaterv"
container_name = "trs-tfstate"
11 changes: 11 additions & 0 deletions terraform/aks/config/review.tfvars.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"environment_name": "review",
"cluster": "test",
"namespace": "tra-development",
"resource_group_name": "s189t01-trs-rv-rg",
"enable_monitoring": false,
"deploy_dqt_reporting_server": false,
"run_dqt_reporting_service": false,
"enable_logit": true,
"deploy_azure_backing_services": false
}
6 changes: 6 additions & 0 deletions terraform/aks/databases.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,24 @@ module "postgres" {
}

resource "azurerm_postgresql_flexible_server_configuration" "wal_level" {
count = var.deploy_azure_backing_services ? 1 : 0

name = "wal_level"
server_id = module.postgres.azure_server_id
value = "logical"
}

resource "azurerm_postgresql_flexible_server_configuration" "shared_preload_libraries" {
count = var.deploy_azure_backing_services ? 1 : 0

name = "shared_preload_libraries"
server_id = module.postgres.azure_server_id
value = "pg_cron,pg_stat_statements"
}

resource "azurerm_postgresql_flexible_server_configuration" "hot_standby_feedback" {
count = var.deploy_azure_backing_services ? 1 : 0

name = "hot_standby_feedback"
server_id = module.postgres.azure_server_id
value = "on"
Expand Down
Loading