Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit 95a19fd

Browse files
micjustus-ncmicjustus-nc
committed
Update parameter name casing
1 parent 3300384 commit 95a19fd

File tree

7 files changed

+135
-44
lines changed

7 files changed

+135
-44
lines changed

‎.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resources:
1414
- repository: dtos-devops-templates
1515
type: github
1616
name: NHSDigital/dtos-devops-templates
17-
ref: 9673ee4ef9770e80d0714c3966a699414b7b43c7
17+
ref: cf5e22fe4614b7d077a22301d29883e86ac3defc
1818
endpoint: NHSDigital
1919

2020
variables:

‎.azuredevops/pipelines/cd-infrastructure-dev-core.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ resources:
1414
- repository: dtos-devops-templates
1515
type: github
1616
name: NHSDigital/dtos-devops-templates
17-
ref: dtoss-9326-trigger-cd-pipeline-with-commit
17+
ref: feat/dtoss-9326-trigger-cd-pipeline-with-commit
1818
endpoint: NHSDigital
1919

2020
parameters:
21-
- name: image-hash
21+
- name: imageHash
2222
type: string
2323
default: ''
24-
- name: registry-host
24+
- name: registryHost
2525
type: string
2626

2727
variables:
@@ -51,8 +51,8 @@ stages:
5151
- checkout: dtos-devops-templates
5252
- template: .azuredevops/templates/steps/tf_plan.yaml@dtos-devops-templates
5353
parameters:
54-
image-hash: ${{ parameters.image-hash }}
55-
registry-host: ${{ parameters.registry-host }}
54+
imageHash: ${{ parameters.imageHash }}
55+
registryHost: ${{ parameters.registryHost }}
5656

5757
- stage: terraform_apply
5858
displayName: Terraform Apply

‎compose.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ services:
131131
DATABASE_NAME: "${DATABASE_NAME}"
132132
DATABASE_USER: "${DATABASE_USER}"
133133
DATABASE_PASSWORD: "${DATABASE_PASSWORD}"
134-
env_file:
135-
- ./.env.example
136134
networks:
137135
- backend
138136

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function_apps = {
192192
static = {
193193
MeshApiBaseUrl = "https://msg.intspineservices.nhs.uk"
194194
FileDiscoveryTimerExpression = "0 */5 * * * *"
195-
MeshHandshakeTimerExpression = "0 0 0 * * * "
195+
MeshHandshakeTimerExpression = "0 0 0 * * *"
196196
FileRetryTimerExpression = "0 0 * * * *"
197197
FileExtractQueueName = "file-extract"
198198
FileTransformQueueName = "file-transform"
@@ -252,14 +252,14 @@ storage_accounts = {
252252
fnapp = {
253253
name_suffix = "fnappstor"
254254
account_tier = "Standard"
255-
replication_type = "ZRS"
255+
replication_type = "LRS"
256256
public_network_access_enabled = false
257257
containers = {}
258258
}
259259
mesh = {
260260
name_suffix = "meshstor"
261261
account_tier = "Standard"
262-
replication_type = "ZRS"
262+
replication_type = "LRS"
263263
public_network_access_enabled = true
264264
blob_properties_delete_retention_policy = 7
265265
blob_properties_versioning_enabled = false

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

Lines changed: 63 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ function_apps = {
153153
app_service_logs_disk_quota_mb = 35
154154
app_service_logs_retention_period_days = 7
155155
always_on = true
156+
cont_registry_use_mi = false
156157
docker_env_tag = "integration"
157158
docker_img_prefix = "service-layer"
158159
enable_appsrv_storage = "false"
@@ -165,8 +166,48 @@ function_apps = {
165166

166167
function_app_config = {
167168

169+
ServiceLayerAPI = {
170+
name_suffix = "svclyr-api"
171+
function_endpoint_name = "ServiceLayerAPI"
172+
app_service_plan_key = "Default"
173+
env_vars = {
174+
static = {
175+
# env_var_name = value
176+
}
177+
from_key_vault = {
178+
# env_var_name = "key_vault_secret_name"
179+
}
180+
local_urls = {
181+
# %s becomes the environment and region prefix (e.g. dev-uks)
182+
}
183+
}
184+
}
168185

169-
186+
ServiceLayerMesh = {
187+
name_suffix = "svclyr-mesh-ingest"
188+
function_endpoint_name = "ServiceLayerMesh"
189+
app_service_plan_key = "Default"
190+
db_connection_string = "DatabaseConnectionString"
191+
env_vars = {
192+
static = {
193+
MeshApiBaseUrl = "https://msg.intspineservices.nhs.uk"
194+
FileDiscoveryTimerExpression = "0 */5 * * * *"
195+
MeshHandshakeTimerExpression = "0 0 0 * * *"
196+
FileRetryTimerExpression = "0 0 * * * *"
197+
FileExtractQueueName = "file-extract"
198+
FileTransformQueueName = "file-transform"
199+
StaleHours = "12"
200+
MeshBlobContainerName = "incoming-mesh-files"
201+
MeshBlobStorageUrl = "https://stsvclyrintuksmeshstor.blob.core.windows.net"
202+
MeshQueueStorageUrl = "https://stsvclyrintuksmeshstor.queue.core.windows.net"
203+
}
204+
from_key_vault = {
205+
MeshPassword = "MeshPassword"
206+
MeshSharedKey = "MeshSharedKey"
207+
NbssMailboxId = "NbssMailboxId"
208+
}
209+
}
210+
}
170211
}
171212
}
172213

@@ -192,9 +233,9 @@ sqlserver = {
192233
azure_services_access_enabled = true
193234
}
194235

195-
# parman database
236+
# svclyr database
196237
dbs = {
197-
parman = {
238+
svclyr = {
198239
db_name_suffix = "service_layer_database"
199240
collation = "SQL_Latin1_General_CP1_CI_AS"
200241
licence_type = "LicenseIncluded"
@@ -215,17 +256,23 @@ storage_accounts = {
215256
public_network_access_enabled = false
216257
containers = {}
217258
}
218-
# webapp = {
219-
# name_suffix = "webappstor"
220-
# account_tier = "Standard"
221-
# replication_type = "LRS"
222-
# public_network_access_enabled = true
223-
# blob_properties_delete_retention_policy = 7
224-
# blob_properties_versioning_enabled = false
225-
# containers = {
226-
# webapp = {
227-
# container_name = "webapp"
228-
# }
229-
# }
230-
# }
259+
mesh = {
260+
name_suffix = "meshstor"
261+
account_tier = "Standard"
262+
replication_type = "LRS"
263+
public_network_access_enabled = true
264+
blob_properties_delete_retention_policy = 7
265+
blob_properties_versioning_enabled = false
266+
containers = {
267+
incoming = {
268+
container_name = "incoming-mesh-files"
269+
}
270+
}
271+
queues = [
272+
"file-extract",
273+
"file-extract-poison",
274+
"file-transform",
275+
"file-transform-poison"
276+
]
277+
}
231278
}

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

Lines changed: 63 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ function_apps = {
153153
app_service_logs_disk_quota_mb = 35
154154
app_service_logs_retention_period_days = 7
155155
always_on = true
156+
cont_registry_use_mi = false
156157
docker_env_tag = "nft"
157158
docker_img_prefix = "service-layer"
158159
enable_appsrv_storage = "false"
@@ -165,8 +166,48 @@ function_apps = {
165166

166167
function_app_config = {
167168

169+
ServiceLayerAPI = {
170+
name_suffix = "svclyr-api"
171+
function_endpoint_name = "ServiceLayerAPI"
172+
app_service_plan_key = "Default"
173+
env_vars = {
174+
static = {
175+
# env_var_name = value
176+
}
177+
from_key_vault = {
178+
# env_var_name = "key_vault_secret_name"
179+
}
180+
local_urls = {
181+
# %s becomes the environment and region prefix (e.g. dev-uks)
182+
}
183+
}
184+
}
168185

169-
186+
ServiceLayerMesh = {
187+
name_suffix = "svclyr-mesh-ingest"
188+
function_endpoint_name = "ServiceLayerMesh"
189+
app_service_plan_key = "Default"
190+
db_connection_string = "DatabaseConnectionString"
191+
env_vars = {
192+
static = {
193+
MeshApiBaseUrl = "https://msg.intspineservices.nhs.uk"
194+
FileDiscoveryTimerExpression = "0 */5 * * * *"
195+
MeshHandshakeTimerExpression = "0 0 0 * * *"
196+
FileRetryTimerExpression = "0 0 * * * *"
197+
FileExtractQueueName = "file-extract"
198+
FileTransformQueueName = "file-transform"
199+
StaleHours = "12"
200+
MeshBlobContainerName = "incoming-mesh-files"
201+
MeshBlobStorageUrl = "https://stsvclyrnftuksmeshstor.blob.core.windows.net"
202+
MeshQueueStorageUrl = "https://stsvclyrnftuksmeshstor.queue.core.windows.net"
203+
}
204+
from_key_vault = {
205+
MeshPassword = "MeshPassword"
206+
MeshSharedKey = "MeshSharedKey"
207+
NbssMailboxId = "NbssMailboxId"
208+
}
209+
}
210+
}
170211
}
171212
}
172213

@@ -192,9 +233,9 @@ sqlserver = {
192233
azure_services_access_enabled = true
193234
}
194235

195-
# parman database
236+
# svclyr database
196237
dbs = {
197-
parman = {
238+
svclyr = {
198239
db_name_suffix = "service_layer_database"
199240
collation = "SQL_Latin1_General_CP1_CI_AS"
200241
licence_type = "LicenseIncluded"
@@ -215,17 +256,23 @@ storage_accounts = {
215256
public_network_access_enabled = false
216257
containers = {}
217258
}
218-
# webapp = {
219-
# name_suffix = "webappstor"
220-
# account_tier = "Standard"
221-
# replication_type = "LRS"
222-
# public_network_access_enabled = true
223-
# blob_properties_delete_retention_policy = 7
224-
# blob_properties_versioning_enabled = false
225-
# containers = {
226-
# webapp = {
227-
# container_name = "webapp"
228-
# }
229-
# }
230-
# }
259+
mesh = {
260+
name_suffix = "meshstor"
261+
account_tier = "Standard"
262+
replication_type = "LRS"
263+
public_network_access_enabled = true
264+
blob_properties_delete_retention_policy = 7
265+
blob_properties_versioning_enabled = false
266+
containers = {
267+
incoming = {
268+
container_name = "incoming-mesh-files"
269+
}
270+
}
271+
queues = [
272+
"file-extract",
273+
"file-extract-poison",
274+
"file-transform",
275+
"file-transform-poison"
276+
]
277+
}
231278
}

‎src/ServiceLayer.Shared/delme.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)