|
83 | 83 | "settings.0.ip_configuration.0.psc_config",
|
84 | 84 | "settings.0.ip_configuration.0.ssl_mode",
|
85 | 85 | "settings.0.ip_configuration.0.server_ca_mode",
|
| 86 | + "settings.0.ip_configuration.0.server_ca_pool", |
86 | 87 | }
|
87 | 88 |
|
88 | 89 | maintenanceWindowKeys = []string{
|
@@ -525,10 +526,16 @@ is set to true. Defaults to ZONAL.`,
|
525 | 526 | Type: schema.TypeString,
|
526 | 527 | Optional: true,
|
527 | 528 | Computed: true,
|
528 |
| - ValidateFunc: validation.StringInSlice([]string{"CA_MODE_UNSPECIFIED", "GOOGLE_MANAGED_INTERNAL_CA", "GOOGLE_MANAGED_CAS_CA"}, false), |
| 529 | + ValidateFunc: validation.StringInSlice([]string{"CA_MODE_UNSPECIFIED", "GOOGLE_MANAGED_INTERNAL_CA", "GOOGLE_MANAGED_CAS_CA", "CUSTOMER_MANAGED_CAS_CA"}, false), |
529 | 530 | Description: `Specify how the server certificate's Certificate Authority is hosted.`,
|
530 | 531 | AtLeastOneOf: ipConfigurationKeys,
|
531 | 532 | },
|
| 533 | + "server_ca_pool": { |
| 534 | + Type: schema.TypeString, |
| 535 | + Optional: true, |
| 536 | + Description: `The resource name of the server CA pool for an instance with "CUSTOMER_MANAGED_CAS_CA" as the "server_ca_mode".`, |
| 537 | + AtLeastOneOf: ipConfigurationKeys, |
| 538 | + }, |
532 | 539 | },
|
533 | 540 | },
|
534 | 541 | },
|
@@ -1455,6 +1462,7 @@ func expandIpConfiguration(configured []interface{}, databaseVersion string) *sq
|
1455 | 1462 | PscConfig: expandPscConfig(_ipConfiguration["psc_config"].(*schema.Set).List()),
|
1456 | 1463 | SslMode: _ipConfiguration["ssl_mode"].(string),
|
1457 | 1464 | ServerCaMode: _ipConfiguration["server_ca_mode"].(string),
|
| 1465 | + ServerCaPool: _ipConfiguration["server_ca_pool"].(string), |
1458 | 1466 | }
|
1459 | 1467 | }
|
1460 | 1468 |
|
@@ -2379,6 +2387,7 @@ func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema
|
2379 | 2387 | "enable_private_path_for_google_cloud_services": ipConfiguration.EnablePrivatePathForGoogleCloudServices,
|
2380 | 2388 | "ssl_mode": ipConfiguration.SslMode,
|
2381 | 2389 | "server_ca_mode": ipConfiguration.ServerCaMode,
|
| 2390 | + "server_ca_pool": ipConfiguration.ServerCaPool, |
2382 | 2391 | }
|
2383 | 2392 |
|
2384 | 2393 | if ipConfiguration.AuthorizedNetworks != nil {
|
|
0 commit comments