mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-06 18:51:13 +00:00
provider/google: add failover parameter to sql database instance (#14336)
* provider/google: add failover parameter to sql database instance * provider/google: update sql database instance docs
This commit is contained in:
parent
c1ddeac868
commit
0a0d8eb076
@ -270,6 +270,11 @@ func resourceSqlDatabaseInstance() *schema.Resource {
|
|||||||
Optional: true,
|
Optional: true,
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
|
"failover_target": &schema.Schema{
|
||||||
|
Type: schema.TypeBool,
|
||||||
|
Optional: true,
|
||||||
|
ForceNew: true,
|
||||||
|
},
|
||||||
"master_heartbeat_period": &schema.Schema{
|
"master_heartbeat_period": &schema.Schema{
|
||||||
Type: schema.TypeInt,
|
Type: schema.TypeInt,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
@ -526,6 +531,10 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
|
|||||||
mySqlReplicaConfiguration := &sqladmin.MySqlReplicaConfiguration{}
|
mySqlReplicaConfiguration := &sqladmin.MySqlReplicaConfiguration{}
|
||||||
_replicaConfiguration := _replicaConfigurationList[0].(map[string]interface{})
|
_replicaConfiguration := _replicaConfigurationList[0].(map[string]interface{})
|
||||||
|
|
||||||
|
if vp, okp := _replicaConfiguration["failover_target"]; okp {
|
||||||
|
replicaConfiguration.FailoverTarget = vp.(bool)
|
||||||
|
}
|
||||||
|
|
||||||
if vp, okp := _replicaConfiguration["ca_certificate"]; okp {
|
if vp, okp := _replicaConfiguration["ca_certificate"]; okp {
|
||||||
mySqlReplicaConfiguration.CaCertificate = vp.(string)
|
mySqlReplicaConfiguration.CaCertificate = vp.(string)
|
||||||
}
|
}
|
||||||
@ -835,6 +844,10 @@ func resourceSqlDatabaseInstanceRead(d *schema.ResourceData, meta interface{}) e
|
|||||||
mySqlReplicaConfiguration := instance.ReplicaConfiguration.MysqlReplicaConfiguration
|
mySqlReplicaConfiguration := instance.ReplicaConfiguration.MysqlReplicaConfiguration
|
||||||
_replicaConfiguration := _replicaConfigurationList[0].(map[string]interface{})
|
_replicaConfiguration := _replicaConfigurationList[0].(map[string]interface{})
|
||||||
|
|
||||||
|
if vp, okp := _replicaConfiguration["failover_target"]; okp && vp != nil {
|
||||||
|
_replicaConfiguration["failover_target"] = instance.ReplicaConfiguration.FailoverTarget
|
||||||
|
}
|
||||||
|
|
||||||
if vp, okp := _replicaConfiguration["ca_certificate"]; okp && vp != nil {
|
if vp, okp := _replicaConfiguration["ca_certificate"]; okp && vp != nil {
|
||||||
_replicaConfiguration["ca_certificate"] = mySqlReplicaConfiguration.CaCertificate
|
_replicaConfiguration["ca_certificate"] = mySqlReplicaConfiguration.CaCertificate
|
||||||
}
|
}
|
||||||
|
@ -408,8 +408,14 @@ func testAccCheckGoogleSqlDatabaseInstanceEquals(n string,
|
|||||||
return fmt.Errorf("Error settings.pricing_plan mismatch, (%s, %s)", server, local)
|
return fmt.Errorf("Error settings.pricing_plan mismatch, (%s, %s)", server, local)
|
||||||
}
|
}
|
||||||
|
|
||||||
if instance.ReplicaConfiguration != nil &&
|
if instance.ReplicaConfiguration != nil {
|
||||||
instance.ReplicaConfiguration.MysqlReplicaConfiguration != nil {
|
server = strconv.FormatBool(instance.ReplicaConfiguration.FailoverTarget)
|
||||||
|
local = attributes["replica_configuration.0.failover_target"]
|
||||||
|
if server != local && len(server) > 0 && len(local) > 0 {
|
||||||
|
return fmt.Errorf("Error replica_configuration.failover_target mismatch, (%s, %s)", server, local)
|
||||||
|
}
|
||||||
|
|
||||||
|
if instance.ReplicaConfiguration.MysqlReplicaConfiguration != nil {
|
||||||
server = instance.ReplicaConfiguration.MysqlReplicaConfiguration.CaCertificate
|
server = instance.ReplicaConfiguration.MysqlReplicaConfiguration.CaCertificate
|
||||||
local = attributes["replica_configuration.0.ca_certificate"]
|
local = attributes["replica_configuration.0.ca_certificate"]
|
||||||
if server != local && len(server) > 0 && len(local) > 0 {
|
if server != local && len(server) > 0 && len(local) > 0 {
|
||||||
@ -470,6 +476,7 @@ func testAccCheckGoogleSqlDatabaseInstanceEquals(n string,
|
|||||||
return fmt.Errorf("Error replica_configuration.verify_server_certificate mismatch, (%s, %s)", server, local)
|
return fmt.Errorf("Error replica_configuration.verify_server_certificate mismatch, (%s, %s)", server, local)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user