Skip to content

feat: support new field server_certificate_rotation_mode for SQL instances #16072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wuchris-g wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: support new field server_certificate_rotation_mode for SQL instances #16072

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28fb169
feat: support a new field server_certificate_rotation_mode for Cloud …
wuchris-g Jan 5, 2026
4c5eace
Merge branch 'GoogleCloudPlatform:main' into auto-rotation
wuchris-g Jan 6, 2026
14dfbf2
feat: support a new field server_certificate_rotation_mode for Cloud …
wuchris-g Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ var (
"settings.0.ip_configuration.0.ssl_mode",
"settings.0.ip_configuration.0.server_ca_mode",
"settings.0.ip_configuration.0.server_ca_pool",
"settings.0.ip_configuration.0.server_certificate_rotation_mode",
"settings.0.ip_configuration.0.custom_subject_alternative_names",
}

Expand Down Expand Up @@ -696,6 +697,13 @@ API (for read pools, effective_availability_type may differ from availability_ty
Description: `The resource name of the server CA pool for an instance with "CUSTOMER_MANAGED_CAS_CA" as the "server_ca_mode".`,
AtLeastOneOf: ipConfigurationKeys,
},
"server_certificate_rotation_mode": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{"SERVER_CERTIFICATE_ROTATION_MODE_UNSPECIFIED", "NO_AUTOMATIC_ROTATION", "AUTOMATIC_ROTATION_DURING_MAINTENANCE"}, false),
Description: `Settings for how the server certificate gets rotated.`,
AtLeastOneOf: ipConfigurationKeys,
},
"custom_subject_alternative_names": {
Type: schema.TypeSet,
Optional: true,
Expand Down Expand Up @@ -1876,6 +1884,7 @@ func expandIpConfiguration(configured []interface{}, databaseVersion string) *sq
SslMode: _ipConfiguration["ssl_mode"].(string),
ServerCaMode: _ipConfiguration["server_ca_mode"].(string),
ServerCaPool: _ipConfiguration["server_ca_pool"].(string),
ServerCertificateRotationMode: _ipConfiguration["server_certificate_rotation_mode"].(string),
CustomSubjectAlternativeNames: tpgresource.ConvertStringArr(_ipConfiguration["custom_subject_alternative_names"].(*schema.Set).List()),
}
}
Expand Down Expand Up @@ -3096,6 +3105,7 @@ func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema
"ssl_mode": ipConfiguration.SslMode,
"server_ca_mode": ipConfiguration.ServerCaMode,
"server_ca_pool": ipConfiguration.ServerCaPool,
"server_certificate_rotation_mode": ipConfiguration.ServerCertificateRotationMode,
"custom_subject_alternative_names": ipConfiguration.CustomSubjectAlternativeNames,
}

