Refactor Duplicate Functions and Tests from kando package (#2234)

* Remove test files from kando package Signed-off-by: Rajat Gupta <rajat.gupta@veeam.com> * - Remove Unused Functions - Refactored helper function Signed-off-by: Rajat Gupta <rajat.gupta@veeam.com> --------- Signed-off-by: Rajat Gupta <rajat.gupta@veeam.com>
kanisterio · Sep 27, 2023 · 410853d · 410853d
1 parent 59924f8
commit 410853d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 136 deletions.
diff --git a/pkg/kando/chronicle_pull.go b/pkg/kando/chronicle_pull.go
@@ -17,11 +17,14 @@ package kando
 import (
 	"context"
 	"encoding/json"
+	"io"
+	"os"
 
-	"github.com/kanisterio/kanister/pkg/chronicle"
-	"github.com/kanisterio/kanister/pkg/param"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+
+	"github.com/kanisterio/kanister/pkg/chronicle"
+	"github.com/kanisterio/kanister/pkg/param"
 )
 
 func newChroniclePullCommand() *cobra.Command {
@@ -64,3 +67,12 @@ func runChroniclePull(cmd *cobra.Command, p locationParams, arg string) error {
 	ctx := context.Background()
 	return chronicle.Pull(ctx, target, *prof, p.suffix)
 }
+
+const usePipeParam = `-`
+
+func targetWriter(target string) (io.Writer, error) {
+	if target != usePipeParam {
+		return os.OpenFile(target, os.O_RDWR|os.O_CREATE, 0755)
+	}
+	return os.Stdout, nil
+}
diff --git a/pkg/kando/kando_test.go b/pkg/kando/kando_test.go
diff --git a/pkg/kando/location_delete.go b/pkg/kando/location_delete.go
@@ -15,12 +15,7 @@
 package kando
 
 import (
-	"context"
-
 	"github.com/spf13/cobra"
-
-	"github.com/kanisterio/kanister/pkg/location"
-	"github.com/kanisterio/kanister/pkg/param"
 )
 
 func newLocationDeleteCommand() *cobra.Command {
@@ -42,7 +37,3 @@ func newLocationDeleteCommand() *cobra.Command {
 	cmd.Flags().StringP(kopiaSnapshotFlagName, "k", "", "Pass the kopia snapshot information from the location push command (optional)")
 	return cmd
 }
-
-func locationDelete(ctx context.Context, p *param.Profile, path string) error {
-	return location.Delete(ctx, *p, path)
-}
diff --git a/pkg/kando/location_pull.go b/pkg/kando/location_pull.go
@@ -15,14 +15,7 @@
 package kando
 
 import (
-	"context"
-	"io"
-	"os"
-
 	"github.com/spf13/cobra"
-
-	"github.com/kanisterio/kanister/pkg/location"
-	"github.com/kanisterio/kanister/pkg/param"
 )
 
 const (
@@ -49,14 +42,3 @@ func newLocationPullCommand() *cobra.Command {
 	cmd.Flags().StringP(kopiaSnapshotFlagName, "k", "", "Pass the kopia snapshot information from the location push command (optional)")
 	return cmd
 }
-
-func targetWriter(target string) (io.Writer, error) {
-	if target != usePipeParam {
-		return os.OpenFile(target, os.O_RDWR|os.O_CREATE, 0755)
-	}
-	return os.Stdout, nil
-}
-
-func locationPull(ctx context.Context, p *param.Profile, path string, target io.Writer) error {
-	return location.Read(ctx, target, *p, path)
-}
diff --git a/pkg/kando/location_push.go b/pkg/kando/location_push.go
@@ -15,13 +15,7 @@
 package kando
 
 import (
-	"context"
-	"io"
-
 	"github.com/spf13/cobra"
-
-	"github.com/kanisterio/kanister/pkg/location"
-	"github.com/kanisterio/kanister/pkg/param"
 )
 
 const (
@@ -50,9 +44,3 @@ func newLocationPushCommand() *cobra.Command {
 
 	return cmd
 }
-
-const usePipeParam = `-`
-
-func locationPush(ctx context.Context, p *param.Profile, path string, source io.Reader) error {
-	return location.Write(ctx, source, *p, path)
-}
diff --git a/pkg/kando/location_test.go b/pkg/kando/location_test.go