fix volume topology request handling

hashicorp · Jul 12, 2023 · 423b87c · 423b87c
1 parent 637bdd2
commit 423b87c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/nomad/resource_csi_volume_registration.go b/nomad/resource_csi_volume_registration.go
@@ -571,10 +571,18 @@ func flattenCSIVolumeTopologyRequests(topologyReqs *api.CSITopologyRequest) []in
 	topologyRequestList[0] = topologyMap
 
 	if topologyReqs.Required != nil {
-		topologyMap["Required"] = flattenVolumeTopologies(topologyReqs.Required)
+		topologyMap["required"] = []any{
+			map[string]any{
+				"topology": flattenCSIVolumeTopologies(topologyReqs.Required),
+			},
+		}
 	}
 	if topologyReqs.Preferred != nil {
-		topologyMap["Preferred"] = flattenVolumeTopologies(topologyReqs.Preferred)
+		topologyMap["preferred"] = []any{
+			map[string]any{
+				"topology": flattenCSIVolumeTopologies(topologyReqs.Preferred),
+			},
+		}
 	}
 
 	return topologyRequestList

diff --git a/nomad/resource_volume.go b/nomad/resource_volume.go
@@ -664,10 +664,18 @@ func flattenVolumeTopologyRequests(topologyReqs *api.CSITopologyRequest) []inter
 	topologyRequestList[0] = topologyMap
 
 	if topologyReqs.Required != nil {
-		topologyMap["Required"] = flattenVolumeTopologies(topologyReqs.Required)
+		topologyMap["required"] = []any{
+			map[string]any{
+				"topology": flattenVolumeTopologies(topologyReqs.Required),
+			},
+		}
 	}
 	if topologyReqs.Preferred != nil {
-		topologyMap["Preferred"] = flattenVolumeTopologies(topologyReqs.Preferred)
+		topologyMap["preferred"] = []any{
+			map[string]any{
+				"topology": flattenVolumeTopologies(topologyReqs.Preferred),
+			},
+		}
 	}
 
 	return topologyRequestList