rbd: use GetCreationTime() to build the CSI-Snapshot object

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2024-10-01 10:27:03 +02:00 committed by mergify[bot]
parent 8ddb615df2
commit f885c77f4e
2 changed files with 10 additions and 1 deletions

View File

@ -1641,6 +1641,10 @@ func (ri *rbdImage) GetCreationTime(ctx context.Context) (*time.Time, error) {
return nil, err return nil, err
} }
if ri.CreatedAt == nil {
return nil, fmt.Errorf("failed to get creation time for image %q", ri)
}
return ri.CreatedAt, nil return ri.CreatedAt, nil
} }

View File

@ -145,11 +145,16 @@ func (rbdSnap *rbdSnapshot) toVolume() *rbdVolume {
} }
func (rbdSnap *rbdSnapshot) ToCSI(ctx context.Context) (*csi.Snapshot, error) { func (rbdSnap *rbdSnapshot) ToCSI(ctx context.Context) (*csi.Snapshot, error) {
created, err := rbdSnap.GetCreationTime(ctx)
if err != nil {
return nil, err
}
return &csi.Snapshot{ return &csi.Snapshot{
SizeBytes: rbdSnap.VolSize, SizeBytes: rbdSnap.VolSize,
SnapshotId: rbdSnap.VolID, SnapshotId: rbdSnap.VolID,
SourceVolumeId: rbdSnap.SourceVolumeID, SourceVolumeId: rbdSnap.SourceVolumeID,
CreationTime: timestamppb.New(*rbdSnap.CreatedAt), CreationTime: timestamppb.New(*created),
ReadyToUse: true, ReadyToUse: true,
}, nil }, nil
} }