fix update bug caused by unit tests

robwafle · Oct 4, 2022 · 516be8d · 516be8d
1 parent 7e01b18
commit 516be8d
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 TEST?=$$(go list ./... | grep -v 'vendor')
-HOSTNAME=terraform.vmware.com
-NAMESPACE=csc
+HOSTNAME=registry.terraform.io
+NAMESPACE=robwafle
 NAME=tsm
 BINARY=terraform-provider-${NAME}
-VERSION=0.0.75
+VERSION=0.0.77
 OS_ARCH=linux_amd64
 
 default: install

diff --git a/client/cluster.go b/client/cluster.go
@@ -109,7 +109,8 @@ func (c *Client) UpdateCluster(ctx context.Context, cluster Cluster, authToken *
 	tflog.Trace(ctx, "Updating Cluster ...")
 	putUrl := fmt.Sprintf("%s/tsm/v1alpha1/clusters/%s?createOnly=false", c.HostURL, cluster.DisplayName)
 
-	// set this to nil, because we're not supposed to send it to the PUT
+	// set this to nil, because we're not supposed to send it to the PUT	// set this to nil, because we're not supposed to send it to the PUT
+	cluster.ID = ""
 	clusterJSON, err := json.Marshal(cluster)
 	if err != nil {
 		return nil, err

diff --git a/client/globalnamespace.go b/client/globalnamespace.go
@@ -59,9 +59,11 @@ func (c *Client) GetGlobalNamespace(ctx context.Context, id string) (*GlobalName
 
 // CreateGlobalNamespace - Create new GlobalNamespace
 func (c *Client) CreateUpdateGlobalNamespace(ctx context.Context, globalNamespace GlobalNamespace, authToken *string) (*GlobalNamespace, error) {
-	putUrl := fmt.Sprintf("%s/tsm/v1alpha1/global-namespaces/%s", c.HostURL, globalNamespace.Name)
+	putUrl := fmt.Sprintf("%s/tsm/v1alpha1/global-namespaces/%s", c.HostURL, globalNamespace.ID)
 
 	// set this to nil, because we're not supposed to send it to the PUT
+	globalNamespace.ID = ""
+
 	GlobalNamespaceJSON, err := json.Marshal(globalNamespace)
 	if err != nil {
 		return nil, err

diff --git a/docs/resources/globalnamespace.md b/docs/resources/globalnamespace.md
@@ -29,7 +29,7 @@ description: |-
 
 ### Optional
 
-- `color` (String)
+- `color` (String) test description
 - `description` (String)
 - `last_updated` (String)
 - `match_condition` (Block Set) (see [below for nested schema](#nestedblock--match_condition))

diff --git a/examples/aks_cluster/tsm-cluster.tf b/examples/aks_cluster/tsm-cluster.tf
@@ -14,7 +14,7 @@ resource "tsm_cluster" "aks" {
   labels = {
     L1 = "value one"
     L2 = "value two"
-    //L3 = "value three"
+    L3 = "value three"
     L4 = "value four"
   }
 

diff --git a/examples/aks_cluster/tsm-globalnamespace.tf b/examples/aks_cluster/tsm-globalnamespace.tf
@@ -9,7 +9,7 @@ resource "tsm_globalnamespace" "default" {
   api_discovery_enabled = true
   ca_type = "PreExistingCA"
   ca = "default"
-  description = "created via terraform"
+  description = "created via terraform test update"
   color = "#00FF00"
   version = "2.0"
 

diff --git a/examples/aks_cluster/versions.tf b/examples/aks_cluster/versions.tf
@@ -21,7 +21,6 @@ terraform {
     #   version = "=2.8.0"
     # }
   }
-
   required_version = ">= 0.14"
 }
 
diff --git a/...s/consume_cluster_module/modules/tanzu.tf → ...les/consume_cluster_module/modules/tsm.tf b/...s/consume_cluster_module/modules/tanzu.tf → ...les/consume_cluster_module/modules/tsm.tf
diff --git a/...global_namespace/tanzu-globalnamespace.tf → ...s/global_namespace/tsm-globalnamespace.tf b/...global_namespace/tanzu-globalnamespace.tf → ...s/global_namespace/tsm-globalnamespace.tf
diff --git a/examples/global_namespace/versions.tf b/examples/global_namespace/versions.tf
@@ -1,14 +1,10 @@
 terraform {
   required_providers {
-
     tsm = {
       source  = "robwafle/tsm"
       version = "~> 0.0.1"
     }
-
-
   }
-
   required_version = ">= 0.14"
 }
 
diff --git a/provider/resource_globalnamespace.go b/provider/resource_globalnamespace.go
@@ -69,8 +69,9 @@ func ResourceGlobalNamespaceSchema() map[string]*schema.Schema {
 			Optional: true,
 		},
 		"color": {
-			Type:     schema.TypeString,
-			Optional: true,
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "test description",
 		},
 		"version": {
 			Type:     schema.TypeString,
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ terraform { @@
         #   version = "=2.8.0"
         # }
       }
       required_version = ">= 0.14"
     }