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.

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

fix(Cloud-Databases): Remove deprecated connectionstrings attribute #5554

Merged
merged 1 commit into from
Aug 9, 2024
Merged

fix(Cloud-Databases): Remove deprecated connectionstrings attribute #5554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
153 changes: 0 additions & 153 deletions ibm/service/database/resource_ibm_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,78 +347,6 @@ func ResourceIBMDatabaseInstance() *schema.Resource {
},
},
},
"connectionstrings": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Description: "User name",
Type: schema.TypeString,
Computed: true,
},
"composed": {
Description: "Connection string",
Type: schema.TypeString,
Computed: true,
},
"scheme": {
Description: "DB scheme",
Type: schema.TypeString,
Computed: true,
},
"certname": {
Description: "Certificate Name",
Type: schema.TypeString,
Computed: true,
},
"certbase64": {
Description: "Certificate in base64 encoding",
Type: schema.TypeString,
Computed: true,
},
"password": {
Description: "Password",
Type: schema.TypeString,
Computed: true,
},
"queryoptions": {
Description: "DB query options",
Type: schema.TypeString,
Computed: true,
},
"database": {
Description: "DB name",
Type: schema.TypeString,
Computed: true,
},
"path": {
Description: "DB path",
Type: schema.TypeString,
Computed: true,
},
"hosts": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"hostname": {
Description: "DB host name",
Type: schema.TypeString,
Computed: true,
},
"port": {
Description: "DB port",
Type: schema.TypeString,
Computed: true,
},
},
},
},
},
},
Deprecated: "This field is deprecated, please use ibm_database_connection instead",
},
"allowlist": {
Type: schema.TypeSet,
Optional: true,
Expand Down Expand Up @@ -1628,7 +1556,6 @@ func resourceIBMDatabaseInstanceRead(context context.Context, d *schema.Resource
}

instanceID := d.Id()
connectionEndpoint := "public"
rsInst := rc.GetResourceInstanceOptions{
ID: &instanceID,
}
Expand Down Expand Up @@ -1667,9 +1594,6 @@ func resourceIBMDatabaseInstanceRead(context context.Context, d *schema.Resource

if instance.Parameters != nil {
if endpoint, ok := instance.Parameters["service-endpoints"]; ok {
if endpoint == "private" {
connectionEndpoint = "private"
}
d.Set("service_endpoints", endpoint)
}

Expand Down Expand Up @@ -1770,23 +1694,13 @@ func resourceIBMDatabaseInstanceRead(context context.Context, d *schema.Resource

d.Set("allowlist", flex.FlattenAllowlist(allowlist.IPAddresses))

var connectionStrings []flex.CsEntry
//ICD does not implement a GetUsers API. Users populated from tf configuration.
tfusers := d.Get("users").(*schema.Set)
users := flex.ExpandUsers(tfusers)
user := icdv4.User{
UserName: deployment.AdminUsernames["database"],
}
users = append(users, user)
for _, user := range users {
userName := user.UserName
csEntry, err := getConnectionString(d, userName, connectionEndpoint, meta)
if err != nil {
return diag.FromErr(fmt.Errorf("[ERROR] Error getting user connection string for user (%s): %s", userName, err))
}
connectionStrings = append(connectionStrings, csEntry)
}
d.Set("connectionstrings", flex.FlattenConnectionStrings(connectionStrings))

if serviceOff == "databases-for-postgresql" || serviceOff == "databases-for-redis" || serviceOff == "databases-for-enterprisedb" {
configSchema, err := icdClient.Configurations().GetConfiguration(icdId)
Expand Down Expand Up @@ -2219,73 +2133,6 @@ func resourceIBMDatabaseInstanceUpdate(context context.Context, d *schema.Resour
return resourceIBMDatabaseInstanceRead(context, d, meta)
}

func getConnectionString(d *schema.ResourceData, userName, connectionEndpoint string, meta interface{}) (flex.CsEntry, error) {
csEntry := flex.CsEntry{}
icdClient, err := meta.(conns.ClientSession).ICDAPI()
if err != nil {
return csEntry, fmt.Errorf("[ERROR] Error getting database client settings: %s", err)
}

icdId := d.Id()
connection, err := icdClient.Connections().GetConnection(icdId, userName, connectionEndpoint)
if err != nil {
return csEntry, fmt.Errorf("[ERROR] Error getting database user connection string via ICD API: %s", err)
}

service := d.Get("service")
dbConnection := icdv4.Uri{}

switch service {
case "databases-for-postgresql":
dbConnection = connection.Postgres
case "databases-for-redis":
dbConnection = connection.Rediss
case "databases-for-mongodb":
dbConnection = connection.Mongo
case "databases-for-mysql":
dbConnection = connection.Mysql
case "databases-for-elasticsearch":
dbConnection = connection.Https
case "databases-for-etcd":
dbConnection = connection.Grpc
case "messages-for-rabbitmq":
dbConnection = connection.Amqps
case "databases-for-enterprisedb":
dbConnection = connection.Postgres
default:
return csEntry, fmt.Errorf("[ERROR] Unrecognised database type during connection string lookup: %s", service)
}

csEntry = flex.CsEntry{
Name: userName,
Password: "",
// Populate only first 'composed' connection string as an example
Composed: dbConnection.Composed[0],
CertName: dbConnection.Certificate.Name,
CertBase64: dbConnection.Certificate.CertificateBase64,
Hosts: dbConnection.Hosts,
Scheme: dbConnection.Scheme,
Path: dbConnection.Path,
QueryOptions: dbConnection.QueryOptions.(map[string]interface{}),
}

// Postgres DB name is of type string, Redis is json.Number, others are nil
if dbConnection.Database != nil {
switch v := dbConnection.Database.(type) {
default:
return csEntry, fmt.Errorf("Unexpected data type: %T", v)
case json.Number:
csEntry.Database = dbConnection.Database.(json.Number).String()
case string:
csEntry.Database = dbConnection.Database.(string)
}
} else {
csEntry.Database = ""
}

return csEntry, nil
}

func resourceIBMDatabaseInstanceDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
rsConClient, err := meta.(conns.ClientSession).ResourceControllerV2API()
if err != nil {
Expand Down
13 changes: 0 additions & 13 deletions ibm/service/database/resource_ibm_database_edb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package database_test

import (
"fmt"
"regexp"
"testing"

acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
Expand Down Expand Up @@ -41,10 +40,6 @@ func TestAccIBMEDBDatabaseInstanceBasic(t *testing.T) {
resource.TestCheckResourceAttr(name, "service_endpoints", "public"),
resource.TestCheckResourceAttr(name, "allowlist.#", "1"),
resource.TestCheckResourceAttr(name, "users.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.1.name", "admin"),
resource.TestMatchResourceAttr(name, "connectionstrings.1.certname", regexp.MustCompile("[-a-z0-9]*")),
resource.TestMatchResourceAttr(name, "connectionstrings.1.certbase64", regexp.MustCompile("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")),
resource.TestCheckResourceAttr(name, "tags.#", "1"),
),
},
Expand All @@ -61,13 +56,6 @@ func TestAccIBMEDBDatabaseInstanceBasic(t *testing.T) {
resource.TestCheckResourceAttr(name, "service_endpoints", "public-and-private"),
resource.TestCheckResourceAttr(name, "allowlist.#", "2"),
resource.TestCheckResourceAttr(name, "users.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "3"),
resource.TestCheckResourceAttr(name, "connectionstrings.2.name", "admin"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.hosts.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.scheme", "postgres"),
resource.TestMatchResourceAttr(name, "connectionstrings.0.certname", regexp.MustCompile("[-a-z0-9]*")),
resource.TestMatchResourceAttr(name, "connectionstrings.0.certbase64", regexp.MustCompile("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")),
resource.TestMatchResourceAttr(name, "connectionstrings.0.database", regexp.MustCompile("[-a-z0-9]+")),
resource.TestCheckResourceAttr(name, "tags.#", "1"),
),
},
Expand All @@ -83,7 +71,6 @@ func TestAccIBMEDBDatabaseInstanceBasic(t *testing.T) {
resource.TestCheckResourceAttr(name, "groups.0.disk.0.allocation_mb", "92160"),
resource.TestCheckResourceAttr(name, "allowlist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
resource.TestCheckResourceAttr(name, "tags.#", "1"),
),
},
Expand Down
24 changes: 0 additions & 24 deletions ibm/service/database/resource_ibm_database_elasticsearch_platinum_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Basic(t *testing.T) {
resource.TestCheckResourceAttr(name, "adminuser", "admin"),
resource.TestCheckResourceAttr(name, "allowlist.#", "1"),
resource.TestCheckResourceAttr(name, "users.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.1.name", "admin"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.hosts.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.database", ""),
),
},
{
Expand All @@ -53,8 +49,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Basic(t *testing.T) {
resource.TestCheckResourceAttr(name, "location", acc.Region()),
resource.TestCheckResourceAttr(name, "allowlist.#", "2"),
resource.TestCheckResourceAttr(name, "users.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "3"),
resource.TestCheckResourceAttr(name, "connectionstrings.2.name", "admin"),
),
},
{
Expand All @@ -69,7 +63,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Basic(t *testing.T) {
resource.TestCheckResourceAttr(name, "groups.0.disk.0.allocation_mb", "18432"),
resource.TestCheckResourceAttr(name, "allowlist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
),
},
{
Expand All @@ -84,7 +77,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Basic(t *testing.T) {
resource.TestCheckResourceAttr(name, "groups.0.disk.0.allocation_mb", "18432"),
resource.TestCheckResourceAttr(name, "whitelist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
),
},
// {
Expand Down Expand Up @@ -121,10 +113,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Node(t *testing.T) {

resource.TestCheckResourceAttr(name, "allowlist.#", "1"),
resource.TestCheckResourceAttr(name, "users.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.1.name", "admin"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.hosts.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.database", ""),
),
},
{
Expand All @@ -137,8 +125,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Node(t *testing.T) {
resource.TestCheckResourceAttr(name, "location", acc.Region()),
resource.TestCheckResourceAttr(name, "allowlist.#", "2"),
resource.TestCheckResourceAttr(name, "users.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "3"),
resource.TestCheckResourceAttr(name, "connectionstrings.2.name", "admin"),
),
},
{
Expand All @@ -151,7 +137,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Node(t *testing.T) {
resource.TestCheckResourceAttr(name, "location", acc.Region()),
resource.TestCheckResourceAttr(name, "allowlist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
),
},
{
Expand All @@ -164,7 +149,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Node(t *testing.T) {
resource.TestCheckResourceAttr(name, "location", acc.Region()),
resource.TestCheckResourceAttr(name, "allowlist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
),
},
//{
Expand Down Expand Up @@ -201,10 +185,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Group(t *testing.T) {

resource.TestCheckResourceAttr(name, "allowlist.#", "1"),
resource.TestCheckResourceAttr(name, "users.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.1.name", "admin"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.hosts.#", "1"),
resource.TestCheckResourceAttr(name, "connectionstrings.0.database", ""),
),
},
{
Expand All @@ -221,8 +201,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Group(t *testing.T) {
resource.TestCheckResourceAttr(name, "groups.0.cpu.0.allocation_count", "12"),
resource.TestCheckResourceAttr(name, "allowlist.#", "2"),
resource.TestCheckResourceAttr(name, "users.#", "2"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "3"),
resource.TestCheckResourceAttr(name, "connectionstrings.2.name", "admin"),
),
},
{
Expand All @@ -239,7 +217,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Group(t *testing.T) {
resource.TestCheckResourceAttr(name, "groups.0.cpu.0.allocation_count", "12"),
resource.TestCheckResourceAttr(name, "allowlist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
),
},
{
Expand All @@ -256,7 +233,6 @@ func TestAccIBMDatabaseInstance_ElasticsearchPlatinum_Group(t *testing.T) {
resource.TestCheckResourceAttr(name, "groups.0.cpu.0.allocation_count", "16"),
resource.TestCheckResourceAttr(name, "allowlist.#", "0"),
resource.TestCheckResourceAttr(name, "users.#", "0"),
resource.TestCheckResourceAttr(name, "connectionstrings.#", "1"),
),
},
//{
Expand Down
Loading
Loading