Expand Down
1 change: 1 addition & 0 deletions mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ fields:
- api_field: 'settings.ipConfiguration.pscConfig.pscEnabled'
- api_field: 'settings.ipConfiguration.serverCaMode'
- api_field: 'settings.ipConfiguration.serverCaPool'
- api_field: 'settings.ipConfiguration.serverCertificateRotationMode'
- api_field: 'settings.ipConfiguration.sslMode'
- api_field: 'settings.locationPreference.followGaeApplication'
- api_field: 'settings.locationPreference.secondaryZone'
Expand Down
10 changes: 7 additions & 3 deletions mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3785,6 +3785,7 @@ func TestAccSqlDatabaseInstance_useInternalCaByDefault(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "settings.0.ip_configuration.0.server_ca_mode", "GOOGLE_MANAGED_INTERNAL_CA"),
resource.TestCheckResourceAttr(resourceName, "settings.0.ip_configuration.0.server_ca_pool", ""),
resource.TestCheckResourceAttr(resourceName, "settings.0.ip_configuration.0.server_certificate_rotation_mode", "NO_AUTOMATIC_ROTATION"),
),
},
{
Expand Down Expand Up @@ -3814,6 +3815,7 @@ func TestAccSqlDatabaseInstance_useCasBasedServerCa(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "settings.0.ip_configuration.0.server_ca_mode", "GOOGLE_MANAGED_CAS_CA"),
resource.TestCheckResourceAttr(resourceName, "settings.0.ip_configuration.0.server_ca_pool", ""),
resource.TestCheckResourceAttr(resourceName, "settings.0.ip_configuration.0.server_certificate_rotation_mode", "AUTOMATIC_ROTATION_DURING_MAINTENANCE"),
Copy link
Member

@zli82016 zli82016 Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this check in the wrong place?

The test TestAccSqlDatabaseInstance_useCasBasedServerCa failed

Error recording tests:
error running go: exit status 1
stdout:
=== RUN   TestAccSqlDatabaseInstance_useCasBasedServerCa
=== PAUSE TestAccSqlDatabaseInstance_useCasBasedServerCa
=== CONT  TestAccSqlDatabaseInstance_useCasBasedServerCa
   resource_sql_database_instance_test.go:3817: Step 1/2 error: Check failed: Check 1/2 error: Check 3/6 error: google_sql_database_instance.instance: Attribute 'settings.0.ip_configuration.0.server_certificate_rotation_mode' expected "AUTOMATIC_ROTATION_DURING_MAINTENANCE", got ""

resource.TestCheckResourceAttr(resourceName, "dns_names.#", "1"),
resource.TestCheckResourceAttr(resourceName, "dns_names.0.connection_type", "PUBLIC"),
resource.TestCheckResourceAttr(resourceName, "dns_names.0.dns_scope", "INSTANCE"),
Expand Down Expand Up @@ -4546,6 +4548,7 @@ resource "google_sql_database_instance" "instance" {
ipv4_enabled = "true"
server_ca_mode = "CUSTOMER_MANAGED_CAS_CA"
server_ca_pool = google_privateca_ca_pool.customer_ca_pool.id
server_certificate_rotation_mode = "SERVER_CERTIFICATE_ROTATION_MODE_UNSPECIFIED"
custom_subject_alternative_names = ["%{customSan}"]
}
}
Expand Down Expand Up @@ -4634,9 +4637,10 @@ resource "google_sql_database_instance" "instance" {
settings {
tier = "db-f1-micro"
ip_configuration {
ipv4_enabled = "true"
server_ca_mode = "CUSTOMER_MANAGED_CAS_CA"
server_ca_pool = google_privateca_ca_pool.customer_ca_pool.id
ipv4_enabled = "true"
server_ca_mode = "CUSTOMER_MANAGED_CAS_CA"
server_ca_pool = google_privateca_ca_pool.customer_ca_pool.id
server_certificate_rotation_mode = "AUTOMATIC_ROTATION_DURING_MAINTENANCE"
}
}

Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,8 @@ This setting can be updated, but it cannot be removed after it is set.

* `server_ca_pool` - (Optional) The resource name of the server CA pool for an instance with `CUSTOMER_MANAGED_CAS_CA` as the `server_ca_mode`.

* `server_certificate_rotation_mode` - (Optional) Controls the automatic server certificate rotation feature. Supported values are `NO_AUTOMATIC_ROTATION`and `AUTOMATIC_ROTATION_DURING_MAINTENANCE`. `AUTOMATIC_ROTATION_DURING_MAINTENANCE` can only be set if `server_ca_mode` is either `GOOGLE_MANAGED_CAS_CA` or `CUSTOMER_MANAGED_CAS_CA`. See [API reference doc](https://cloud.google.com/sql/docs/postgres/admin-api/rest/v1/instances#ipconfiguration) for details.

* `custom_subject_alternative_names` - (Optional) The custom subject alternative names for an instance with `CUSTOMER_MANAGED_CAS_CA` as the `server_ca_mode`.

* `allocated_ip_range` - (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.
Expand Down
Loading