Fixed kubernetes cluster

Added the tags option to the kubernetes cluster resource Added the test for the kubernetes cluster Signed-off-by: Alejandro JNM <[email protected]>
civo · Jul 2, 2020 · 68cca03 · 68cca03
1 parent 75e69a8
commit 68cca03
Show file tree

Hide file tree

Showing 2 changed files with 237 additions and 1 deletion.
diff --git a/civo/resource_kubernetes_cluster.go b/civo/resource_kubernetes_cluster.go
@@ -261,9 +261,14 @@ func resourceKubernetesClusterUpdate(d *schema.ResourceData, m interface{}) erro
 		config.Name = d.Get("name").(string)
 		config.NumTargetNodes = d.Get("num_target_nodes").(int)
 		config.KubernetesVersion = d.Get("kubernetes_version").(string)
+
 		config.Applications = d.Get("applications").(string)
 	}
 
+	if d.HasChange("tags") {
+		config.Tags = d.Get("tags").(string)
+	}
+
 	log.Printf("[INFO] updating the kubernetes cluster %s", d.Id())
 	_, err := apiClient.UpdateKubernetesCluster(d.Id(), config)
 	if err != nil {
@@ -277,7 +282,7 @@ func resourceKubernetesClusterUpdate(d *schema.ResourceData, m interface{}) erro
 		}
 
 		if resp.Status != "ACTIVE" {
-			return resource.RetryableError(fmt.Errorf("[ERR] waiting for the kubernets cluster to be created but the status is %s", resp.Status))
+			return resource.RetryableError(fmt.Errorf("[ERR] waiting for the kubernets cluster to be updated but the status is %s", resp.Status))
 		}
 
 		return resource.NonRetryableError(resourceKubernetesClusterRead(d, m))

