Skip to content

Commit 2b9c74b

Browse files
MacMur85MacMur85
authored
chore: [DTOSS-11780] update sbx/nft/int/preprod to be in line with current main branch (#1771)
chore: update sandbox/nft/integration/preprod to current main
1 parent fa76da4 commit 2b9c74b

File tree

5 files changed

+106
-67
lines changed

5 files changed

+106
-67
lines changed

‎infrastructure/tf-audit/environments/integration.tfvars‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,26 @@ storage_accounts = {
6060
container_access_type = "private"
6161
}
6262
}
63-
63+
}
64+
sqlbackups = {
65+
name_suffix = "sqlbackups"
66+
account_tier = "Standard"
67+
replication_type = "LRS"
68+
public_network_access_enabled = false
69+
blob_properties_delete_retention_policy = 7
70+
blob_properties_versioning_enabled = true
71+
access_tier = "Cold"
72+
containers = {
73+
sql-backups-immutable = {
74+
container_name = "sql-backups-immutable"
75+
container_access_type = "private"
76+
immutability_policy = {
77+
is_locked = false
78+
immutability_period_in_days = 1
79+
protected_append_writes_all_enabled = false
80+
protected_append_writes_enabled = false
81+
}
82+
}
83+
}
6484
}
6585
}

‎infrastructure/tf-audit/environments/nft.tfvars‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,26 @@ storage_accounts = {
5252
container_access_type = "private"
5353
}
5454
}
55-
55+
}
56+
sqlbackups = {
57+
name_suffix = "sqlbackups"
58+
account_tier = "Standard"
59+
replication_type = "LRS"
60+
public_network_access_enabled = false
61+
blob_properties_delete_retention_policy = 7
62+
blob_properties_versioning_enabled = true
63+
access_tier = "Cold"
64+
containers = {
65+
sql-backups-immutable = {
66+
container_name = "sql-backups-immutable"
67+
container_access_type = "private"
68+
immutability_policy = {
69+
is_locked = false
70+
immutability_period_in_days = 1
71+
protected_append_writes_all_enabled = false
72+
protected_append_writes_enabled = false
73+
}
74+
}
75+
}
5676
}
5777
}

‎infrastructure/tf-audit/environments/preprod.tfvars‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,25 @@ storage_accounts = {
7979
}
8080
}
8181
}
82+
sqlbackups = {
83+
name_suffix = "sqlbackups"
84+
account_tier = "Standard"
85+
replication_type = "LRS"
86+
public_network_access_enabled = false
87+
blob_properties_delete_retention_policy = 7
88+
blob_properties_versioning_enabled = true
89+
access_tier = "Cold"
90+
containers = {
91+
sql-backups-immutable = {
92+
container_name = "sql-backups-immutable"
93+
container_access_type = "private"
94+
immutability_policy = {
95+
is_locked = false
96+
immutability_period_in_days = 1
97+
protected_append_writes_all_enabled = false
98+
protected_append_writes_enabled = false
99+
}
100+
}
101+
}
102+
}
82103
}

