Merge develop to master (#556)

* added replica sql server * reworked sql firewall rules to loop on sql servers count * enabled sql auditing on replica server * added sql database to replica server * added condition to toggle deployment of replica * deployed replica as a secondary db * added key vault secrets and updated variable name * Merge Release/release20.3 into develop (#555) * TL2023-128 (#520) * TL2023 46 (#504) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Change headers (#496) * Hide break line --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * changed the content in the footer (#505) * TL2023 44 (#506) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Cookies message updated --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Feature/tl2023 45 (#508) * changed the content in the footer * updated content * Updated request SOA and search page (#509) * TL2023 41 (#511) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Change headers (#496) * Page updated * Updated request SOA and search page * Remove breadcrumbs --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Update page header text (#513) * Feature/tl2023 45 (#514) * changed the content in the footer * updated content * updated content * Remove label (#515) * Get dates from configuration --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Change order (#521) * Remove time from current date (#522) * Admin dashboard (#524) * Implemented Admin user access (#525) * Implemented Admin user access * Addressed comments * Addressed comments * TL2023-104 (#527) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Small changes * Remove unused namespaces * Restrict admin pages access * TL2023-104 (#528) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Small changes * Remove unused namespaces * Restrict admin pages access * Look and feel changes * TL2023-104 (#529) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Small changes * Remove unused namespaces * Restrict admin pages access * Look and feel changes * Alignment fix * TL2023-104 (#530) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Small changes * Remove unused namespaces * Restrict admin pages access * Look and feel changes * Alignment fix * Accessibility issues addressed * Remove id * TL2023-118 (#534) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Refector models * Repo filter method * Refactor * Changes * Changes * Search learner and validations * Fixes * Tests * Code change * Fixes * TL2023-118 (#535) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Refector models * Repo filter method * Refactor * Changes * Changes * Search learner and validations * Fixes * Tests * Code change * Fixes * Update tests due to server errors * TL2023-72 (#536) * Changes * Page changes * Remove unused content * Correction * TL2023-163 (#537) * Changes * Page changes * Remove unused content * Correction * Breadcrum fix * TL2023-118 (#538) * Add controller/service/repos * Tests * Service tests (unfinished) * Search learners page * Constant updated * Refector models * Repo filter method * Refactor * Changes * Changes * Search learner and validations * Fixes * Tests * Code change * Fixes * Update tests due to server errors * Display generic message when validation occurs * Design updates * Generic no matches messege updated * TL2023-163 (#540) * Breadcrumbs fix * Remove page * Link added (#542) * Feature/tl2023 105 (#541) * Implemented Learner Record * Implemented unit test cases * removed unused constants * Revert the web.config and launchsettings * parameter name change * update route constant * Restore old govuk-frontend library (#544) * Fixed the provider name and awarding organisation going to two lines (#545) * Feature/tl2023 168 (#546) * Fixed the provider name and awarding organisation going to two lines * updated unit test * Feature/tl2023 169 (#547) * removed unsued code * update the unit test * TL2023-174 (#549) * Trim last name lookup * Providers journey lastname with extra space * Remove cache when first enter page (#550) * Changes from develop to Release20.3 (#548) * updated seed script (#473) (#474) * Develop (#480) * updated seed script (#473) * Release 19.12 chg0073773 (#479) * TLRC-9595 Added StartDate to certification * TLRC-9598 Refactored the test methods * TLRC-9836 Refactored the code to add EndDate is null for registration specialism * Tlrc 9947 (#477) * TLRC-9955 Removed Assistant from ZTLOS062 and ZTLOS063 specialism * Script updated * Script updated (#465) * Made specialism inactive * TLRC-9950 Removed Assistant from ZTLOS062 and ZTLOS063 specialism * iactive specialism * Specialism name update * fixed issue which is considering inactive specialisms * Updated IP status content (#470) * Removed specilims ZTLOS061 and ZTLOS008 * Content update --------- Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: Ibai Gonzalez <[email protected]> Co-authored-by: ibai-gonzalez <[email protected]> Co-authored-by: Sajid Shafique Malik <[email protected]> * Feature/tlrc 9894 (#478) * TLRC-9955 Removed Assistant from ZTLOS062 and ZTLOS063 specialism * Script updated * Script updated (#465) * Made specialism inactive * TLRC-9950 Removed Assistant from ZTLOS062 and ZTLOS063 specialism * iactive specialism * Specialism name update * fixed issue which is considering inactive specialisms * Updated IP status content --------- Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: Ibai Gonzalez <[email protected]> Co-authored-by: ibai-gonzalez <[email protected]> Co-authored-by: Sajid Shafique Malik <[email protected]> --------- Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Ibai Gonzalez <[email protected]> Co-authored-by: ibai-gonzalez <[email protected]> Co-authored-by: Sajid Shafique Malik <[email protected]> --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Ibai Gonzalez <[email protected]> Co-authored-by: ibai-gonzalez <[email protected]> * added missing parameters * added missing parameters * Release20.1 (#502) (#503) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Change headers (#496) * Remove filter (#499) --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * changed linked ARM deployment temaplate base URL modified linked template name * Added storage account kind modified deployment template branch Revert "modified deployment template branch" This reverts commit d193f38. * working sql firewall rules * Develop (#518) * Release20.1 (#502) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Change headers (#496) * Remove filter (#499) --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Release20.2 (#517) * TL2023 46 (#504) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Change headers (#496) * Hide break line --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * changed the content in the footer (#505) * TL2023 44 (#506) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Cookies message updated --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Feature/tl2023 45 (#508) * changed the content in the footer * updated content * Updated request SOA and search page (#509) * TL2023 41 (#511) * Link text updated (#481) * Filter by active specialisms (#482) * provider address implementation (#483) * Filter inactive courses (#484) * Tl2023 24 (#485) * provider address implementation * Name change * Make it fail when an inactive specialism is sent in the CSV file (#486) * Prevent users from uploading inactive course registrations (#487) * Tl2023 24 (#488) * provider address implementation * Name change * update the mapping * Tl2023 24 (#489) * provider address implementation * Name change * update the mapping * add missing mapping * Updated text (#491) * Tl2023 24 (#490) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * Remove h3 tag (#492) * Filter inactive pathways (#494) * Tl2023 24 (#495) * provider address implementation * Name change * update the mapping * add missing mapping * Mapping trigger * getting only isactive addresses * Change headers (#496) * Page updated * Updated request SOA and search page * Remove breadcrumbs --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Update page header text (#513) * Feature/tl2023 45 (#514) * changed the content in the footer * updated content * updated content * Remove label (#515) --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> --------- Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: Santhosh <[email protected]> * Using the sql firewall restrictions yaml variable * added replica sql server * reworked sql firewall rules to loop on sql servers count * enabled sql auditing on replica server * added sql database to replica server * added condition to toggle deployment of replica * deployed replica as a secondary db * added key vault secrets and updated variable name --------- Co-authored-by: Santhosh <[email protected]> Co-authored-by: Sajid Shafique Malik <[email protected]> Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: REES <[email protected]> Co-authored-by: Calum Rees <[email protected]> Co-authored-by: Calum Rees <[email protected]> Co-authored-by: Sam H <[email protected]> * Title update (#552) * Feature/tl2023-129 Admin dashboard: Change start year (#551) * Added functionality to change start year * Merge with Release20.3 updates * Added functionality to change start year * Code refactor and added validation * Updated unit tests * Added validation messages in resource file * Feature/tl2023 129 (#553) * Added functionality to change start year * Merge with Release20.3 updates * Added functionality to change start year * Code refactor and added validation * Updated unit tests * Added validation messages in resource file * Caching added in the controller * Reverting TL2023-129 --------- Co-authored-by: ibai-gonzalez <[email protected]> Co-authored-by: Santhosh <[email protected]> Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: REES <[email protected]> Co-authored-by: Calum Rees <[email protected]> Co-authored-by: Calum Rees <[email protected]> Co-authored-by: Sam H <[email protected]> --------- Co-authored-by: Calum Rees <[email protected]> Co-authored-by: Calum Rees <[email protected]> Co-authored-by: ibai-gonzalez <[email protected]> Co-authored-by: Santhosh <[email protected]> Co-authored-by: mustafajawad786 <[email protected]> Co-authored-by: Mustafa JAWAD <[email protected]> Co-authored-by: REES <[email protected]> Co-authored-by: Sam H <[email protected]>
SkillsFundingAgency · Dec 14, 2023 · a7f2da6 · a7f2da6
1 parent 29e487d
commit a7f2da6
Show file tree

Hide file tree

Showing 146 changed files with 6,403 additions and 5,355 deletions.
diff --git a/azure/tlevels-environment.json b/azure/tlevels-environment.json
@@ -20,6 +20,9 @@
         "sharedSQLServerName": {
             "type": "string"
         },
+        "sharedSQLServerReplicaName": {
+            "type": "string"
+        },
         "sqlDatabaseSkuName": {
             "type": "string"
         },
@@ -66,8 +69,8 @@
         "learnerGenderTrigger": {
             "type": "string"
         },
-		"certificatePrintingBatchesCreateTrigger": {
-            "type": "string"            
+        "certificatePrintingBatchesCreateTrigger": {
+            "type": "string"
         },
         "certificatePrintingRequestTrigger": {
             "type": "string"
@@ -87,8 +90,15 @@
         "ucasTransferAmendmentsTrigger": {
             "type": "string"
         },
-		"overallResultCalculationTrigger": {
-            "type": "string"            
+        "overallResultCalculationTrigger": {
+            "type": "string"
+        },
+        "enableReplica": {
+            "type": "bool",
+            "defaultValue": false,
+            "metadata": {
+                "description": "Enables the replica database to be deployed"
+            }
         }
     },
     "variables": {
@@ -441,7 +451,7 @@
                                 "name": "LearnerGenderTrigger",
                                 "value": "[parameters('learnerGenderTrigger')]"
                             },
-							{
+                            {
                                 "name": "CertificatePrintingBatchesCreateTrigger",
                                 "value": "[parameters('certificatePrintingBatchesCreateTrigger')]"
                             },
@@ -469,10 +479,10 @@
                                 "name": "UcasTransferAmendmentsTrigger",
                                 "value": "[parameters('ucasTransferAmendmentsTrigger')]"
                             },
-							{
+                            {
                                 "name": "OverallResultCalculationTrigger",
                                 "value": "[parameters('overallResultCalculationTrigger')]"
-                            },							
+                            },
                             {
                                 "name": "WEBSITE_LOAD_CERTIFICATES",
                                 "value": "1"
@@ -493,12 +503,11 @@
             "dependsOn": [
                 "[concat('function-app-certificate','-', parameters('environmentNameAbbreviation'))]",
                 "[concat('app-insights','-', parameters('environmentNameAbbreviation'))]"
-
             ]
         },
         {
             "apiVersion": "2017-05-10",
-            "name": "[concat('sql-database','-', parameters('environmentNameAbbreviation'))]",
+            "name": "[concat('sql-database','-', parameters('environmentNameAbbreviation'),'-','shared')]",
             "resourceGroup": "[parameters('sharedEnvResourceGroup')]",
             "type": "Microsoft.Resources/deployments",
             "properties": {
@@ -526,6 +535,49 @@
                 }
             }
         },
+        {
+            "condition": "[equals(parameters('enableReplica'), true())]",
+            "apiVersion": "2022-09-01",
+            "name": "[concat('sql-database','-', parameters('environmentNameAbbreviation'),'-','replica')]",
+            "resourceGroup": "[parameters('sharedEnvResourceGroup')]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "templateLink": {
+                    "uri": "[concat(variables('deploymentUrlBase'),'sql-database.json')]",
+                    "contentVersion": "1.0.0.0"
+                },
+                "parameters": {
+                    "databaseName": {
+                        "value": "[variables('sqlDatabaseName')]"
+                    },
+                    "sqlServerName": {
+                        "value": "[parameters('sharedSQLServerReplicaName')]"
+                    },
+                    "databaseSkuName": {
+                        "value": "[parameters('sqlDatabaseSkuName')]"
+                    },
+                    "databaseTier": {
+                        "value": "[parameters('sqlDatabaseTier')]"
+                    },
+                    "serverlessAutoPauseDelay": {
+                        "value": "[parameters('sqlserverlessAutoPauseDelay')]"
+                    },
+                    "createMode": {
+                        "value": "Secondary"
+                    },
+                    "sourceDatabaseId": {
+                        "value": "[reference(concat('sql-database','-', parameters('environmentNameAbbreviation'),'-','shared')).outputs.sqlDatabaseResourceId.value]"
+                    },
+                    "requestedBackupStorageRedundancy": {
+                        "value": "Local"
+                    }
+                }
+            },
+            "dependsOn": [
+                "[concat('sql-database','-', parameters('environmentNameAbbreviation'),'-','shared')]"
+            ]
+        },
         {
             "apiVersion": "2017-05-10",
             "name": "[concat('inttest-sql-database','-', parameters('environmentNameAbbreviation'))]",
@@ -557,7 +609,7 @@
             }
         },
         {
-            "apiVersion": "2017-05-10",
+            "apiVersion": "2022-09-01",
             "name": "[concat('sql-server-firewall-rules','-', parameters('environmentNameAbbreviation'))]",
             "resourceGroup": "[parameters('sharedEnvResourceGroup')]",
             "type": "Microsoft.Resources/deployments",

diff --git a/azure/tlevels-shared.json b/azure/tlevels-shared.json
@@ -11,6 +11,9 @@
         "sqlServerAdminPassword": {
             "type": "securestring"
         },
+        "sqlServerReplicaAdminPassword": {
+            "type": "securestring"
+        },
         "sqlServerActiveDirectoryAdminLogin": {
             "type": "string"
         },
@@ -60,14 +63,23 @@
                 "description": ""
             }
         },
-        "sqlFirewallIpAddresses": {
+        "sqlFirewallIpAddressesPredefined": {
             "type": "array"
+        },
+        "enableReplica": {
+            "type": "bool",
+            "defaultValue": false,
+            "metadata": {
+                "description": "Enables the replica database to be deployed"
+            }
         }
     },
     "variables": {
         "deploymentUrlBase": "https://raw.githubusercontent.com/SkillsFundingAgency/tl-platform-building-blocks/master/ArmTemplates/",
         "resourceNamePrefix": "[toLower(parameters('environmentNameAbbreviation'))]",
         "sqlServerName": "[concat(variables('resourceNamePrefix'), '-shared-sql')]",
+        "sqlServerReplicaName": "[concat(variables('resourceNamePrefix'), '-shared-sql-replica')]",
+        "sqlServerNames": "[if(equals(parameters('enableReplica'), true()), createArray(variables('sqlServerName'), variables('sqlServerReplicaName')), createArray(variables('sqlServerName')))]",
         "sharedStorageAccountName": "[replace(concat(variables('resourceNamePrefix'), 'sharedstr'), '-', '')]",
         "appServicePlanName": "[concat(variables('resourceNamePrefix'), '-shared-asp')]",
         "configStorageAccountName": "[replace(concat(variables('resourceNamePrefix'), 'configstr'), '-', '')]",
@@ -215,6 +227,101 @@
                 "[concat('shared-storage-account','-', parameters('environmentNameAbbreviation'))]"
             ]
         },
+        {
+            "condition": "[equals(parameters('enableReplica'), true())]",
+            "apiVersion": "2017-05-10",
+            "name": "[concat('sql-server','-', parameters('environmentNameAbbreviation'),'-replica')]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "templateLink": {
+                    "uri": "[concat(variables('deploymentUrlBase'),'sql-server.json')]",
+                    "contentVersion": "1.0.0.0"
+                },
+                "parameters": {
+                    "sqlServerName": {
+                        "value": "[variables('sqlServerReplicaName')]"
+                    },
+                    "sqlServerAdminUserName": {
+                        "value": "[parameters('sqlServerAdminUsername')]"
+                    },
+                    "sqlServerAdminPassword": {
+                        "value": "[parameters('sqlServerReplicaAdminPassword')]"
+                    },
+                    "sqlServerActiveDirectoryAdminLogin": {
+                        "value": "[parameters('sqlServerActiveDirectoryAdminLogin')]"
+                    },
+                    "sqlServerActiveDirectoryAdminObjectId": {
+                        "value": "[parameters('sqlServerActiveDirectoryAdminObjectId')]"
+                    },
+                    "threatDetectionEmailAddress": {
+                        "value": "[parameters('threatDetectionEmailAddress')]"
+                    },
+                    "sqlStorageAccountName": {
+                        "value": "[variables('sharedStorageAccountName')]"
+                    }
+                }
+            },
+            "dependsOn": [
+                "[concat('shared-storage-account','-', parameters('environmentNameAbbreviation'))]"
+            ]
+        },
+        {
+            "apiVersion": "2022-09-01",
+            "name": "[concat('key-vault-secret-',parameters('environmentNameAbbreviation'), '-admin-username', copyIndex())]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "templateLink": {
+                    "uri": "[concat(variables('deploymentUrlBase'), 'keyvault-secret.json')]",
+                    "contentVersion": "1.0.0.0"
+                },
+                "parameters": {
+                    "keyVaultName": {
+                        "value": "[variables('keyVaultName')]"
+                    },
+                    "secretName": {
+                        "value": "[concat(variables('sqlServerNames')[copyIndex()],'-admin-username')]"
+                    },
+                    "secretValue": {
+                        "value": "[parameters('sqlServerAdminUserName')]"
+                    }
+                }
+            },
+            "copy": {
+                "count": "[length(variables('sqlServerNames'))]",
+                "name": "firewallrulecopy",
+                "mode": "Parallel"
+            }
+        },
+        {
+            "apiVersion": "2022-09-01",
+            "name": "[concat('key-vault-secret-',parameters('environmentNameAbbreviation'), '-admin-password', copyIndex())]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "templateLink": {
+                    "uri": "[concat(variables('deploymentUrlBase'), 'keyvault-secret.json')]",
+                    "contentVersion": "1.0.0.0"
+                },
+                "parameters": {
+                    "keyVaultName": {
+                        "value": "[variables('keyVaultName')]"
+                    },
+                    "secretName": {
+                        "value": "[concat(variables('sqlServerNames')[copyIndex()],'-admin-password')]"
+                    },
+                    "secretValue": {
+                        "value": "[parameters('sqlServerAdminPassword')]"
+                    }
+                }
+            },
+            "copy": {
+                "count": "[length(variables('sqlServerNames'))]",
+                "name": "firewallrulecopy",
+                "mode": "Parallel"
+            }
+        },
         {
             "apiVersion": "2017-05-10",
             "name": "[concat('app-service-plan','-', parameters('environmentNameAbbreviation'))]",
@@ -310,22 +417,20 @@
                     "contentVersion": "1.0.0.0"
                 },
                 "parameters": {
-                    "firewallRuleNamePrefix": {
-                        "value": "[parameters('sqlFirewallIpAddresses')[copyIndex()].name]"
-                    },
-                    "startIpAddress": {
-                        "value": "[parameters('sqlFirewallIpAddresses')[copyIndex()].startIpAddress]"
-                    },
-                    "endIpAddress": {
-                        "value": "[parameters('sqlFirewallIpAddresses')[copyIndex()].endIpAddress]"
+                    "sqlFirewallIpAddressesPredefined": {
+                        "value": "[parameters('sqlFirewallIpAddressesPredefined')]"
                     },
                     "serverName": {
-                        "value": "[variables('sqlServerName')]"
+                        "value": "[variables('sqlServerNames')[copyIndex()]]"
                     }
                 }
             },
