Skip to content
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.

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

Already on GitHub? Sign in to your account

feat(Cloud Databases): Allow users to edit configuration on database creation #4186

Merged
merged 4 commits into from Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 26 additions & 0 deletions ibm/service/database/resource_ibm_database.go
Expand Up @@ -1232,6 +1232,12 @@ func resourceIBMDatabaseInstanceDiff(_ context.Context, diff *schema.ResourceDif
return fmt.Errorf("[ERROR] node_count, node_memory_allocation_mb, node_disk_allocation_mb, node_cpu_allocation_count only supported for postgresql, elasticsearch and cassandra")
}

_, configurationSet := diff.GetOk("configuration")

if (service != "databases-for-postgresql" && service != "databases-for-redis" && service != "databases-for-enterprisedb") && configurationSet {
return fmt.Errorf("[ERROR] configuration is not supported for %s", service)
}

return nil
}

Expand Down Expand Up @@ -1676,6 +1682,26 @@ func resourceIBMDatabaseInstanceCreate(context context.Context, d *schema.Resour
}
}

if config, ok := d.GetOk("configuration"); ok {
service := d.Get("service").(string)
if service == "databases-for-postgresql" || service == "databases-for-redis" || service == "databases-for-enterprisedb" {
var configuration interface{}
json.Unmarshal([]byte(config.(string)), &configuration)
configPayload := icdv4.ConfigurationReq{Configuration: configuration}
task, err := icdClient.Configurations().UpdateConfiguration(icdId, configPayload)
if err != nil {
return diag.FromErr(fmt.Errorf("[ERROR] Error updating database (%s) configuration: %s", icdId, err))
}
_, err = waitForDatabaseTaskComplete(task.Id, d, meta, d.Timeout(schema.TimeoutUpdate))
if err != nil {
return diag.FromErr(fmt.Errorf(
"[ERROR] Error waiting for database (%s) configuration update task to complete: %s", icdId, err))
}
} else {
return diag.FromErr(fmt.Errorf("[ERROR] given database type %s is not configurable", service))
}
}

return resourceIBMDatabaseInstanceRead(context, d, meta)
}

Expand Down
7 changes: 7 additions & 0 deletions ibm/service/database/resource_ibm_database_postgresql_test.go
Expand Up @@ -589,6 +589,13 @@ func testAccCheckIBMDatabaseInstancePostgresBasic(databaseResourceGroup string,
address = "172.168.1.2/32"
description = "desc1"
}
configuration = <<CONFIGURATION
{
"wal_level": "logical",
"max_replication_slots": 21,
"max_wal_senders": 21
}
CONFIGURATION
}
`, databaseResourceGroup, name, acc.IcdDbRegion)
}
Expand Down
5 changes: 5 additions & 0 deletions ibm/service/database/resource_ibm_database_redis_test.go
Expand Up @@ -176,6 +176,11 @@ func testAccCheckIBMDatabaseInstanceRedisBasic(databaseResourceGroup string, nam
address = "172.168.1.2/32"
description = "desc1"
}
configuration = <<CONFIGURATION
{
"maxmemory-policy": "allkeys-lru"
}
CONFIGURATION
}
`, databaseResourceGroup, name, acc.IcdDbRegion)
}
Expand Down