luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

csi: add missing fields to HTTP API response (#12178) 

The HTTP endpoint for CSI manually serializes the internal struct to
the API struct for purposes of redaction (see also #10470). Add fields
that were missing from this serialization so they don't show up as
always empty in the API response.
This commit is contained in:
Tim Gross 2022-03-03 15:15:28 -05:00 committed by GitHub
parent fe38da1137
commit 3247e422d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12178.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
csi: Fixed a bug where fields were missing from the Read Volume API response
```

28
command/agent/csi_endpoint.go
View File

@ -475,10 +475,11 @@ func structsCSIVolumeToApi(vol *structs.CSIVolume) *api.CSIVolume {
allocCount := len(vol.ReadAllocs) + len(vol.WriteAllocs) allocCount := len(vol.ReadAllocs) + len(vol.WriteAllocs)
out := &api.CSIVolume{ out := &api.CSIVolume{
ID: vol.ID, ID: vol.ID,
Name: vol.Name, Name: vol.Name,
ExternalID: vol.ExternalID, ExternalID: vol.ExternalID,
Namespace: vol.Namespace, Namespace: vol.Namespace,
Topologies: structsCSITopolgiesToApi(vol.Topologies), Topologies: structsCSITopolgiesToApi(vol.Topologies),
AccessMode: structsCSIAccessModeToApi(vol.AccessMode), AccessMode: structsCSIAccessModeToApi(vol.AccessMode),
AttachmentMode: structsCSIAttachmentModeToApi(vol.AttachmentMode), AttachmentMode: structsCSIAttachmentModeToApi(vol.AttachmentMode),
@ -486,6 +487,13 @@ func structsCSIVolumeToApi(vol *structs.CSIVolume) *api.CSIVolume {
Secrets: structsCSISecretsToApi(vol.Secrets), Secrets: structsCSISecretsToApi(vol.Secrets),
Parameters: vol.Parameters, Parameters: vol.Parameters,
Context: vol.Context, Context: vol.Context,
Capacity: vol.Capacity,
RequestedCapacityMin: vol.RequestedCapacityMin,
RequestedCapacityMax: vol.RequestedCapacityMax,
RequestedCapabilities: structsCSICapabilityToApi(vol.RequestedCapabilities),
CloneID: vol.CloneID,
SnapshotID: vol.SnapshotID,
// Allocations is the collapsed list of both read and write allocs // Allocations is the collapsed list of both read and write allocs
Allocations: make([]*api.AllocationListStub, 0, allocCount), Allocations: make([]*api.AllocationListStub, 0, allocCount),
@ -772,6 +780,18 @@ func structsCSIAttachmentModeToApi(mode structs.CSIVolumeAttachmentMode) api.CSI
return api.CSIVolumeAttachmentModeUnknown return api.CSIVolumeAttachmentModeUnknown
} }
// structsCSICapabilityToApi converts capabilities, part of structsCSIVolumeToApi
func structsCSICapabilityToApi(caps []*structs.CSIVolumeCapability) []*api.CSIVolumeCapability {
out := make([]*api.CSIVolumeCapability, len(caps))
for i, cap := range caps {
out[i] = &api.CSIVolumeCapability{
AccessMode: api.CSIVolumeAccessMode(cap.AccessMode),
AttachmentMode: api.CSIVolumeAttachmentMode(cap.AttachmentMode),
}
}
return out
}
// structsCSIMountOptionsToApi converts mount options, part of structsCSIVolumeToApi // structsCSIMountOptionsToApi converts mount options, part of structsCSIVolumeToApi
func structsCSIMountOptionsToApi(opts *structs.CSIMountOptions) *api.CSIMountOptions { func structsCSIMountOptionsToApi(opts *structs.CSIMountOptions) *api.CSIMountOptions {
if opts == nil { if opts == nil {