Updated datasource cloudtemple_compute_datastore_cluster to make the …

…filter datacenter_id mandatory
Cloud-Temple · Oct 11, 2023 · ee68415 · ee68415
1 parent 207d829
commit ee68415
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 39 deletions.
diff --git a/docs/data-sources/compute_datastore_cluster.md b/docs/data-sources/compute_datastore_cluster.md
@@ -32,9 +32,12 @@ data "cloudtemple_compute_datastore_cluster" "name" {
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Optional
+### Required
 
 - `datacenter_id` (String)
+
+### Optional
+
 - `host_cluster_id` (String)
 - `host_id` (String)
 - `machine_manager_id` (String)

diff --git a/internal/provider/data_source_compute_datastore_cluster.go b/internal/provider/data_source_compute_datastore_cluster.go
@@ -61,28 +61,24 @@ func dataSourceDatastoreCluster() *schema.Resource {
 				Type:          schema.TypeString,
 				Optional:      true,
 				ConflictsWith: []string{"id"},
-				AtLeastOneOf:  []string{"id", "name"},
 			},
 			"datacenter_id": {
 				Type:          schema.TypeString,
-				Optional:      true,
+				Required:      true,
 				Default:       "",
 				ConflictsWith: []string{"id"},
-				AtLeastOneOf:  []string{"id", "name"},
 			},
 			"host_id": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				Default:       "",
 				ConflictsWith: []string{"id"},
-				AtLeastOneOf:  []string{"id", "name"},
 			},
 			"host_cluster_id": {
 				Type:          schema.TypeString,
 				Optional:      true,
 				Default:       "",
 				ConflictsWith: []string{"id"},
-				AtLeastOneOf:  []string{"id", "name"},
 			},
 
 			// Out

diff --git a/internal/provider/data_source_compute_network.go b/internal/provider/data_source_compute_network.go
@@ -62,44 +62,52 @@ func dataSourceNetwork() *schema.Resource {
 				ConflictsWith: []string{"id"},
 			},
 			"machine_manager_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"datacenter_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"virtual_machine_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"type": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.StringInSlice([]string{"Network", "DistributedVirtualPortgroup"}, false),
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.StringInSlice([]string{"Network", "DistributedVirtualPortgroup"}, false),
+				ConflictsWith: []string{"id"},
 			},
 			"virtual_switch_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"host_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"folder_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"host_cluster_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 
 			// Out

diff --git a/internal/provider/data_source_compute_virtual_switch.go b/internal/provider/data_source_compute_virtual_switch.go
@@ -57,19 +57,22 @@ func dataSourceVirtualSwitch() *schema.Resource {
 				ConflictsWith: []string{"id"},
 			},
 			"machine_manager_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"datacenter_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 			"host_cluster_id": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.IsUUID,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ValidateFunc:  validation.IsUUID,
+				ConflictsWith: []string{"id"},
 			},
 
 			// Out