Acceptance test for namespace

shobha2626 · Shreyas Sreenivas · commit e7ade6c0fc39 · 2021-09-28T16:04:14.000+05:30
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -28,7 +28,7 @@ func Provider() *schema.Provider {
 		DataSourcesMap: map[string]*schema.Resource{
 			cluster.ResourceName:      cluster.DataSourceTMCCluster(),
 			workspace.ResourceName:    workspace.DataSourceWorkspace(),
-			namespace.ResourceName:    namespace.DataSourceTMCNamespace(),
+			namespace.ResourceName:    namespace.DataSourceNamespace(),
 			clustergroup.ResourceName: clustergroup.DataSourceClusterGroup(),
 		},
 		ConfigureContextFunc: authctx.ProviderConfigureContext,
diff --git a/internal/resources/cluster/cluster_flatten_test.go b/internal/resources/cluster/cluster_flatten_test.go
@@ -30,12 +30,10 @@ func TestFlattenSpec(t *testing.T) {
 			name: "normal scenario with cluster group and proxy",
 			input: &clustermodel.VmwareTanzuManageV1alpha1ClusterSpec{
 				ClusterGroupName: "default",
-				ProxyName:        "test",
 			},
 			expected: []interface{}{
 				map[string]interface{}{
 					clusterGroupKey: "default",
-					proxyKey:        "test",
 				},
 			},
 		},
diff --git a/internal/resources/cluster/constants.go b/internal/resources/cluster/constants.go
@@ -9,7 +9,6 @@ const (
 	managementClusterNameKey    = "management_cluster_name"
 	provisionerNameKey          = "provisioner_name"
 	clusterGroupKey             = "cluster_group"
-	proxyKey                    = "proxy"
 	clusterNameKey              = "name"
 	specKey                     = "spec"
 	statusKey                   = "status"
diff --git a/internal/resources/cluster/resource_cluster.go b/internal/resources/cluster/resource_cluster.go
@@ -147,7 +147,6 @@ func flattenSpec(spec *clustermodel.VmwareTanzuManageV1alpha1ClusterSpec) (data
 	flattenSpecData := make(map[string]interface{})
 
 	flattenSpecData[clusterGroupKey] = spec.ClusterGroupName
-	flattenSpecData[proxyKey] = spec.ProxyName
 
 	return []interface{}{flattenSpecData}
 }
diff --git a/internal/resources/clustergroup/data_source_cluster_group_test.go b/internal/resources/clustergroup/data_source_cluster_group_test.go
@@ -16,12 +16,18 @@ import (
 	testhelper "gitlab.eng.vmware.com/olympus/terraform-provider-tanzu/internal/resources/testing"
 )
 
+const (
+	clusterGroupResource      = "tmc_cluster_group"
+	clusterGroupResourceVar   = "test_cluster_group"
+	clusterGroupDataSourceVar = "test_data_cluster_group"
+)
+
 func TestAcceptanceForClusterGroupDataSource(t *testing.T) {
 	var provider = initTestProvider(t)
 
 	clusterGroup := acctest.RandomWithPrefix("tf-cg-test")
-	dataSourceName := "data.tmc_cluster_group.test_data_cluster_group"
-	resourceName := "tmc_cluster_group.test_cluster_group"
+	dataSourceName := fmt.Sprintf("data.%s.%s", clusterGroupResource, clusterGroupDataSourceVar)
+	resourceName := fmt.Sprintf("%s.%s", clusterGroupResource, clusterGroupResourceVar)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          testhelper.TestPreCheck(t),
@@ -42,15 +48,15 @@ func TestAcceptanceForClusterGroupDataSource(t *testing.T) {
 
 func getTestDataSourceClusterGroupConfigValue(clusterGroupName, meta string) string {
 	return fmt.Sprintf(`
-resource "tmc_cluster_group" "test_cluster_group" {
+resource "%s" "%s" {
   name = "%s"
   %s
 }
 
-data "tmc_cluster_group" "test_data_cluster_group" {
+data "%s" "%s" {
   name = tmc_cluster_group.test_cluster_group.name
 }
-`, clusterGroupName, meta)
+`, clusterGroupResource, clusterGroupResourceVar, clusterGroupName, meta, clusterGroupResource, clusterGroupDataSourceVar)
 }
 
 func checkDataSourceAttributes(dataSourceName, resourceName string) resource.TestCheckFunc {
diff --git a/internal/resources/clustergroup/resource_cluster_group_test.go b/internal/resources/clustergroup/resource_cluster_group_test.go
@@ -24,7 +24,7 @@ import (
 func TestAcceptanceForClusterGroupResource(t *testing.T) {
 	var provider = initTestProvider(t)
 
-	resourceName := "tmc_cluster_group.test_cluster_group"
+	resourceName := fmt.Sprintf("%s.%s", clusterGroupResource, clusterGroupResourceVar)
 	clusterGroupName := acctest.RandomWithPrefix("tf-cg-test")
 
 	resource.Test(t, resource.TestCase{
@@ -53,19 +53,19 @@ func TestAcceptanceForClusterGroupResource(t *testing.T) {
 
 func getTestResourceClusterGroupBasicConfigValue(clusterGroupName string) string {
 	return fmt.Sprintf(`
-resource "tmc_cluster_group" "test_cluster_group" {
+resource "%s" "%s" {
   name = "%s"
 }
-`, clusterGroupName)
+`, clusterGroupResource, clusterGroupResourceVar, clusterGroupName)
 }
 
 func getTestResourceClusterGroupConfigValue(clusterGroupName string) string {
 	return fmt.Sprintf(`
-resource "tmc_cluster_group" "test_cluster_group" {
+resource "%s" "%s" {
   name = "%s"
   %s
 }
-`, clusterGroupName, testhelper.MetaTemplate)
+`, clusterGroupResource, clusterGroupResourceVar, clusterGroupName, testhelper.MetaTemplate)
 }
 
 func checkResourceAttributes(provider *schema.Provider, resourceName, clusterGroupName string) resource.TestCheckFunc {
diff --git a/internal/resources/common/objectmeta_schema.go b/internal/resources/common/objectmeta_schema.go
@@ -7,6 +7,7 @@ package common
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
@@ -38,8 +39,13 @@ var Meta = &schema.Schema{
 			LabelsKey: {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if strings.Contains(k, "tmc.cloud.vmware.com/creator") || strings.Contains(k, "tmc.cloud.vmware.com/managed") || strings.Contains(k, "tmc.cloud.vmware.com/workspace") {
+						return true
+					}
+					return false
+				},
 			},
 			DescriptionKey: {
 				Type:     schema.TypeString,
diff --git a/internal/resources/namespace/data_source_namespace.go b/internal/resources/namespace/data_source_namespace.go
@@ -17,7 +17,7 @@ import (
 	"gitlab.eng.vmware.com/olympus/terraform-provider-tanzu/internal/resources/common"
 )
 
-func DataSourceTMCNamespace() *schema.Resource {
+func DataSourceNamespace() *schema.Resource {
 	return &schema.Resource{
 		ReadContext: dataSourceNamespaceRead,
 		Schema:      namespaceSchema,
diff --git a/internal/resources/namespace/data_source_namespace_test.go b/internal/resources/namespace/data_source_namespace_test.go
@@ -0,0 +1,115 @@
+/*
+Copyright © 2021 VMware, Inc. All Rights Reserved.
+SPDX-License-Identifier: MPL-2.0
+*/
+
+package namespace
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
+	testhelper "gitlab.eng.vmware.com/olympus/terraform-provider-tanzu/internal/resources/testing"
+)
+
+const (
+	namespaceResource      = "tmc_namespace"
+	namespaceResourceVar   = "test_namespace"
+	namespaceDataSourceVar = "test_data_namespace"
+
+	clusterResource    = "tmc_cluster"
+	clusterResourceVar = "tmc_cluster_test"
+)
+
+func TestAcceptanceForNamespaceDataSource(t *testing.T) {
+	var provider = initTestProvider(t)
+
+	namespaceName := acctest.RandomWithPrefix("tf-ns-test")
+	clusterName := acctest.RandomWithPrefix("tf-cluster")
+	dataSourceName := fmt.Sprintf("data.%s.%s", namespaceResource, namespaceDataSourceVar)
+	resourceName := fmt.Sprintf("%s.%s", namespaceResource, namespaceResourceVar)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          testPreCheck(t),
+		ProviderFactories: getTestProviderFactories(provider),
+		CheckDestroy:      nil,
+		Steps: []resource.TestStep{
+			{
+				Config: getTestNamespaceDataSourceConfigValue(t, clusterName, namespaceName, testhelper.MetaTemplate),
+				Check: resource.ComposeTestCheckFunc(
+					checkDataSourceAttributes(dataSourceName, resourceName),
+				),
+			},
+		},
+	})
+	t.Log("namespace data source acceptance test complete!")
+}
+
+func getTestNamespaceDataSourceConfigValue(t *testing.T, clusterName, namespaceName, meta string) string {
+	kubeconfigPath := os.Getenv("KUBECONFIG")
+	if kubeconfigPath == "" {
+		t.Skipf("KUBECONFIG env var is not set: %s", kubeconfigPath)
+	}
+
+	return fmt.Sprintf(`
+resource "%s" "%s" {
+  name = "%s"
+
+  attach_k8s_cluster {
+    kubeconfig_file = "%s"
+  }
+
+  %s
+
+  spec {
+    cluster_group = "default"
+  }
+ 
+  wait_until_ready = true
+}
+
+resource "%s" "%s" {
+  name = "%s"
+  cluster_name = tmc_cluster.tmc_cluster_test.name
+  
+  spec {
+    workspace_name = "default"
+    attach         = false
+  }
+}
+
+data "%s" "%s" {
+  name = tmc_namespace.test_namespace.name
+  cluster_name = tmc_namespace.test_namespace.cluster_name
+}
+`, clusterResource, clusterResourceVar, clusterName, kubeconfigPath, meta, namespaceResource,
+		namespaceResourceVar, namespaceName, namespaceResource, namespaceDataSourceVar)
+}
+
+func checkDataSourceAttributes(dataSourceName, resourceName string) resource.TestCheckFunc {
+	var check = []resource.TestCheckFunc{
+		verifyNamespaceDataSource(dataSourceName),
+		resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"),
+		resource.TestCheckResourceAttrSet(dataSourceName, "id"),
+	}
+
+	check = append(check, testhelper.MetaDataSourceAttributeCheck(dataSourceName, resourceName)...)
+
+	return resource.ComposeTestCheckFunc(check...)
+}
+
+func verifyNamespaceDataSource(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		_, ok := s.RootModule().Resources[name]
+		if !ok {
+			return fmt.Errorf("root module does not have namespace resource %s", name)
+		}
+
+		return nil
+	}
+}
diff --git a/internal/resources/namespace/namespace_provider_test.go b/internal/resources/namespace/namespace_provider_test.go
@@ -0,0 +1,54 @@
+/*
+Copyright © 2021 VMware, Inc. All Rights Reserved.
+SPDX-License-Identifier: MPL-2.0
+*/
+
+package namespace
+
+import (
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/stretchr/testify/require"
+
+	"gitlab.eng.vmware.com/olympus/terraform-provider-tanzu/internal/authctx"
+	"gitlab.eng.vmware.com/olympus/terraform-provider-tanzu/internal/resources/cluster"
+)
+
+const providerName = "tmc"
+
+func initTestProvider(t *testing.T) *schema.Provider {
+	testProvider := &schema.Provider{
+		Schema: authctx.ProviderAuthSchema(),
+		ResourcesMap: map[string]*schema.Resource{
+			ResourceName:         ResourceNamespace(),
+			cluster.ResourceName: cluster.ResourceTMCCluster(),
+		},
+		DataSourcesMap: map[string]*schema.Resource{
+			ResourceName:         DataSourceNamespace(),
+			cluster.ResourceName: cluster.DataSourceTMCCluster(),
+		},
+		ConfigureContextFunc: authctx.ProviderConfigureContext,
+	}
+	if err := testProvider.InternalValidate(); err != nil {
+		require.NoError(t, err)
+	}
+
+	return testProvider
+}
+
+func testPreCheck(t *testing.T) func() {
+	return func() {
+		for _, env := range []string{authctx.ServerEndpointEnvVar, authctx.CSPTokenEnvVar, authctx.CSPEndpointEnvVar} {
+			require.NotEmpty(t, os.Getenv(env))
+		}
+	}
+}
+
+func getTestProviderFactories(provider *schema.Provider) map[string]func() (*schema.Provider, error) {
+	//nolint:unparam
+	return map[string]func() (*schema.Provider, error){
+		providerName: func() (*schema.Provider, error) { return provider, nil },
+	}
+}
diff --git a/internal/resources/namespace/resource_namepace_test.go b/internal/resources/namespace/resource_namepace_test.go
diff --git a/internal/resources/testing/meta.go b/internal/resources/testing/meta.go
diff --git a/internal/resources/workspace/data_source_workspace_test.go b/internal/resources/workspace/data_source_workspace_test.go
diff --git a/internal/resources/workspace/resource_workspace_test.go b/internal/resources/workspace/resource_workspace_test.go

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ func flattenSpec(spec *clustermodel.VmwareTanzuManageV1alpha1ClusterSpec) (data`
`147`	`147`	`flattenSpecData := make(map[string]interface{})`
`148`	`148`
`149`	`149`	`flattenSpecData[clusterGroupKey] = spec.ClusterGroupName`
`150`		`- flattenSpecData[proxyKey] = spec.ProxyName`
`151`	`150`
`152`	`151`	`return []interface{}{flattenSpecData}`
`153`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"gitlab.eng.vmware.com/olympus/terraform-provider-tanzu/internal/resources/common"`
`18`	`18`	`)`
`19`	`19`
`20`		`-func DataSourceTMCNamespace() *schema.Resource {`
	`20`	`+func DataSourceNamespace() *schema.Resource {`
`21`	`21`	`return &schema.Resource{`
`22`	`22`	`ReadContext: dataSourceNamespaceRead,`
`23`	`23`	`Schema: namespaceSchema,`