Fix the doc for database and add extra field (#182)

civo · Jul 11, 2023 · ebf0ba6 · ebf0ba6
1 parent 90ca864
commit ebf0ba6
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 0 deletions.
diff --git a/civo/datasource_database.go b/civo/datasource_database.go
@@ -2,6 +2,7 @@ package civo
 
 import (
 	"context"
+	"fmt"
 	"log"
 	"strings"
 
@@ -77,6 +78,21 @@ func dataSourceDatabase() *schema.Resource {
 				Computed:    true,
 				Description: "The password of the database",
 			},
+			"endpoint": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The endpoint of the database",
+			},
+			"dns_endpoint": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The DNS endpoint of the database",
+			},
+			"port": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "The port of the database",
+			},
 			"status": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -128,6 +144,9 @@ func dataSourceDatabaseRead(_ context.Context, d *schema.ResourceData, m interfa
 	d.Set("firewall_id", foundDatabase.FirewallID)
 	d.Set("username", foundDatabase.Username)
 	d.Set("password", foundDatabase.Password)
+	d.Set("endpoint", foundDatabase.PublicIPv4)
+	d.Set("dns_endpoint", fmt.Sprintf("%s.db.civo.com", foundDatabase.ID))
+	d.Set("port", foundDatabase.Port)
 	d.Set("status", foundDatabase.Status)
 
 	return nil

diff --git a/civo/resource_database.go b/civo/resource_database.go
@@ -2,6 +2,7 @@ package civo
 
 import (
 	"context"
+	"fmt"
 	"log"
 	"time"
 
@@ -47,6 +48,7 @@ func resourceDatabase() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 				Description: "The id of the associated network",
+				ForceNew:    true,
 			},
 			"nodes": {
 				Type:         schema.TypeInt,
@@ -76,6 +78,21 @@ func resourceDatabase() *schema.Resource {
 				Computed:    true,
 				Description: "The password of the database",
 			},
+			"endpoint": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The endpoint of the database",
+			},
+			"dns_endpoint": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The DNS endpoint of the database",
+			},
+			"port": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "The port of the database",
+			},
 			"status": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -249,6 +266,9 @@ func resourceDatabaseRead(ctx context.Context, d *schema.ResourceData, m interfa
 	d.Set("region", apiClient.Region)
 	d.Set("username", resp.Username)
 	d.Set("password", resp.Password)
+	d.Set("endpoint", resp.PublicIPv4)
+	d.Set("dns_endpoint", fmt.Sprintf("%s.db.civo.com", resp.ID))
+	d.Set("port", resp.Port)
 	d.Set("status", resp.Status)
 
 	return nil

diff --git a/examples/data-sources/civo_database_version/data-source.tf b/examples/data-sources/civo_database_version/data-source.tf
@@ -14,6 +14,18 @@ data civo_database_version "postgresql" {
     }
 }
 
+data "civo_size" "small" {
+    filter {
+        key = "name"
+        values = ["db.small"]
+        match_by = "re"
+    }
+    filter {
+        key = "type"
+        values = ["database"]
+    }
+}
+
 # To use this data source, make sure you have a database cluster created.
 resource "civo_database" "custom_database" {
     name = "custom_database"

diff --git a/examples/resources/civo_database/resource.tf b/examples/resources/civo_database/resource.tf
@@ -10,6 +10,13 @@ data "civo_size" "small" {
     }
 }
 
+data civo_database_version "mysql" {
+  filter {
+        key = "engine"
+        values = ["mysql"]
+    }
+}
+
 resource "civo_database" "custom_database" {
     name = "custom_database"
     size = element(data.civo_size.small.sizes, 0).name