Skip to content

Commit 14b95eb

Browse files
imrannayerimrannayer
authored
Merge branch 'main' into pooling-config
2 parents 9f619ba + 1848851 commit 14b95eb

File tree

16 files changed

+122
-20
lines changed

16 files changed

+122
-20
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
66
project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [26.2.2](https://github.com/terraform-google-modules/terraform-google-sql-db/compare/v26.2.1...v26.2.2) (2025-09-30)
9+
10+
11+
### Bug Fixes
12+
13+
* Add min max validations ([#776](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/776)) ([9f66839](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/9f668399569eb7bae35dd369f67213afd271dc81))
14+
815
## [26.2.1](https://github.com/terraform-google-modules/terraform-google-sql-db/compare/v26.2.0...v26.2.1) (2025-09-03)
916

1017

‎modules/mssql/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module "mssql" {
3737
| additional\_databases | A list of databases to be created in your cluster | <pre>list(object({<br> name = string<br> charset = string<br> collation = string<br> }))</pre> | `[]` | no |
3838
| additional\_users | A list of users to be created in your cluster. A random password would be set for the user if the `random_password` variable is set. | <pre>list(object({<br> name = string<br> password = string<br> random_password = bool<br> }))</pre> | `[]` | no |
3939
| availability\_type | The availability type for the Cloud SQL instance.This is only used to set up high availability for the MSSQL instance. Can be either `ZONAL` or `REGIONAL`. | `string` | `"ZONAL"` | no |
40-
| backup\_configuration | The database backup configuration. | <pre>object({<br> binary_log_enabled = bool<br> enabled = bool<br> point_in_time_recovery_enabled = bool<br> start_time = string<br> transaction_log_retention_days = string<br> retained_backups = number<br> retention_unit = string<br> })</pre> | <pre>{<br> "binary_log_enabled": null,<br> "enabled": false,<br> "point_in_time_recovery_enabled": null,<br> "retained_backups": null,<br> "retention_unit": null,<br> "start_time": null,<br> "transaction_log_retention_days": null<br>}</pre> | no |
40+
| backup\_configuration | The database backup configuration. | <pre>object({<br> binary_log_enabled = bool<br> enabled = bool<br> point_in_time_recovery_enabled = bool<br> start_time = string<br> transaction_log_retention_days = string<br> retained_backups = number<br> retention_unit = string<br> location = string<br> })</pre> | <pre>{<br> "binary_log_enabled": null,<br> "enabled": false,<br> "location": null,<br> "point_in_time_recovery_enabled": null,<br> "retained_backups": null,<br> "retention_unit": null,<br> "start_time": null,<br> "transaction_log_retention_days": null<br>}</pre> | no |
4141
| connector\_enforcement | Enforce that clients use the connector library | `bool` | `false` | no |
4242
| create\_timeout | The optional timeout that is applied to limit long database creates. | `string` | `"30m"` | no |
4343
| data\_cache\_enabled | Whether data cache is enabled for the instance. Defaults to false. Feature is only available for ENTERPRISE\_PLUS tier and supported database\_versions | `bool` | `false` | no |

‎modules/mssql/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ resource "google_sql_database_instance" "default" {
7373
start_time = lookup(backup_configuration.value, "start_time", null)
7474
point_in_time_recovery_enabled = lookup(backup_configuration.value, "point_in_time_recovery_enabled", null)
7575
transaction_log_retention_days = lookup(backup_configuration.value, "transaction_log_retention_days", null)
76+
location = lookup(backup_configuration.value, "location", null)
7677

7778
dynamic "backup_retention_settings" {
7879
for_each = local.retained_backups != null || local.retention_unit != null ? [var.backup_configuration] : []

‎modules/mssql/metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
2626
sourceType: git
2727
dir: /modules/mssql
28-
version: 26.2.1
28+
version: 26.2.2
2929
actuationTool:
3030
flavor: Terraform
3131
version: ">= 1.3"

‎modules/mssql/variables.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ variable "backup_configuration" {
229229
transaction_log_retention_days = string
230230
retained_backups = number
231231
retention_unit = string
232+
location = string
232233
})
233234
default = {
234235
binary_log_enabled = null
@@ -238,6 +239,7 @@ variable "backup_configuration" {
238239
transaction_log_retention_days = null
239240
retained_backups = null
240241
retention_unit = null
242+
location = null
241243
}
242244
}
243245

‎modules/mssql/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ terraform {
3636
}
3737

3838
provider_meta "google-beta" {
39-
module_name = "blueprints/terraform/terraform-google-sql-db:mssql/v26.2.1"
39+
module_name = "blueprints/terraform/terraform-google-sql-db:mssql/v26.2.2"
4040
}
4141

4242
}

‎modules/mysql/metadata.display.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ spec:
104104
enabled: true
105105
binary_log_enabled: true
106106
properties:
107+
transaction_log_retention_days:
108+
name: transaction_log_retention_days
109+
title: Transaction Log Retention Days
110+
min: 1
111+
max: 35
107112
retention_unit:
108113
name: retention_unit
109114
title: Retention Unit
@@ -209,6 +214,7 @@ spec:
209214
name: disk_size
210215
title: Disk Size
211216
level: 1
217+
min: 10
212218
disk_type:
213219
name: disk_type
214220
title: Disk Type
@@ -283,6 +289,17 @@ spec:
283289
insights_config:
284290
name: insights_config
285291
title: Insights Config
292+
properties:
293+
query_plans_per_minute:
294+
name: query_plans_per_minute
295+
title: Query Plans Per Minute
296+
min: 0
297+
max: 20
298+
query_string_length:
299+
name: query_string_length
300+
title: Query String Length
301+
min: 256
302+
max: 4500
286303
instance_type:
287304
name: instance_type
288305
title: Instance Type
@@ -328,9 +345,13 @@ spec:
328345
maintenance_window_day:
329346
name: maintenance_window_day
330347
title: Maintenance Window Day
348+
min: 1
349+
max: 7
331350
maintenance_window_hour:
332351
name: maintenance_window_hour
333352
title: Maintenance Window Hour
353+
min: 0
354+
max: 23
334355
maintenance_window_update_track:
335356
name: maintenance_window_update_track
336357
title: Maintenance Window Update Track
@@ -348,6 +369,15 @@ spec:
348369
password_validation_policy_config:
349370
name: password_validation_policy_config
350371
title: Password Validation Policy Config
372+
properties:
373+
complexity:
374+
name: complexity
375+
title: complexity
376+
enumValueLabels:
377+
- label: COMPLEXITY_DEFAULT
378+
value: COMPLEXITY_DEFAULT
379+
- label: COMPLEXITY_UNSPECIFIED
380+
value: COMPLEXITY_UNSPECIFIED
351381
pricing_plan:
352382
name: pricing_plan
353383
title: Pricing Plan
@@ -376,6 +406,12 @@ spec:
376406
title: Read Replica Name
377407
regexValidation: ^[a-z][a-z0-9-]{0,95}[a-z0-9]$
378408
validation: Read replica names must be between 1 and 97 characters long, start with a lowercase letter, and end with a lowercase letter or number. Read replica names can only contain lowercase letters, numbers, and hyphens.
409+
disk_autoresize_limit:
410+
name: disk_autoresize_limit
411+
title: Disk Autoresize Limit
412+
disk_size:
413+
name: disk_size
414+
title: Disk Size
379415
edition:
380416
name: edition
381417
title: Edition
@@ -400,6 +436,23 @@ spec:
400436
value: PD_SSD
401437
- label: PD_HDD
402438
value: PD_HDD
439+
backup_configuration:
440+
name: backup_configuration
441+
title: Backup Configuration
442+
insights_config:
443+
name: insights_config
444+
title: Insights Config
445+
properties:
446+
query_plans_per_minute:
447+
name: query_plans_per_minute
448+
title: Query Plans Per Minute
449+
min: 0
450+
max: 20
451+
query_string_length:
452+
name: query_string_length
453+
title: Query String Length
454+
min: 256
455+
max: 4500
403456
ip_configuration:
404457
name: ip_configuration
405458
title: Ip Configuration

‎modules/mysql/metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
2626
sourceType: git
2727
dir: /modules/mysql
28-
version: 26.2.1
28+
version: 26.2.2
2929
actuationTool:
3030
flavor: Terraform
3131
version: ">= 1.3"

‎modules/mysql/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ terraform {
3636
}
3737

3838
provider_meta "google" {
39-
module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v26.2.1"
39+
module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v26.2.2"
4040
}
4141
provider_meta "google-beta" {
42-
module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v26.2.1"
42+
module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v26.2.2"
4343
}
4444

4545
}

‎modules/postgresql/metadata.display.yaml‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ spec:
179179
name: disk_size
180180
title: Disk Size
181181
level: 1
182+
min: 10
182183
disk_type:
183184
name: disk_type
184185
title: Disk Type
@@ -253,6 +254,17 @@ spec:
253254
insights_config:
254255
name: insights_config
255256
title: Insights Config
257+
properties:
258+
query_plans_per_minute:
259+
name: query_plans_per_minute
260+
title: Query Plans Per Minute
261+
min: 0
262+
max: 20
263+
query_string_length:
264+
name: query_string_length
265+
title: Query String Length
266+
min: 256
267+
max: 4500
256268
instance_type:
257269
name: instance_type
258270
title: Instance Type
@@ -297,9 +309,13 @@ spec:
297309
maintenance_window_day:
298310
name: maintenance_window_day
299311
title: Maintenance Window Day
312+
min: 1
313+
max: 7
300314
maintenance_window_hour:
301315
name: maintenance_window_hour
302316
title: Maintenance Window Hour
317+
min: 0
318+
max: 23
303319
maintenance_window_update_track:
304320
name: maintenance_window_update_track
305321
title: Maintenance Window Update Track
@@ -317,6 +333,15 @@ spec:
317333
password_validation_policy_config:
318334
name: password_validation_policy_config
319335
title: Password Validation Policy Config
336+
properties:
337+
complexity:
338+
name: complexity
339+
title: complexity
340+
enumValueLabels:
341+
- label: COMPLEXITY_DEFAULT
342+
value: COMPLEXITY_DEFAULT
343+
- label: COMPLEXITY_UNSPECIFIED
344+
value: COMPLEXITY_UNSPECIFIED
320345
pricing_plan:
321346
name: pricing_plan
322347
title: Pricing Plan
@@ -369,6 +394,20 @@ spec:
369394
value: PD_SSD
370395
- label: PD_HDD
371396
value: PD_HDD
397+
insights_config:
398+
name: insights_config
399+
title: Insights Config
400+
properties:
401+
query_plans_per_minute:
402+
name: query_plans_per_minute
403+
title: Query Plans Per Minute
404+
min: 0
405+
max: 20
406+
query_string_length:
407+
name: query_string_length
408+
title: Query String Length
409+
min: 256
410+
max: 4500
372411
ip_configuration:
373412
name: ip_configuration
374413
title: Ip Configuration
@@ -382,12 +421,12 @@ spec:
382421
name: ssl_mode
383422
title: Ssl Mode
384423
enumValueLabels:
385-
- label: ALLOW_UNENCRYPTED_AND_ENCRYPTED
386-
value: ALLOW_UNENCRYPTED_AND_ENCRYPTED
387-
- label: ENCRYPTED_ONLY
388-
value: ENCRYPTED_ONLY
389-
- label: TRUSTED_CLIENT_CERTIFICATE_REQUIRED
390-
value: TRUSTED_CLIENT_CERTIFICATE_REQUIRED
424+
- label: ALLOW_UNENCRYPTED_AND_ENCRYPTED
425+
value: ALLOW_UNENCRYPTED_AND_ENCRYPTED
426+
- label: ENCRYPTED_ONLY
427+
value: ENCRYPTED_ONLY
428+
- label: TRUSTED_CLIENT_CERTIFICATE_REQUIRED
429+
value: TRUSTED_CLIENT_CERTIFICATE_REQUIRED
391430
region:
392431
name: region
393432
title: Region

0 commit comments

Comments
 (0)