Add in-cluster datastores in d/datastore_stats

* A full list of all datastores is fetched including datastores in datastore clusters * All datastores are displayed under the same capacity and free capacity lists Signed-off-by: nikfot <[email protected]>
hashicorp · Oct 3, 2024 · 73e7e3d · 73e7e3d
1 parent 925fc60
commit 73e7e3d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/vsphere/data_source_vsphere_datastore_stats.go b/vsphere/data_source_vsphere_datastore_stats.go
@@ -4,10 +4,12 @@
 package vsphere
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/datastore"
+	"github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/storagepod"
 	"github.com/vmware/govmomi/object"
 )
 
@@ -36,6 +38,7 @@ func dataSourceVSphereDatastoreStats() *schema.Resource {
 }
 
 func dataSourceVSphereDatastoreStatsRead(d *schema.ResourceData, meta interface{}) error {
+	ctx := context.Background()
 	client := meta.(*Client).vimClient
 	var dc *object.Datacenter
 	if dcID, ok := d.GetOk("datacenter_id"); ok {
@@ -49,6 +52,23 @@ func dataSourceVSphereDatastoreStatsRead(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return fmt.Errorf("error listing datastores: %s", err)
 	}
+	storagePods, err := storagepod.List(client)
+	if err != nil {
+		return fmt.Errorf("error retrieving storage pods: %s", err)
+	}
+	for s := range storagePods {
+		childDatastores, err := storagePods[s].Children(ctx)
+		if err != nil {
+			return fmt.Errorf("error retrieving storage pod children: %s", err)
+		}
+		for c := range childDatastores {
+			ds, err := datastore.FromID(client, childDatastores[c].Reference().Value)
+			if err != nil {
+				return fmt.Errorf("error retrieving datastore: %s", err)
+			}
+			dss = append(dss, ds)
+		}
+	}
 	for i := range dss {
 		ds, err := datastore.FromPath(client, dss[i].Name(), dc)
 		if err != nil {
@@ -66,6 +86,5 @@ func dataSourceVSphereDatastoreStatsRead(d *schema.ResourceData, meta interface{
 		d.Set("free_space", fr)
 	}
 	d.SetId(fmt.Sprintf("%s_stats", dc.Reference().Value))
-
 	return nil
 }
diff --git a/vsphere/data_source_vsphere_datastore_stats_test.go b/vsphere/data_source_vsphere_datastore_stats_test.go
@@ -44,7 +44,7 @@ func testAccDataSourceVSphereDatastoreStatsPreCheck(t *testing.T) {
 		t.Skip("set TF_VAR_VSPHERE_DATACENTER to run vsphere_datastore_stats acceptance tests")
 	}
 	if os.Getenv("VSPHERE_USER") == "" {
-		t.Skip("set TF_VAR_VSPHERE_DATACENTER to run vsphere_datastore_stats acceptance tests")
+		t.Skip("set TF_VAR_VSPHERE_USER to run vsphere_datastore_stats acceptance tests")
 	}
 	if os.Getenv("VSPHERE_PASSWORD") == "" {
 		t.Skip("set TF_VAR_VSPHERE_PASSWORD to run vsphere_datastore_stats acceptance tests")