Skip to content

Commit 930ba37

Browse files
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
2 parents 70bd5cf + cfc5750 commit 930ba37

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci-pipeline.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
terraform_wrapper: false
3030

3131
- name: Install Go
32-
uses: actions/setup-go@v1
32+
uses: actions/setup-go@v6
3333
with:
34-
go-version: 1.21
34+
go-version: 1.23.0
3535

3636
- name: Terraform Validate
3737
run: |

infrastructure/variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ variable "blob_storage_backups" {
7777
}
7878

7979
validation {
80-
condition = var.use_extended_retention == true || alltrue([for k, v in var.blob_storage_backups : contains(local.valid_retention_periods, v.retention_period)])
81-
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."
80+
condition = var.use_extended_retention ? true : alltrue([for k, v in var.blob_storage_backups : contains(local.valid_retention_periods, v.retention_period)])
81+
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."
8282
}
8383
}
8484

@@ -103,8 +103,8 @@ variable "managed_disk_backups" {
103103
}
104104

105105
validation {
106-
condition = var.use_extended_retention == true || alltrue([for k, v in var.managed_disk_backups : contains(local.valid_retention_periods, v.retention_period)])
107-
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."
106+
condition = var.use_extended_retention ? true : alltrue([for k, v in var.managed_disk_backups : contains(local.valid_retention_periods, v.retention_period)])
107+
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."
108108
}
109109
}
110110

@@ -126,7 +126,7 @@ variable "postgresql_flexible_server_backups" {
126126
}
127127

128128
validation {
129-
condition = var.use_extended_retention == true || alltrue([for k, v in var.postgresql_flexible_server_backups : contains(local.valid_retention_periods, v.retention_period)])
130-
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."
129+
condition = var.use_extended_retention ? true : alltrue([for k, v in var.postgresql_flexible_server_backups : contains(local.valid_retention_periods, v.retention_period)])
130+
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."
131131
}
132132
}

0 commit comments

Comments
 (0)