mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-04-11 18:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: move Destroy() method to journalledObject interface

Browse Source 
VolumeGroup interface has more than 10 methods and it causes
golangci-lint to fail. Moving the `Destroy()` method to a base
interface journalledObject.

Signed-off-by: Praveen M <m.praveen@ibm.com>
(cherry picked from commit add4b36900)

# Conflicts:
#	internal/rbd/types/volume.go
This commit is contained in:
Praveen M 2025-03-04 15:40:39 +05:30 committed by Mergify
parent 4442465fcf
commit 67f966dff7
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/rbd/types/group.go
View File

@ -37,15 +37,15 @@ type journalledObject interface {
// GetClusterID returns the ID of the cluster of the object. // GetClusterID returns the ID of the cluster of the object.
GetClusterID(ctx context.Context) (string, error) GetClusterID(ctx context.Context) (string, error)
// Destroy frees the resources used by the object.
Destroy(ctx context.Context)
} }
// VolumeGroup contains a number of volumes. // VolumeGroup contains a number of volumes.
type VolumeGroup interface { type VolumeGroup interface {
journalledObject journalledObject
// Destroy frees the resources used by the VolumeGroup.
Destroy(ctx context.Context)
// GetIOContext returns the IOContext for performing librbd operations // GetIOContext returns the IOContext for performing librbd operations
// on the VolumeGroup. This is used by the rbdVolume struct when it // on the VolumeGroup. This is used by the rbdVolume struct when it
// needs to add/remove itself from the VolumeGroup. // needs to add/remove itself from the VolumeGroup.

3
internal/rbd/types/snapshot.go
View File

@ -28,9 +28,6 @@ import (
type Snapshot interface { type Snapshot interface {
journalledObject journalledObject
// Destroy frees the resources used by the Snapshot.
Destroy(ctx context.Context)
// Delete removes the snapshot from the storage backend. // Delete removes the snapshot from the storage backend.
Delete(ctx context.Context) error Delete(ctx context.Context) error

5
internal/rbd/types/volume.go
View File

@ -28,8 +28,13 @@ import (
//nolint:interfacebloat // more than 10 methods are needed for the interface //nolint:interfacebloat // more than 10 methods are needed for the interface
type Volume interface { type Volume interface {
journalledObject journalledObject
<<<<<<< HEAD
// Destroy frees the resources used by the Volume. // Destroy frees the resources used by the Volume.
Destroy(ctx context.Context) Destroy(ctx context.Context)
=======
snapshottableVolume
csiAddonsVolume
>>>>>>> add4b369 (cleanup: move Destroy() method to journalledObject interface)
// Delete removes the volume from the storage backend. // Delete removes the volume from the storage backend.
Delete(ctx context.Context) error Delete(ctx context.Context) error

3
internal/rbd/types/volume_group_snapshot.go
View File

@ -29,9 +29,6 @@ import (
type VolumeGroupSnapshot interface { type VolumeGroupSnapshot interface {
journalledObject journalledObject
// Destroy frees the resources used by the VolumeGroupSnapshot.
Destroy(ctx context.Context)
// Delete removes the VolumeGroupSnapshot from the storage backend. // Delete removes the VolumeGroupSnapshot from the storage backend.
Delete(ctx context.Context) error Delete(ctx context.Context) error