+            "dependsOn": [
+                "[concat('sql-server','-', parameters('environmentNameAbbreviation'))]",
+                "[concat('sql-server','-', parameters('environmentNameAbbreviation'),'-replica')]"
+            ],
             "copy": {
-                "count": "[length(parameters('sqlFirewallIpAddresses'))]",
+                "count": "[length(variables('sqlServerNames'))]",
                 "name": "firewallrulecopy",
                 "mode": "Parallel"
             }
@@ -348,6 +453,10 @@
             "type": "string",
             "value": "[variables('sqlServerName')]"
         },
+        "sharedSQLServerReplicaName": {
+            "type": "string",
+            "value": "[variables('sqlServerReplicaName')]"
+        },
         "sharedStorageConnectionString": {
             "type": "string",
             "value": "[reference(concat('shared-storage-account','-', parameters('environmentNameAbbreviation'))).outputs.storageConnectionString.value]"

diff --git a/config/Sfa.Tl.ResultsAndCertification.schema.json b/config/Sfa.Tl.ResultsAndCertification.schema.json
@@ -520,8 +520,18 @@
 			"additionalProperties": false,
 			"required": [],
 			"type": "object"
+		},
+		"UcasTransferAmendmentsSettings": {
+			"properties": {	
+				"ValidDateRanges": {
+					"type": "array",
+					"environmentVariable": "UcasTransferAmendmentsValidDateRanges"
+				}
+			},
+			"additionalProperties": false,
+			"required": [],
+			"type": "object"
 		}
-
 	},
 	"additionalProperties": false,
 	"required": [
@@ -553,7 +563,9 @@
 		"AnalystCoreResultExtractSettings",
 		"AnalystOverallResultExtractSettings",
 		"CoreRommExtractSettings",
-		"SpecialismRommExtractSettings"
+		"SpecialismRommExtractSettings",
+		"ProviderAddressExtractSettings",
+		"UcasTransferAmendmentsSettings"
 	],
 	"type": "object"
 }