From 79d1616ecb6256a99ad0c2b7e9592a8e3226c8e9 Mon Sep 17 00:00:00 2001 From: "Hoang, Phuong" Date: Fri, 23 Jul 2021 10:34:00 -0700 Subject: [PATCH] Reformat and add version 2 to mock manager. --- pkg/plugin/clientmgmt/manager.go | 1 + ...startable_adapted_v1_backup_item_action.go | 3 +- .../restartable_adapted_v1_object_store.go | 1 + ...tartable_adapted_v1_restore_item_action.go | 1 + .../restartable_delete_item_action.go | 3 +- .../restartable_restore_item_action.go | 1 + .../restartable_volume_snapshotter.go | 2 +- pkg/plugin/framework/plugin_kinds.go | 6 +++ pkg/plugin/mocks/manager.go | 54 ++++++++++--------- 9 files changed, 43 insertions(+), 29 deletions(-) diff --git a/pkg/plugin/clientmgmt/manager.go b/pkg/plugin/clientmgmt/manager.go index fedfa9433..5d2d1adac 100644 --- a/pkg/plugin/clientmgmt/manager.go +++ b/pkg/plugin/clientmgmt/manager.go @@ -23,6 +23,7 @@ import ( "sync" "github.com/sirupsen/logrus" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" backupitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" deleteitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/deleteitemaction/v2" diff --git a/pkg/plugin/clientmgmt/restartable_adapted_v1_backup_item_action.go b/pkg/plugin/clientmgmt/restartable_adapted_v1_backup_item_action.go index 164a2d026..06cf597d9 100644 --- a/pkg/plugin/clientmgmt/restartable_adapted_v1_backup_item_action.go +++ b/pkg/plugin/clientmgmt/restartable_adapted_v1_backup_item_action.go @@ -20,12 +20,13 @@ import ( "context" "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/runtime" + api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/plugin/framework" "github.com/vmware-tanzu/velero/pkg/plugin/velero" backupitemactionv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1" backupitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" - "k8s.io/apimachinery/pkg/runtime" ) type restartableAdaptedV1BackupItemAction struct { diff --git a/pkg/plugin/clientmgmt/restartable_adapted_v1_object_store.go b/pkg/plugin/clientmgmt/restartable_adapted_v1_object_store.go index 1b891888e..7aa10d524 100644 --- a/pkg/plugin/clientmgmt/restartable_adapted_v1_object_store.go +++ b/pkg/plugin/clientmgmt/restartable_adapted_v1_object_store.go @@ -22,6 +22,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" objectstorev1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/objectstore/v1" objectstorev2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/objectstore/v2" diff --git a/pkg/plugin/clientmgmt/restartable_adapted_v1_restore_item_action.go b/pkg/plugin/clientmgmt/restartable_adapted_v1_restore_item_action.go index 564c149d0..5b2a8c27d 100644 --- a/pkg/plugin/clientmgmt/restartable_adapted_v1_restore_item_action.go +++ b/pkg/plugin/clientmgmt/restartable_adapted_v1_restore_item_action.go @@ -20,6 +20,7 @@ import ( "context" "github.com/pkg/errors" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" "github.com/vmware-tanzu/velero/pkg/plugin/velero" restoreitemactionv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v1" diff --git a/pkg/plugin/clientmgmt/restartable_delete_item_action.go b/pkg/plugin/clientmgmt/restartable_delete_item_action.go index 351d4c6ca..143a815a3 100644 --- a/pkg/plugin/clientmgmt/restartable_delete_item_action.go +++ b/pkg/plugin/clientmgmt/restartable_delete_item_action.go @@ -21,9 +21,8 @@ import ( "github.com/pkg/errors" - "github.com/vmware-tanzu/velero/pkg/plugin/velero" - "github.com/vmware-tanzu/velero/pkg/plugin/framework" + "github.com/vmware-tanzu/velero/pkg/plugin/velero" deleteitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/deleteitemaction/v2" ) diff --git a/pkg/plugin/clientmgmt/restartable_restore_item_action.go b/pkg/plugin/clientmgmt/restartable_restore_item_action.go index 39546aeaa..24777ef8c 100644 --- a/pkg/plugin/clientmgmt/restartable_restore_item_action.go +++ b/pkg/plugin/clientmgmt/restartable_restore_item_action.go @@ -20,6 +20,7 @@ import ( "context" "github.com/pkg/errors" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" "github.com/vmware-tanzu/velero/pkg/plugin/velero" restoreitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" diff --git a/pkg/plugin/clientmgmt/restartable_volume_snapshotter.go b/pkg/plugin/clientmgmt/restartable_volume_snapshotter.go index 4f9731250..b63a12327 100644 --- a/pkg/plugin/clientmgmt/restartable_volume_snapshotter.go +++ b/pkg/plugin/clientmgmt/restartable_volume_snapshotter.go @@ -118,7 +118,6 @@ func (r *restartableVolumeSnapshotter) CreateVolumeFromSnapshot(snapshotID strin return delegate.CreateVolumeFromSnapshot(snapshotID, volumeType, volumeAZ, iops) } - // GetVolumeID restarts the plugin's process if needed, then delegates the call. func (r *restartableVolumeSnapshotter) GetVolumeID(pv runtime.Unstructured) (string, error) { delegate, err := r.getDelegate() @@ -168,6 +167,7 @@ func (r *restartableVolumeSnapshotter) DeleteSnapshot(snapshotID string) error { func (r *restartableVolumeSnapshotter) InitV2(ctx context.Context, config map[string]string) error { return r.Init(config) } + // CreateVolumeFromSnapshotV2 restarts the plugin's process if needed, then delegates the call. func (r *restartableVolumeSnapshotter) CreateVolumeFromSnapshotV2( ctx context.Context, snapshotID string, volumeType string, volumeAZ string, iops *int64) (volumeID string, err error) { diff --git a/pkg/plugin/framework/plugin_kinds.go b/pkg/plugin/framework/plugin_kinds.go index fd2aa4067..da291db98 100644 --- a/pkg/plugin/framework/plugin_kinds.go +++ b/pkg/plugin/framework/plugin_kinds.go @@ -106,5 +106,11 @@ func AllPluginKinds() map[string]PluginKind { allPluginKinds[PluginKindBackupItemAction.String()] = PluginKindBackupItemAction allPluginKinds[PluginKindRestoreItemAction.String()] = PluginKindRestoreItemAction allPluginKinds[PluginKindDeleteItemAction.String()] = PluginKindDeleteItemAction + // Version 2 + allPluginKinds[PluginKindObjectStoreV2.String()] = PluginKindObjectStoreV2 + allPluginKinds[PluginKindVolumeSnapshotterV2.String()] = PluginKindVolumeSnapshotterV2 + allPluginKinds[PluginKindBackupItemActionV2.String()] = PluginKindBackupItemActionV2 + allPluginKinds[PluginKindRestoreItemActionV2.String()] = PluginKindRestoreItemActionV2 + allPluginKinds[PluginKindDeleteItemActionV2.String()] = PluginKindDeleteItemActionV2 return allPluginKinds } diff --git a/pkg/plugin/mocks/manager.go b/pkg/plugin/mocks/manager.go index f3ead6d9a..1f660ffe1 100644 --- a/pkg/plugin/mocks/manager.go +++ b/pkg/plugin/mocks/manager.go @@ -4,8 +4,12 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - velero "github.com/vmware-tanzu/velero/pkg/plugin/velero" + backupitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2" + deleteitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/deleteitemaction/v2" + objectstorev2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/objectstore/v2" + restoreitemactionv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2" + volumesnapshotterv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v2" ) // Manager is an autogenerated mock type for the Manager type @@ -65,15 +69,15 @@ func (_m *Manager) GetBackupItemActions() ([]backupitemactionv2.BackupItemAction } // GetDeleteItemAction provides a mock function with given fields: name -func (_m *Manager) GetDeleteItemAction(name string) (velero.DeleteItemAction, error) { +func (_m *Manager) GetDeleteItemAction(name string) (deleteitemactionv2.DeleteItemAction, error) { ret := _m.Called(name) - var r0 velero.DeleteItemAction - if rf, ok := ret.Get(0).(func(string) velero.DeleteItemAction); ok { + var r0 deleteitemactionv2.DeleteItemAction + if rf, ok := ret.Get(0).(func(string) deleteitemactionv2.DeleteItemAction); ok { r0 = rf(name) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(velero.DeleteItemAction) + r0 = ret.Get(0).(deleteitemactionv2.DeleteItemAction) } } @@ -88,15 +92,15 @@ func (_m *Manager) GetDeleteItemAction(name string) (velero.DeleteItemAction, er } // GetDeleteItemActions provides a mock function with given fields: -func (_m *Manager) GetDeleteItemActions() ([]velero.DeleteItemAction, error) { +func (_m *Manager) GetDeleteItemActions() ([]deleteitemactionv2.DeleteItemAction, error) { ret := _m.Called() - var r0 []velero.DeleteItemAction - if rf, ok := ret.Get(0).(func() []velero.DeleteItemAction); ok { + var r0 []deleteitemactionv2.DeleteItemAction + if rf, ok := ret.Get(0).(func() []deleteitemactionv2.DeleteItemAction); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]velero.DeleteItemAction) + r0 = ret.Get(0).([]deleteitemactionv2.DeleteItemAction) } } @@ -111,15 +115,15 @@ func (_m *Manager) GetDeleteItemActions() ([]velero.DeleteItemAction, error) { } // GetObjectStore provides a mock function with given fields: name -func (_m *Manager) GetObjectStore(name string) (velero.ObjectStore, error) { +func (_m *Manager) GetObjectStore(name string) (objectstorev2.ObjectStore, error) { ret := _m.Called(name) - var r0 velero.ObjectStore - if rf, ok := ret.Get(0).(func(string) velero.ObjectStore); ok { + var r0 objectstorev2.ObjectStore + if rf, ok := ret.Get(0).(func(string) objectstorev2.ObjectStore); ok { r0 = rf(name) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(velero.ObjectStore) + r0 = ret.Get(0).(objectstorev2.ObjectStore) } } @@ -134,15 +138,15 @@ func (_m *Manager) GetObjectStore(name string) (velero.ObjectStore, error) { } // GetRestoreItemAction provides a mock function with given fields: name -func (_m *Manager) GetRestoreItemAction(name string) (velero.RestoreItemAction, error) { +func (_m *Manager) GetRestoreItemAction(name string) (restoreitemactionv2.RestoreItemAction, error) { ret := _m.Called(name) - var r0 velero.RestoreItemAction - if rf, ok := ret.Get(0).(func(string) velero.RestoreItemAction); ok { + var r0 restoreitemactionv2.RestoreItemAction + if rf, ok := ret.Get(0).(func(string) restoreitemactionv2.RestoreItemAction); ok { r0 = rf(name) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(velero.RestoreItemAction) + r0 = ret.Get(0).(restoreitemactionv2.RestoreItemAction) } } @@ -157,15 +161,15 @@ func (_m *Manager) GetRestoreItemAction(name string) (velero.RestoreItemAction, } // GetRestoreItemActions provides a mock function with given fields: -func (_m *Manager) GetRestoreItemActions() ([]velero.RestoreItemAction, error) { +func (_m *Manager) GetRestoreItemActions() ([]restoreitemactionv2.RestoreItemAction, error) { ret := _m.Called() - var r0 []velero.RestoreItemAction - if rf, ok := ret.Get(0).(func() []velero.RestoreItemAction); ok { + var r0 []restoreitemactionv2.RestoreItemAction + if rf, ok := ret.Get(0).(func() []restoreitemactionv2.RestoreItemAction); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).([]velero.RestoreItemAction) + r0 = ret.Get(0).([]restoreitemactionv2.RestoreItemAction) } } @@ -180,15 +184,15 @@ func (_m *Manager) GetRestoreItemActions() ([]velero.RestoreItemAction, error) { } // GetVolumeSnapshotter provides a mock function with given fields: name -func (_m *Manager) GetVolumeSnapshotter(name string) (velero.VolumeSnapshotter, error) { +func (_m *Manager) GetVolumeSnapshotter(name string) (volumesnapshotterv2.VolumeSnapshotter, error) { ret := _m.Called(name) - var r0 velero.VolumeSnapshotter - if rf, ok := ret.Get(0).(func(string) velero.VolumeSnapshotter); ok { + var r0 volumesnapshotterv2.VolumeSnapshotter + if rf, ok := ret.Get(0).(func(string) volumesnapshotterv2.VolumeSnapshotter); ok { r0 = rf(name) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(velero.VolumeSnapshotter) + r0 = ret.Get(0).(volumesnapshotterv2.VolumeSnapshotter) } }