From 4b57d1481d7ca5d877a52e53aef6daa4ee5c47dd Mon Sep 17 00:00:00 2001 From: Dominic Need Date: Tue, 26 Sep 2023 13:54:27 +0100 Subject: [PATCH 1/4] Null check for phase --- .../Pages/UpdateAcademyConversionProjectPageModel.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs index 838672103..3c5099f4e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs @@ -94,6 +94,7 @@ private void RePopDatePickerModelsAfterValidationFail() } public static decimal? CalculateGrantAmount(string type, string phase) { + if (phase is null) return 25000; switch (phase.ToLower()) { case "primary": @@ -115,7 +116,7 @@ private void RePopDatePickerModelsAfterValidationFail() } // Else return default £25k - return 25000; + return 25000; } protected UpdateAcademyConversionProject Build() From f7764c630941a2af124e0db62203f6771fbfa2d0 Mon Sep 17 00:00:00 2001 From: Dominic Need Date: Tue, 26 Sep 2023 13:55:40 +0100 Subject: [PATCH 2/4] Default grant value if unexpected/no type --- .../Pages/UpdateAcademyConversionProjectPageModel.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs index 3c5099f4e..e0f4be844 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs @@ -103,7 +103,7 @@ private void RePopDatePickerModelsAfterValidationFail() SponsoredGrantType.FastTrack => 70000, SponsoredGrantType.Full => 110000, SponsoredGrantType.Intermediate => 90000, - _ => 0 + _ => 25000 }; case "secondary": return type switch @@ -111,7 +111,7 @@ private void RePopDatePickerModelsAfterValidationFail() SponsoredGrantType.FastTrack => 80000, SponsoredGrantType.Full => 150000, SponsoredGrantType.Intermediate => 115000, - _ => 0 + _ => 25000 }; } From 0daef1b3826296141127cc4e693e46c22a9ca1a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:46:44 +0000 Subject: [PATCH 3/4] Update Terraform azurerm to v3.74.0 --- terraform/.terraform.lock.hcl | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index e85cce77a..4967b4b71 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -42,22 +42,20 @@ provider "registry.terraform.io/hashicorp/azuread" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.73.0" - constraints = ">= 3.52.0, >= 3.59.0" + version = "3.74.0" + constraints = ">= 3.59.0" hashes = [ - "h1:5IbjnqJaOdgJp0IX3hFOegOZyxqJ18qUTazt1Dzxq+U=", - "zh:068dfe743c9486d09eeaf97eb7817870b932ecb8132b92b8e0d96eadcf51b349", - "zh:2a16b0d50feb80919880d32cc12d636c37918bbc9133d7b3ff0d610bac1bee86", - "zh:2a77e0deabd3d0f83974125cedca7871add825bf4470688f117a35b6964916cf", - "zh:3ade6f3b9483746f168e7daf5223fd65d5d26313616bca37d9117d5b4fba2b66", - "zh:44554a1fc5f69a1069bbac3fbe1122794943692f81fc2aabda435740f5e10a67", - "zh:69d41ad1073f274548bca763a1ed14813388e5b9b702c15fdc78f2b22b082a09", - "zh:8cf5ce91432fc5ed1b9906bca14ab6f0d3b18e78a9f25e00b1de632ae7669645", - "zh:b70c294e7d55c3404c40ae18e54113e625ee975e80e3f7d558f3fedde89b038e", - "zh:cadab8bc17685a239f45438c555fba156baa709803da55f59cce8c7f1cb70fc1", - "zh:cb74e02e1495df938d464e233a41aa5ffab9f0fd79079016d0a630955ce92b6d", - "zh:cd7a68c03005116fe40542d312d0236ab5bfdd20a2bb6bdf6398d64945c25ef8", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:1kSiowd/tBNswp3iv7ePlzkP5llWihjHcY3pdXdJqVU=", + "h1:4b15khHtc5OkIVEFg0W5QRwf/ov1WVQkXVdSiAcTCS8=", + "h1:ETVZfmulZQ435+lgFCkZRpfVOLyAxfDOwbPXFg3aLLQ=", + "h1:H3diAufZ5VDQKsQNYykVRaFTOUJ4gjFiT2VLYi574+w=", + "h1:LEdK8BxNSNiBQbtcJhQZKMMHDjmPpUsvDpr3Mzs93Tg=", + "h1:OtJKZcMwrRNR84ylT1GgMwGR8KTxVOCkNifbjABlGj0=", + "h1:Rq+CNb+4u47dw20tlAeI2yxSOuDtLm+S/GZO2pneLyA=", + "h1:VfBB00BE0wvFiod7BlL+Cn6r2599MEi94hnAQ277ux8=", + "h1:YJ15rwD0G7lYc9OVh5GO4VTqcd2jhqegfgyqTJH1M/I=", + "h1:YvxxiqiwXjZdU53u3b9q49ezsIAb59KmdLLFkwkwFAs=", + "h1:xDRmcV40KrWttPYg/w0/IN/frS9K1twuyvqRNVZko44=", ] } From 52c8bc81c4cebd1d350cfe23667abf77b7917104 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:32:02 +0000 Subject: [PATCH 4/4] Update Terraform github.com/DFE-Digital/terraform-azurerm-container-apps-hosting to v1.1.0 (#916) * Update Terraform github.com/DFE-Digital/terraform-azurerm-container-apps-hosting to v1.1.0 * Updated readme --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ash Davies <3853061+DrizzlyOwl@users.noreply.github.com> --- terraform/README.md | 2 +- terraform/container-apps-hosting.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/README.md b/terraform/README.md index b302b5e24..2a03e8be1 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -136,7 +136,7 @@ No providers. | Name | Source | Version | |------|--------|---------| -| [azure\_container\_apps\_hosting](#module\_azure\_container\_apps\_hosting) | github.com/DFE-Digital/terraform-azurerm-container-apps-hosting | v1.0.0 | +| [azure\_container\_apps\_hosting](#module\_azure\_container\_apps\_hosting) | github.com/DFE-Digital/terraform-azurerm-container-apps-hosting | v1.1.0 | | [azurerm\_key\_vault](#module\_azurerm\_key\_vault) | github.com/DFE-Digital/terraform-azurerm-key-vault-tfvars | v0.2.0 | ## Resources diff --git a/terraform/container-apps-hosting.tf b/terraform/container-apps-hosting.tf index eca9ed68c..667c75561 100644 --- a/terraform/container-apps-hosting.tf +++ b/terraform/container-apps-hosting.tf @@ -1,5 +1,5 @@ module "azure_container_apps_hosting" { - source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.0.0" + source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.1.0" environment = local.environment project_name = local.project_name