Fixed error in the doc

Added data source instance test Fixed typo error in doc Signed-off-by: Alejandro JNM <[email protected]>
civo · Jul 3, 2020 · 8b75b83 · 8b75b83
1 parent 12c41ce
commit 8b75b83
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 6 deletions.
diff --git a/civo/datasource_instance_test.go b/civo/datasource_instance_test.go
@@ -0,0 +1,75 @@
+package civo
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+)
+
+func TestAccDataSourceCivoInstance_basic(t *testing.T) {
+	datasourceName := "data.civo_instance.foobar"
+	name := acctest.RandomWithPrefix("instance") + ".com"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceCivoInstanceConfig(name),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(datasourceName, "hostname", name),
+					resource.TestCheckResourceAttrSet(datasourceName, "private_ip"),
+					resource.TestCheckResourceAttrSet(datasourceName, "public_ip"),
+					resource.TestCheckResourceAttrSet(datasourceName, "pseudo_ip"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccDataSourceCivoInstanceByID_basic(t *testing.T) {
+	datasourceName := "data.civo_instance.foobar"
+	name := acctest.RandomWithPrefix("instance") + ".com"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceCivoInstanceByIDConfig(name),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(datasourceName, "hostname", name),
+					resource.TestCheckResourceAttrSet(datasourceName, "private_ip"),
+					resource.TestCheckResourceAttrSet(datasourceName, "public_ip"),
+					resource.TestCheckResourceAttrSet(datasourceName, "pseudo_ip"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourceCivoInstanceConfig(name string) string {
+	return fmt.Sprintf(`
+resource "civo_instance" "vm" {
+	hostname = "%s"
+}
+
+data "civo_instance" "foobar" {
+	hostname = civo_instance.vm.hostname
+}
+`, name)
+}
+
+func testAccDataSourceCivoInstanceByIDConfig(name string) string {
+	return fmt.Sprintf(`
+resource "civo_instance" "vm" {
+	hostname = "%s"
+}
+
+data "civo_instance" "foobar" {
+	id = civo_instance.vm.id
+}
+`, name)
+}
diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown
@@ -30,7 +30,7 @@ output "instance_output" {
 }
 ```
 
-Get the Droplet by id:
+Get the Instance by id:
 
 ```hcl
 data "civo_instance" "myhostaname" {
@@ -48,7 +48,7 @@ One of following the arguments must be provided:
 
 The following attributes are exported:
 
-* `id` - The ID of the Droplet.
+* `id` - The ID of the Instance.
 * `hostname` - The Instance hostname.
 * `reverse_dns` - A fully qualified domain name.
 * `size` - The name of the size.

diff --git a/website/docs/d/instances.html.markdown b/website/docs/d/instances.html.markdown
@@ -88,7 +88,7 @@ data "civo_instances" "small-with-backups" {
 
 `sort` supports the following arguments:
 
-* `key` - (Required) Sort the Droplets by this key. This may be one of `id`, `hostname`, `public_ip`, `private_ip`,
+* `key` - (Required) Sort the Instance by this key. This may be one of `id`, `hostname`, `public_ip`, `private_ip`,
   `pseudo_ip`, `size`, `template` or `created_at`.
 
 * `direction` - (Required) The sort direction. This may be either `asc` or `desc`.
@@ -97,7 +97,7 @@ data "civo_instances" "small-with-backups" {
 
 * `instances` - A list of Instances satisfying any `filter` and `sort` criteria. Each instance has the following attributes:  
 
-* `id` - The ID of the Droplet.
+* `id` - The ID of the Instance.
 * `hostname` - The Instance hostname.
 * `reverse_dns` - A fully qualified domain name.
 * `size` - The name of the size.

diff --git a/website/docs/d/snapshot.html.markdown b/website/docs/d/snapshot.html.markdown
@@ -31,7 +31,7 @@ data "civo_snapshot" "mysql-vm" {
 
 The following attributes are exported:
 
-* `id` The ID of the Droplet snapshot.
+* `id` The ID of the Instance snapshot.
 * `name` - The name of the snapshot.
 * `instance_id` - The ID of the Instance from which the snapshot was be taken.
 * `safe` - If is `true` the instance will be shut down during the snapshot if id `false` them not.

diff --git a/website/docs/r/snapshot.html.markdown b/website/docs/r/snapshot.html.markdown
@@ -38,7 +38,7 @@ The default is nil meaning the snapshot will be saved as a one-off snapshot.
 
 The following attributes are exported:
 
-* `id` The ID of the Droplet snapshot.
+* `id` The ID of the Instance snapshot.
 * `name` - The name of the snapshot.
 * `instance_id` - The ID of the Instance from which the snapshot was be taken.
 * `safe` - If is `true` the instance will be shut down during the snapshot if id `false` them not.