Merge pull request #976 from vmware/compute-manager-ds

Improve Compute Manager data source
vmware · Sep 26, 2023 · 7e25a0d · 7e25a0d
2 parents eacf5c1 + 33fae3e
commit 7e25a0d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 14 deletions.
diff --git a/nsxt/data_source_nsxt_compute_manager.go b/nsxt/data_source_nsxt_compute_manager.go
@@ -18,7 +18,7 @@ func dataSourceNsxtComputeManager() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"id":           getDataSourceIDSchema(),
-			"display_name": getDisplayNameSchema(),
+			"display_name": getDataSourceExtendedDisplayNameSchema(),
 			"description":  getDescriptionSchema(),
 			"server": {
 				Type:        schema.TypeString,
@@ -45,8 +45,6 @@ func dataSourceNsxtComputeManagerRead(d *schema.ResourceData, m interface{}) err
 			return fmt.Errorf("failed to read ComputeManager %s: %v", objID, err)
 		}
 		obj = objGet
-	} else if objName == "" {
-		return fmt.Errorf("error obtaining Compute Manager ID or name during read")
 	} else {
 		// Get by full name/prefix
 		objList, err := client.List(nil, nil, nil, nil, nil, nil, nil)
@@ -57,6 +55,11 @@ func dataSourceNsxtComputeManagerRead(d *schema.ResourceData, m interface{}) err
 		var perfectMatch []model.ComputeManager
 		var prefixMatch []model.ComputeManager
 		for _, objInList := range objList.Results {
+			if len(objName) == 0 {
+				// We want to grab single compute manager
+				perfectMatch = append(perfectMatch, objInList)
+				continue
+			}
 			if strings.HasPrefix(*objInList.DisplayName, objName) {
 				prefixMatch = append(prefixMatch, objInList)
 			}
@@ -66,16 +69,16 @@ func dataSourceNsxtComputeManagerRead(d *schema.ResourceData, m interface{}) err
 		}
 		if len(perfectMatch) > 0 {
 			if len(perfectMatch) > 1 {
-				return fmt.Errorf("found multiple Compute Managers with name '%s'", objName)
+				return fmt.Errorf("found multiple Compute Managers matching the criteria")
 			}
 			obj = perfectMatch[0]
 		} else if len(prefixMatch) > 0 {
 			if len(prefixMatch) > 1 {
-				return fmt.Errorf("found multiple Compute Managers with name starting with '%s'", objName)
+				return fmt.Errorf("found multiple Compute Managers matching the criteria")
 			}
 			obj = prefixMatch[0]
 		} else {
-			return fmt.Errorf("Compute Manager with name '%s' was not found", objName)
+			return fmt.Errorf("No Compute Manager matches the criteria")
 		}
 	}
 

diff --git a/nsxt/data_source_nsxt_compute_manager_test.go b/nsxt/data_source_nsxt_compute_manager_test.go
@@ -11,8 +11,8 @@ import (
 )
 
 func TestAccDataSourceNsxtComputeManager_basic(t *testing.T) {
-	ComputeManagerName := getComputeManagerName()
-	testResourceName := "data.nsxt_edge_cluster.test"
+	computeManagerName := getComputeManagerName()
+	testResourceName := "data.nsxt_compute_manager.test"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
@@ -23,11 +23,32 @@ func TestAccDataSourceNsxtComputeManager_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccNSXComputeManagerReadTemplate(ComputeManagerName),
+				Config: testAccNSXComputeManagerReadTemplate(computeManagerName),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(testResourceName, "display_name", ComputeManagerName),
+					resource.TestCheckResourceAttr(testResourceName, "display_name", computeManagerName),
+					resource.TestCheckResourceAttrSet(testResourceName, "id"),
+					resource.TestCheckResourceAttrSet(testResourceName, "server"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccDataSourceNsxtComputeManager_single(t *testing.T) {
+	testResourceName := "data.nsxt_compute_manager.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccOnlyLocalManager(t)
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNSXComputeManagerSingleReadTemplate(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(testResourceName, "display_name"),
 					resource.TestCheckResourceAttrSet(testResourceName, "id"),
-					resource.TestCheckResourceAttrSet(testResourceName, "description"),
 					resource.TestCheckResourceAttrSet(testResourceName, "server"),
 				),
 			},
@@ -41,3 +62,9 @@ data "nsxt_compute_manager" "test" {
   display_name = "%s"
 }`, name)
 }
+
+func testAccNSXComputeManagerSingleReadTemplate() string {
+	return `
+data "nsxt_compute_manager" "test" {
+}`
+}
diff --git a/website/docs/d/compute_manager.html.markdown b/website/docs/d/compute_manager.html.markdown
@@ -8,12 +8,12 @@ description: A Compute Manager data source.
 # nsxt_compute_manager
 
 This data source provides information about a Compute Manager configured on NSX.
+When only single Compute Manager is present on NSX, no need to specify any filter in the data source (see example below)
 
 ## Example Usage
 
 ```hcl
 data "nsxt_compute_manager" "test_vcenter" {
-  display_name = "test-vcenter"
 }
 ```
 
@@ -26,5 +26,5 @@ data "nsxt_compute_manager" "test_vcenter" {
 
 In addition to arguments listed above, the following attributes are exported:
 
-* `description` - The description of the Compute Manager.
-* `server` - IP address or hostname of compute manager.
+* `description` - The description of the resource.
+* `server` - IP address or hostname of the resource.