‎infrastructure/tf-audit/environments/sandbox.tfvars‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ storage_accounts = {
5252
container_name = "vulnerability-assessment"
5353
container_access_type = "private"
5454
}
55+
}
56+
}
57+
sqlbackups = {
58+
name_suffix = "sqlbackups"
59+
account_tier = "Standard"
60+
replication_type = "LRS"
61+
public_network_access_enabled = false
62+
blob_properties_delete_retention_policy = 7
63+
blob_properties_versioning_enabled = true
64+
access_tier = "Cold"
65+
containers = {
5566
sql-backups-immutable = {
5667
container_name = "sql-backups-immutable"
5768
container_access_type = "private"

‎infrastructure/tf-core/environments/sandbox.tfvars‎

Lines changed: 32 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -148,28 +148,11 @@ app_service_plan = {
148148
scaling_rule = {
149149
metric = "CpuPercentage"
150150

151-
capacity_min = "1"
152151
capacity_max = "1"
153152
capacity_def = "1"
154153

155-
time_grain = "PT1M"
156-
statistic = "Average"
157-
time_window = "PT1M"
158-
time_aggregation = "Average"
159-
160-
inc_operator = "GreaterThanOrEqual"
161-
inc_threshold = 20
162-
inc_scale_direction = "Increase"
163-
inc_scale_type = "ExactCount"
164-
inc_scale_value = 1
165-
inc_scale_cooldown = "PT10M"
166-
167-
dec_operator = "LessThan"
168-
dec_threshold = 20
169-
dec_scale_direction = "Decrease"
170-
dec_scale_type = "ExactCount"
171-
dec_scale_value = 1
172-
dec_scale_cooldown = "PT5M"
154+
inc_scale_value = 1
155+
dec_scale_value = 1
173156

174157
}
175158
}
@@ -180,12 +163,7 @@ app_service_plan = {
180163
scaling_rule = {
181164
metric = "CpuPercentage"
182165

183-
capacity_min = "1"
184-
capacity_max = "5"
185-
capacity_def = "1"
186-
187-
inc_threshold = 5
188-
dec_threshold = 5
166+
capacity_max = "5"
189167
inc_scale_value = 5
190168

191169
dec_scale_type = "ChangeCount"
@@ -199,28 +177,11 @@ app_service_plan = {
199177
scaling_rule = {
200178
metric = "CpuPercentage"
201179

202-
capacity_min = "1"
203180
capacity_max = "1"
204181
capacity_def = "1"
205182

206-
time_grain = "PT1M"
207-
statistic = "Average"
208-
time_window = "PT1M"
209-
time_aggregation = "Average"
210-
211-
inc_operator = "GreaterThanOrEqual"
212-
inc_threshold = 20
213-
inc_scale_direction = "Increase"
214-
inc_scale_type = "ExactCount"
215-
inc_scale_value = 1
216-
inc_scale_cooldown = "PT10M"
217-
218-
dec_operator = "LessThan"
219-
dec_threshold = 20
220-
dec_scale_direction = "Decrease"
221-
dec_scale_type = "ExactCount"
222-
dec_scale_value = 1
223-
dec_scale_cooldown = "PT5M"
183+
inc_scale_value = 1
184+
dec_scale_value = 1
224185

225186
}
226187
}
@@ -231,12 +192,7 @@ app_service_plan = {
231192
scaling_rule = {
232193
metric = "CpuPercentage"
233194

234-
capacity_min = "1"
235-
capacity_max = "5"
236-
capacity_def = "1"
237-
238-
inc_threshold = 5
239-
dec_threshold = 5
195+
capacity_max = "5"
240196
inc_scale_value = 5
241197

242198
dec_scale_type = "ChangeCount"
@@ -250,12 +206,7 @@ app_service_plan = {
250206
scaling_rule = {
251207
metric = "CpuPercentage"
252208

253-
capacity_min = "1"
254-
capacity_max = "3"
255-
capacity_def = "1"
256-
257-
inc_threshold = 5
258-
dec_threshold = 5
209+
capacity_max = "3"
259210
inc_scale_value = 3
260211

261212
dec_scale_type = "ChangeCount"
@@ -269,12 +220,8 @@ app_service_plan = {
269220
scaling_rule = {
270221
metric = "CpuPercentage"
271222

272-
capacity_min = "1"
273223
capacity_max = "3"
274-
capacity_def = "1"
275224

276-
inc_threshold = 5
277-
dec_threshold = 5
278225
inc_scale_value = 3
279226

280227
dec_scale_type = "ChangeCount"
@@ -289,7 +236,8 @@ app_service_plan = {
289236
container_app_environments = {
290237
instances = {
291238
db-management = {
292-
zone_redundancy_enabled = false
239+
zone_redundancy_enabled = false
240+
use_custom_infra_rg_name = false
293241
}
294242
}
295243
}
@@ -302,6 +250,23 @@ container_app_jobs = {
302250
container_registry_use_mi = true
303251
db_connection_string_name = "DtOsDatabaseConnectionString"
304252
add_user_assigned_identity = true
253+
replica_retry_limit = 1
254+
}
255+
}
256+
}
257+
258+
container_apps = {
259+
apps = {
260+
wiremock = {
261+
container_app_environment_key = "db-management"
262+
docker_image = "cohort-manager-wiremock"
263+
container_registry_use_mi = true
264+
add_user_assigned_identity = false
265+
is_tcp_app = false
266+
is_web_app = true
267+
port = 8080
268+
infra_key_vault_rg = null
269+
infra_key_vault_name = null
305270
}
306271
}
307272
}
@@ -1095,10 +1060,10 @@ function_apps = {
10951060
}
10961061
]
10971062
env_vars_static = {
1098-
RetrievePdsParticipantURL = "https://int.api.service.nhs.uk/personal-demographics/FHIR/R4/Patient"
1063+
RetrievePdsParticipantURL = "https://sandbox.api.service.nhs.uk/personal-demographics/FHIR/R4/Patient"
10991064
Kid = "RetrievePdsDemographic-DEV1"
1100-
Audience = "https://int.api.service.nhs.uk/oauth2/token"
1101-
AuthTokenURL = "https://int.api.service.nhs.uk/oauth2/token"
1065+
Audience = "https://sandbox.api.service.nhs.uk/oauth2/token"
1066+
AuthTokenURL = "https://sandbox.api.service.nhs.uk/oauth2/token"
11021067
KeyNamePrivateKey = "PDSPRIVATEKEY"
11031068
UseFakePDSServices = "true"
11041069
ParticipantManagementTopic = "participant-management"
@@ -1126,6 +1091,7 @@ function_apps = {
11261091
NemsSubscriptionProfile = "https://fhir.nhs.uk/STU3/StructureDefinition/EMS-Subscription-1"
11271092
NemsSubscriptionCriteria = "https://fhir.nhs.uk/Id/nhs-number"
11281093
NemsBypassServerCertificateValidation = "true"
1094+
IsStubbed = "true"
11291095
}
11301096
}
11311097

@@ -1256,6 +1222,7 @@ linux_web_app = {
12561222
AUTH_TRUST_HOST = "true"
12571223
NEXTAUTH_URL = "https://cohort-dev.non-live.screening.nhs.uk/api/auth"
12581224
SERVICE_NAME = "Cohort Manager"
1225+
APP_ENV = "sandbox"
12591226
}
12601227
from_key_vault = {
12611228
# env_var_name = "key_vault_secret_name"
@@ -1356,7 +1323,7 @@ sqlserver = {
13561323
licence_type = "LicenseIncluded"
13571324
max_gb = 30
13581325
read_scale = false
1359-
sku = "S1"
1326+
sku = "S0"
13601327
storage_account_type = "Local"
13611328
zone_redundant = false
13621329
}

0 commit comments

Comments
 (0)