Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmd/migration-manager/internal/cmds/warnings.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ func (c *CmdWarning) Command() *cobra.Command {
`

// List
configListCmd := cmdWarningList{global: c.Global}
cmd.AddCommand(configListCmd.Command())
warningListCmd := cmdWarningList{global: c.Global}
cmd.AddCommand(warningListCmd.Command())

// Show
configShowCmd := cmdWarningShow{global: c.Global}
cmd.AddCommand(configShowCmd.Command())
warningShowCmd := cmdWarningShow{global: c.Global}
cmd.AddCommand(warningShowCmd.Command())

// Acknowledge
configAck := cmdWarningAck{global: c.Global}
cmd.AddCommand(configAck.Command())
warningAck := cmdWarningAck{global: c.Global}
cmd.AddCommand(warningAck.Command())

// Workaround for subcommand usage errors. See: https://github.com/spf13/cobra/issues/706
cmd.Args = cobra.NoArgs
Expand Down
4 changes: 2 additions & 2 deletions cmd/migration-managerd/internal/api/migration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,8 @@ def placement(instance, batch):
tgt := target.InternalIncusTarget{InternalTarget: target.NewInternalTarget(t, "6.0")}
return tgt.CreateVMDefinition(instanceDef, usedNetworks, q, fingerprint, endpoint, targeNetwork)
},
CreateNewVMFunc: func(ctx context.Context, instDef migration.Instance, apiDef incusAPI.InstancesPost, placement api.Placement, bootISOImage string) (func(context.Context) error, func(), error) {
return func(_ context.Context) error { return nil }, func() { ranCleanup = true }, nil
CreateNewVMFunc: func(ctx context.Context, instDef migration.Instance, apiDef incusAPI.InstancesPost, placement api.Placement, bootISOImage string) (func(context.Context) error, func(t target.Target), error) {
return func(_ context.Context) error { return nil }, func(t target.Target) { ranCleanup = true }, nil
},
SetupVMFunc: func(ctx context.Context, instDef migration.Instance, apiDef incusAPI.InstancesPost, placement api.Placement) error {
return nil
Expand Down
2 changes: 1 addition & 1 deletion internal/migration/warning_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (w Warning) Validate() error {
}

if w.Entity == "" {
return NewValidationErrf("Warning %q cannot have empty type", w.UUID)
return NewValidationErrf("Warning %q cannot have empty entity", w.UUID)
}

if w.Status == "" {
Expand Down
6 changes: 3 additions & 3 deletions internal/target/mock_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading