Skip to content

Commit 757168b

Browse files
danilrwxdanilrwx
committed
simplify mode usage
Signed-off-by: Daniil Antoshin <[email protected]>
1 parent 4673f61 commit 757168b

File tree

10 files changed

+35
-160
lines changed

10 files changed

+35
-160
lines changed

‎images/virtualization-artifact/pkg/controller/service/restorer/common/common.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,9 @@ var (
3535
ErrSecretHasDifferentData = errors.New("the secret has different data")
3636
)
3737

38-
type OperationMode string
39-
4038
type OperationKind string
4139

4240
const (
43-
BestEffortRestorerMode OperationMode = "BestEffort"
44-
StrictRestoreMode OperationMode = "Strict"
45-
DryRunMode OperationMode = "DryRun"
46-
4741
RestoreKind OperationKind = "Restore"
4842
CloneKind OperationKind = "Clone"
4943
)

‎images/virtualization-artifact/pkg/controller/service/restorer/restorers/vm_restorer.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ type VirtualMachineHandler struct {
4141
vm *v1alpha2.VirtualMachine
4242
client client.Client
4343
restoreUID string
44-
mode common.OperationMode
44+
mode v1alpha2.VMOPRestoreMode
4545
}
4646

47-
func NewVirtualMachineHandler(client client.Client, vmTmpl v1alpha2.VirtualMachine, vmopRestoreUID string, mode common.OperationMode) *VirtualMachineHandler {
47+
func NewVirtualMachineHandler(client client.Client, vmTmpl v1alpha2.VirtualMachine, vmopRestoreUID string, mode v1alpha2.VMOPRestoreMode) *VirtualMachineHandler {
4848
if vmTmpl.Annotations != nil {
4949
vmTmpl.Annotations[annotations.AnnVMRestore] = vmopRestoreUID
5050
} else {
@@ -258,7 +258,7 @@ func (v *VirtualMachineHandler) handleMissingResource(obj client.Object, err err
258258
return false, err
259259
}
260260
if obj == nil {
261-
if v.mode == common.BestEffortRestorerMode {
261+
if v.mode == v1alpha2.VMOPRestoreModeBestEffort {
262262
return true, nil
263263
}
264264
return false, fmt.Errorf("%s %q not found", resourceType, name)
@@ -280,7 +280,7 @@ func (v *VirtualMachineHandler) validateProvisionerDependencies(ctx context.Cont
280280
}
281281

282282
if secret == nil {
283-
if v.mode == common.BestEffortRestorerMode {
283+
if v.mode == v1alpha2.VMOPRestoreModeBestEffort {
284284
v.vm.Spec.Provisioning.UserDataRef = nil
285285
} else {
286286
return fmt.Errorf("provisioner secret %q not found", userDataRef.Name)

‎images/virtualization-artifact/pkg/controller/service/restorer/restorers/vm_restorer_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727

2828
"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
2929
"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
30-
"github.com/deckhouse/virtualization-controller/pkg/controller/service/restorer/common"
3130
"github.com/deckhouse/virtualization/api/core/v1alpha2"
3231
)
3332

@@ -215,7 +214,7 @@ var _ = Describe("VirtualMachineRestorer", func() {
215214
Expect(err).ToNot(HaveOccurred())
216215
Expect(fakeClient).ToNot(BeNil())
217216

218-
handler = NewVirtualMachineHandler(fakeClient, vm, restoreUID, common.StrictRestoreMode)
217+
handler = NewVirtualMachineHandler(fakeClient, vm, restoreUID, v1alpha2.VMOPRestoreModeStrict)
219218
Expect(handler).ToNot(BeNil())
220219

221220
// Verify that restore annotation was added
@@ -376,7 +375,7 @@ var _ = Describe("VirtualMachineRestorer", func() {
376375
fakeClient, err = testutil.NewFakeClientWithInterceptorWithObjects(intercept)
377376
Expect(err).ToNot(HaveOccurred())
378377

379-
handler = NewVirtualMachineHandler(fakeClient, vm, restoreUID, common.StrictRestoreMode)
378+
handler = NewVirtualMachineHandler(fakeClient, vm, restoreUID, v1alpha2.VMOPRestoreModeStrict)
380379
})
381380

382381
It("should override VM name", func() {

‎images/virtualization-artifact/pkg/controller/service/restorer/restorers/vmbda_restorer_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
)
3333

3434
type VMBlockDeviceAttachmentTestArgs struct {
35-
mode common.OperationMode
35+
mode v1alpha2.VMOPRestoreMode
3636

3737
vmbdaExists bool
3838
vmbdaUsedByDiffVM bool
@@ -140,7 +140,7 @@ var _ = Describe("VMBlockDeviceAttachmentRestorer", func() {
140140
Expect(vmbdaCreated).To(Equal(args.shouldBeCreated))
141141
},
142142
Entry("vmbda exists; used by different VM", VMBlockDeviceAttachmentTestArgs{
143-
mode: common.StrictRestoreMode,
143+
mode: v1alpha2.VMOPRestoreModeStrict,
144144

145145
vmbdaExists: true,
146146
vmbdaUsedByDiffVM: true,
@@ -152,7 +152,7 @@ var _ = Describe("VMBlockDeviceAttachmentRestorer", func() {
152152
shouldBeCreated: false,
153153
}),
154154
Entry("vmbda exists; not used by different VM", VMBlockDeviceAttachmentTestArgs{
155-
mode: common.StrictRestoreMode,
155+
mode: v1alpha2.VMOPRestoreModeStrict,
156156

157157
vmbdaExists: true,
158158
vmbdaUsedByDiffVM: false,
@@ -164,7 +164,7 @@ var _ = Describe("VMBlockDeviceAttachmentRestorer", func() {
164164
shouldBeCreated: false,
165165
}),
166166
Entry("vmbda doesn't exist", VMBlockDeviceAttachmentTestArgs{
167-
mode: common.StrictRestoreMode,
167+
mode: v1alpha2.VMOPRestoreModeStrict,
168168

169169
vmbdaExists: false,
170170
vmbdaUsedByDiffVM: false,
@@ -176,7 +176,7 @@ var _ = Describe("VMBlockDeviceAttachmentRestorer", func() {
176176
shouldBeCreated: true,
177177
}),
178178
Entry("vmbda deletion completed; ready to create", VMBlockDeviceAttachmentTestArgs{
179-
mode: common.StrictRestoreMode,
179+
mode: v1alpha2.VMOPRestoreModeStrict,
180180

181181
vmbdaExists: false,
182182
vmbdaUsedByDiffVM: false,

‎images/virtualization-artifact/pkg/controller/service/restorer/restorers/vmip_restorer_test.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
2727

2828
"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
29-
"github.com/deckhouse/virtualization-controller/pkg/controller/service/restorer/common"
3029
"github.com/deckhouse/virtualization/api/core/v1alpha2"
3130
)
3231

3332
type VMIPTestArgs struct {
34-
mode common.OperationMode
33+
mode v1alpha2.VMOPRestoreMode
3534
vmipType v1alpha2.VirtualMachineIPAddressType
3635

3736
vmipExists bool
@@ -172,7 +171,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
172171
Expect(vmipCreated).To(Equal(args.shouldBeCreated))
173172
},
174173
Entry("vmip exists; vmip has Auto type; vmip used by different VM", VMIPTestArgs{
175-
mode: common.StrictRestoreMode,
174+
mode: v1alpha2.VMOPRestoreModeStrict,
176175
vmipExists: true,
177176
vmipType: v1alpha2.VirtualMachineIPAddressTypeAuto,
178177
vmipUsedByDiffVM: true,
@@ -185,7 +184,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
185184
shouldBeCreated: false,
186185
}),
187186
Entry("vmip exists; vmip has Auto type; vmip doesn't used by different VM", VMIPTestArgs{
188-
mode: common.StrictRestoreMode,
187+
mode: v1alpha2.VMOPRestoreModeStrict,
189188
vmipExists: true,
190189
vmipType: v1alpha2.VirtualMachineIPAddressTypeAuto,
191190
vmipUsedByDiffVM: false,
@@ -198,7 +197,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
198197
shouldBeCreated: false,
199198
}),
200199
Entry("vmip exists; vmip has StaticIP type; vmip used by different VM", VMIPTestArgs{
201-
mode: common.StrictRestoreMode,
200+
mode: v1alpha2.VMOPRestoreModeStrict,
202201
vmipExists: true,
203202
vmipType: v1alpha2.VirtualMachineIPAddressTypeStatic,
204203
vmipUsedByDiffVM: true,
@@ -211,7 +210,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
211210
shouldBeCreated: false,
212211
}),
213212
Entry("vmip exists; vmip has StaticIP type; staticIP used by different VM", VMIPTestArgs{
214-
mode: common.StrictRestoreMode,
213+
mode: v1alpha2.VMOPRestoreModeStrict,
215214
vmipExists: true,
216215
vmipType: v1alpha2.VirtualMachineIPAddressTypeStatic,
217216
vmipUsedByDiffVM: false,
@@ -224,7 +223,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
224223
shouldBeCreated: false,
225224
}),
226225
Entry("vmip exists; vmip has StaticIP type; vmip doesn't used by different VM", VMIPTestArgs{
227-
mode: common.StrictRestoreMode,
226+
mode: v1alpha2.VMOPRestoreModeStrict,
228227
vmipExists: true,
229228
vmipType: v1alpha2.VirtualMachineIPAddressTypeStatic,
230229
vmipUsedByDiffVM: false,
@@ -238,7 +237,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
238237
}),
239238

240239
Entry("vmip doesn't exist; vmip has Auto type", VMIPTestArgs{
241-
mode: common.StrictRestoreMode,
240+
mode: v1alpha2.VMOPRestoreModeStrict,
242241
vmipExists: false,
243242
vmipType: v1alpha2.VirtualMachineIPAddressTypeAuto,
244243
vmipUsedByDiffVM: false,
@@ -251,7 +250,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
251250
shouldBeCreated: true,
252251
}),
253252
Entry("vmip doesn't exist; vmip has StaticIP type; staticIP used by different VM", VMIPTestArgs{
254-
mode: common.StrictRestoreMode,
253+
mode: v1alpha2.VMOPRestoreModeStrict,
255254
vmipExists: false,
256255
vmipType: v1alpha2.VirtualMachineIPAddressTypeStatic,
257256
vmipUsedByDiffVM: false,
@@ -264,7 +263,7 @@ var _ = Describe("VirtualMachineIPAddressRestorer", func() {
264263
shouldBeCreated: false,
265264
}),
266265
Entry("vmip doesn't exist; vmip has StaticIP type; staticIP doesn't used by different VM", VMIPTestArgs{
267-
mode: common.StrictRestoreMode,
266+
mode: v1alpha2.VMOPRestoreModeStrict,
268267
vmipExists: false,
269268
vmipType: v1alpha2.VirtualMachineIPAddressTypeStatic,
270269
vmipUsedByDiffVM: false,

‎images/virtualization-artifact/pkg/controller/service/restorer/snapshot_resources.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type SnapshotResources struct {
4040
vmSnapshot *v1alpha2.VirtualMachineSnapshot
4141
objectHandlers []ObjectHandler
4242
statuses []SnapshotResourceStatus
43-
mode common.OperationMode
43+
mode v1alpha2.VMOPRestoreMode
4444
kind common.OperationKind
4545
}
4646

@@ -52,7 +52,7 @@ type SnapshotResourceStatus struct {
5252
Message string
5353
}
5454

55-
func NewSnapshotResources(client client.Client, kind common.OperationKind, mode common.OperationMode, restorerSecret *corev1.Secret, vmSnapshot *v1alpha2.VirtualMachineSnapshot, uuid string) SnapshotResources {
55+
func NewSnapshotResources(client client.Client, kind common.OperationKind, mode v1alpha2.VMOPRestoreMode, restorerSecret *corev1.Secret, vmSnapshot *v1alpha2.VirtualMachineSnapshot, uuid string) SnapshotResources {
5656
return SnapshotResources{
5757
mode: mode,
5858
kind: kind,
@@ -154,7 +154,7 @@ func (r *SnapshotResources) Process(ctx context.Context) ([]SnapshotResourceStat
154154

155155
r.statuses = make([]SnapshotResourceStatus, 0, len(r.objectHandlers))
156156

157-
if r.mode == common.DryRunMode {
157+
if r.mode == v1alpha2.VMOPRestoreModeDryRun {
158158
return r.statuses, errors.New("cannot Process with DryRun operation")
159159
}
160160

@@ -214,15 +214,15 @@ var RetryErrors = []error{
214214
common.ErrWaitingForDeletion,
215215
}
216216

217-
func shouldIgnoreError(mode common.OperationMode, err error) bool {
217+
func shouldIgnoreError(mode v1alpha2.VMOPRestoreMode, err error) bool {
218218
switch mode {
219-
case common.DryRunMode:
219+
case v1alpha2.VMOPRestoreModeDryRun:
220220
for _, e := range DryRunIgnoredErrors {
221221
if errors.Is(err, e) {
222222
return true
223223
}
224224
}
225-
case common.BestEffortRestorerMode:
225+
case v1alpha2.VMOPRestoreModeBestEffort:
226226
for _, e := range BestEffortIgnoredErrors {
227227
if errors.Is(err, e) {
228228
return true

‎images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/service/restore.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ func (o RestoreOperation) Execute(ctx context.Context) (reconcile.Result, error)
8585
step.NewVMSnapshotReadyStep(o.client, cb),
8686
step.NewValidateStep(o.client, o.recorder, cb),
8787
step.NewEnterMaintenanceStep(o.client, o.recorder, cb),
88-
step.NewBestEffortRestoreStep(o.client, o.recorder, cb),
89-
step.NewStrictRestoreStep(o.client, o.recorder, cb),
88+
step.NewProcessRestoreStep(o.client, o.recorder, cb),
9089
step.NewExitMaintenanceStep(o.client, o.recorder, cb),
9190
).Run(ctx, o.vmop)
9291
}

‎images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/best_effort_step.go‎

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)