fix dependencies (#510)

* fix dependencies * gen mocks
pluralsh · May 17, 2024 · da9e0a9 · da9e0a9
1 parent adcefc9
commit da9e0a9
Show file tree

Hide file tree

Showing 7 changed files with 1,686 additions and 1,022 deletions.
diff --git a/cmd/plural/bootstrap.go b/cmd/plural/bootstrap.go
@@ -216,7 +216,7 @@ func (p *Plural) handleMoveCluster(c *cli.Context) error {
 		return fmt.Errorf("You're not within an installation repo")
 	}
 
-	client, err := apiclient.New("")
+	client, err := apiclient.New(context.Background(), "")
 	if err != nil {
 		return err
 	}
@@ -238,7 +238,7 @@ func (p *Plural) handleMoveCluster(c *cli.Context) error {
 		Namespace: "bootstrap",
 		DryRun:    false,
 	}
-	if err := client.Move(options); err != nil {
+	if err := client.Move(context.Background(), options); err != nil {
 		return err
 	}
 

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/test/mocks/Client.go b/pkg/test/mocks/Client.go
diff --git a/pkg/test/mocks/ConsoleClient.go b/pkg/test/mocks/ConsoleClient.go
diff --git a/pkg/test/mocks/Kube.go b/pkg/test/mocks/Kube.go
diff --git a/pkg/utils/backup/capi.go b/pkg/utils/backup/capi.go
@@ -1,6 +1,7 @@
 package backup
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -12,6 +13,7 @@ import (
 
 type CAPIBackup struct {
 	dirPath string
+	ctx     context.Context
 }
 
 func (this CAPIBackup) createDir() {
@@ -28,7 +30,7 @@ func (this CAPIBackup) Exists() bool {
 }
 
 func (this CAPIBackup) Save(options apiclient.MoveOptions) error {
-	client, err := apiclient.New("")
+	client, err := apiclient.New(this.ctx, "")
 	if err != nil {
 		return err
 	}
@@ -41,11 +43,11 @@ func (this CAPIBackup) Save(options apiclient.MoveOptions) error {
 	options.ToDirectory = this.dirPath
 	options.Namespace = "bootstrap"
 
-	return client.Move(options)
+	return client.Move(this.ctx, options)
 }
 
 func (this CAPIBackup) Restore(options apiclient.MoveOptions) error {
-	client, err := apiclient.New("")
+	client, err := apiclient.New(this.ctx, "")
 	if err != nil {
 		return err
 	}
@@ -61,7 +63,7 @@ func (this CAPIBackup) Restore(options apiclient.MoveOptions) error {
 	options.FromDirectory = this.dirPath
 	options.Namespace = "bootstrap"
 
-	return client.Move(options)
+	return client.Move(this.ctx, options)
 }
 
 func (this CAPIBackup) Remove() error {
@@ -76,6 +78,7 @@ func NewCAPIBackup(cluster string) Backup[apiclient.MoveOptions] {
 	path, _ := config.PluralDir()
 
 	return CAPIBackup{
+		ctx:     context.Background(),
 		dirPath: filepath.Join(path, backupsDir, cluster),
 	}
 }