Merge branch 'main' into dependabot/go_modules/tests/end-to-end-tests/github.com/Azure/azure-sdk-for-go/sdk/storage/azblob-1.6.3

Author: johncollinson2001

.github/workflows/ci-pipeline.yaml

@@ -29,9 +29,9 @@ jobs:
           terraform_wrapper: false
 
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21
+          go-version: 1.23.0
 
       - name: Terraform Validate
         run: |

infrastructure/variables.tf

@@ -77,8 +77,8 @@ variable "blob_storage_backups" {
   }
 
   validation {
-    condition     = var.use_extended_retention == true || alltrue([for k, v in var.blob_storage_backups : contains(local.valid_retention_periods, v.retention_period)])
-    error_message = "Invalid retention period: valid periods are up to 7 days. If you require a longer retention period then please set use_exetended_retention to true."
+    condition     = var.use_extended_retention ? true : alltrue([for k, v in var.blob_storage_backups : contains(local.valid_retention_periods, v.retention_period)])
+    error_message = "Invalid retention period: valid periods are up to 7 days. If you require a longer retention period then please set use_extended_retention to true."
   }
 }
 
@@ -103,8 +103,8 @@ variable "managed_disk_backups" {
   }
 
   validation {
-    condition     = var.use_extended_retention == true || alltrue([for k, v in var.managed_disk_backups : contains(local.valid_retention_periods, v.retention_period)])
-    error_message = "Invalid retention period: valid periods are up to 7 days. If you require a longer retention period then please set use_exetended_retention to true."
+    condition     = var.use_extended_retention ? true : alltrue([for k, v in var.managed_disk_backups : contains(local.valid_retention_periods, v.retention_period)])
+    error_message = "Invalid retention period: valid periods are up to 7 days. If you require a longer retention period then please set use_extended_retention to true."
   }
 }
 
@@ -126,7 +126,7 @@ variable "postgresql_flexible_server_backups" {
   }
 
   validation {
-    condition     = var.use_extended_retention == true || alltrue([for k, v in var.postgresql_flexible_server_backups : contains(local.valid_retention_periods, v.retention_period)])
-    error_message = "Invalid retention period: valid periods are up to 7 days. If you require a longer retention period then please set use_exetended_retention to true."
+    condition     = var.use_extended_retention ? true : alltrue([for k, v in var.postgresql_flexible_server_backups : contains(local.valid_retention_periods, v.retention_period)])
+    error_message = "Invalid retention period: valid periods are up to 7 days. If you require a longer retention period then please set use_extended_retention to true."
   }
 }