diff --git a/civo/resource_kubernetes_cluster_test.go b/civo/resource_kubernetes_cluster_test.go
@@ -0,0 +1,231 @@
+package civo
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/civo/civogo"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+)
+
+// example.Widget represents a concrete Go type that represents an API resource
+func TestAccCivoKubernetesCluster_basic(t *testing.T) {
+	var kubernetes civogo.KubernetesCluster
+
+	// generate a random name for each test run
+	resName := "civo_kubernetes_cluster.foobar"
+	var kubernetesClusterName = acctest.RandomWithPrefix("tf-test") + ".example"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCivoKubernetesClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				// use a dynamic configuration with the random name from above
+				Config: testAccCheckCivoKubernetesClusterConfigBasic(kubernetesClusterName),
+				// compose a basic test, checking both remote and local values
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the widget object
+					testAccCheckCivoKubernetesClusterResourceExists(resName, &kubernetes),
+					// verify remote values
+					testAccCheckCivoKubernetesClusterValues(&kubernetes, kubernetesClusterName),
+					// verify local values
+					resource.TestCheckResourceAttr(resName, "name", kubernetesClusterName),
+					resource.TestCheckResourceAttr(resName, "num_target_nodes", "2"),
+					resource.TestCheckResourceAttr(resName, "target_nodes_size", "g2.small"),
+					// resource.TestCheckResourceAttrSet(resName, "instances"),
+					resource.TestCheckResourceAttrSet(resName, "kubeconfig"),
+					resource.TestCheckResourceAttrSet(resName, "api_endpoint"),
+					resource.TestCheckResourceAttrSet(resName, "dns_entry"),
+					resource.TestCheckResourceAttrSet(resName, "built_at"),
+					resource.TestCheckResourceAttrSet(resName, "created_at"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccCivoKubernetesClusterSize_update(t *testing.T) {
+	var kubernetes civogo.KubernetesCluster
+
+	// generate a random name for each test run
+	resName := "civo_kubernetes_cluster.foobar"
+	var kubernetesClusterName = acctest.RandomWithPrefix("tf-test") + ".example"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCivoInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCivoKubernetesClusterConfigBasic(kubernetesClusterName),
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the widget object
+					testAccCheckCivoKubernetesClusterResourceExists(resName, &kubernetes),
+					// verify remote values
+					testAccCheckCivoKubernetesClusterValues(&kubernetes, kubernetesClusterName),
+					// verify local values
+					resource.TestCheckResourceAttr(resName, "name", kubernetesClusterName),
+					resource.TestCheckResourceAttr(resName, "num_target_nodes", "2"),
+					resource.TestCheckResourceAttr(resName, "target_nodes_size", "g2.small"),
+					resource.TestCheckResourceAttrSet(resName, "kubeconfig"),
+					resource.TestCheckResourceAttrSet(resName, "api_endpoint"),
+					resource.TestCheckResourceAttrSet(resName, "dns_entry"),
+					resource.TestCheckResourceAttrSet(resName, "built_at"),
+					resource.TestCheckResourceAttrSet(resName, "created_at"),
+				),
+			},
+			{
+				// use a dynamic configuration with the random name from above
+				Config: testAccCheckCivoKubernetesClusterConfigSize(kubernetesClusterName),
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the widget object
+					testAccCheckCivoKubernetesClusterResourceExists(resName, &kubernetes),
+					// verify remote values
+					testAccCheckCivoKubernetesClusterValues(&kubernetes, kubernetesClusterName),
+					// verify local values
+					resource.TestCheckResourceAttr(resName, "name", kubernetesClusterName),
+					resource.TestCheckResourceAttr(resName, "num_target_nodes", "4"),
+					resource.TestCheckResourceAttr(resName, "target_nodes_size", "g2.small"),
+					resource.TestCheckResourceAttrSet(resName, "kubeconfig"),
+					resource.TestCheckResourceAttrSet(resName, "api_endpoint"),
+					resource.TestCheckResourceAttrSet(resName, "dns_entry"),
+					resource.TestCheckResourceAttrSet(resName, "built_at"),
+					resource.TestCheckResourceAttrSet(resName, "created_at"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccCivoKubernetesClusterTags_update(t *testing.T) {
+	var kubernetes civogo.KubernetesCluster
+
+	// generate a random name for each test run
+	resName := "civo_kubernetes_cluster.foobar"
+	var kubernetesClusterName = acctest.RandomWithPrefix("tf-test") + ".example"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCivoInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCivoKubernetesClusterConfigBasic(kubernetesClusterName),
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the widget object
+					testAccCheckCivoKubernetesClusterResourceExists(resName, &kubernetes),
+					// verify remote values
+					testAccCheckCivoKubernetesClusterValues(&kubernetes, kubernetesClusterName),
+					// verify local values
+					resource.TestCheckResourceAttr(resName, "name", kubernetesClusterName),
+					resource.TestCheckResourceAttr(resName, "num_target_nodes", "2"),
+					resource.TestCheckResourceAttr(resName, "target_nodes_size", "g2.small"),
+					resource.TestCheckResourceAttrSet(resName, "kubeconfig"),
+					resource.TestCheckResourceAttrSet(resName, "api_endpoint"),
+					resource.TestCheckResourceAttrSet(resName, "dns_entry"),
+					resource.TestCheckResourceAttrSet(resName, "built_at"),
+					resource.TestCheckResourceAttrSet(resName, "created_at"),
+				),
+			},
+			{
+				// use a dynamic configuration with the random name from above
+				Config: testAccCheckCivoKubernetesClusterConfigTags(kubernetesClusterName),
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the widget object
+					testAccCheckCivoKubernetesClusterResourceExists(resName, &kubernetes),
+					// verify remote values
+					testAccCheckCivoKubernetesClusterValues(&kubernetes, kubernetesClusterName),
+					// verify local values
+					resource.TestCheckResourceAttr(resName, "name", kubernetesClusterName),
+					resource.TestCheckResourceAttr(resName, "num_target_nodes", "2"),
+					resource.TestCheckResourceAttr(resName, "target_nodes_size", "g2.small"),
+					resource.TestCheckResourceAttr(resName, "tags", "foo"),
+					resource.TestCheckResourceAttrSet(resName, "kubeconfig"),
+					resource.TestCheckResourceAttrSet(resName, "api_endpoint"),
+					resource.TestCheckResourceAttrSet(resName, "dns_entry"),
+					resource.TestCheckResourceAttrSet(resName, "built_at"),
+					resource.TestCheckResourceAttrSet(resName, "created_at"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckCivoKubernetesClusterValues(kubernetes *civogo.KubernetesCluster, name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if kubernetes.Name != name {
+			return fmt.Errorf("bad name, expected \"%s\", got: %#v", name, kubernetes.Name)
+		}
+		return nil
+	}
+}
+
+// testAccCheckExampleResourceExists queries the API and retrieves the matching Widget.
+func testAccCheckCivoKubernetesClusterResourceExists(n string, kubernetes *civogo.KubernetesCluster) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		// find the corresponding state object
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		// retrieve the configured client from the test setup
+		client := testAccProvider.Meta().(*civogo.Client)
+		resp, err := client.GetKubernetesClusters(rs.Primary.ID)
+		if err != nil {
+			return fmt.Errorf("Kuberenetes Cluster not found: (%s) %s", rs.Primary.ID, err)
+		}
+
+		// If no error, assign the response Widget attribute to the widget pointer
+		*kubernetes = *resp
+
+		// return fmt.Errorf("Domain (%s) not found", rs.Primary.ID)
+		return nil
+	}
+}
+
+func testAccCheckCivoKubernetesClusterDestroy(s *terraform.State) error {
+	client := testAccProvider.Meta().(*civogo.Client)
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "civo_kubernetes_cluster" {
+			continue
+		}
+
+		_, err := client.GetKubernetesClusters(rs.Primary.ID)
+		if err == nil {
+			return fmt.Errorf("Kubernetes Cluster still exists")
+		}
+	}
+
+	return nil
+}
+
+func testAccCheckCivoKubernetesClusterConfigBasic(name string) string {
+	return fmt.Sprintf(`
+resource "civo_kubernetes_cluster" "foobar" {
+	name = "%s"
+	num_target_nodes = 2
+}`, name)
+}
+
+func testAccCheckCivoKubernetesClusterConfigSize(name string) string {
+	return fmt.Sprintf(`
+resource "civo_kubernetes_cluster" "foobar" {
+	name = "%s"
+	num_target_nodes = 4
+}`, name)
+}
+
+func testAccCheckCivoKubernetesClusterConfigTags(name string) string {
+	return fmt.Sprintf(`
+resource "civo_kubernetes_cluster" "foobar" {
+	name = "%s"
+	num_target_nodes = 2
+	tags = "foo"
+}`, name)
+}