From 76654c8fcee878a568886e969c1064d6903dd3b4 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 1 Oct 2024 10:27:03 +0200 Subject: [PATCH] rbd: use `GetCreationTime()` to build the CSI-Snapshot object Signed-off-by: Niels de Vos --- internal/rbd/rbd_util.go | 4 ++++ internal/rbd/snapshot.go | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 3b72b7c4c86..d623327a837 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -1641,6 +1641,10 @@ func (ri *rbdImage) GetCreationTime(ctx context.Context) (*time.Time, error) { return nil, err } + if ri.CreatedAt == nil { + return nil, fmt.Errorf("failed to get creation time for image %q", ri) + } + return ri.CreatedAt, nil } diff --git a/internal/rbd/snapshot.go b/internal/rbd/snapshot.go index d0234e8ca58..e903a74f3aa 100644 --- a/internal/rbd/snapshot.go +++ b/internal/rbd/snapshot.go @@ -145,11 +145,16 @@ func (rbdSnap *rbdSnapshot) toVolume() *rbdVolume { } func (rbdSnap *rbdSnapshot) ToCSI(ctx context.Context) (*csi.Snapshot, error) { + created, err := rbdSnap.GetCreationTime(ctx) + if err != nil { + return nil, err + } + return &csi.Snapshot{ SizeBytes: rbdSnap.VolSize, SnapshotId: rbdSnap.VolID, SourceVolumeId: rbdSnap.SourceVolumeID, - CreationTime: timestamppb.New(*rbdSnap.CreatedAt), + CreationTime: timestamppb.New(*created), ReadyToUse: true, }, nil }