feat: allow remote paths to be specified for customizations or -c flag (

#1031)

Signed-off-by: venkatbandarupalli <[email protected]>

common/constants.go

@@ -62,6 +62,8 @@ const (
 	BatExt = ".bat"
 	// RemoteSourcesFolder stores remote sources
 	RemoteSourcesFolder = "m2ksources"
+	// RemoteCustomizationsFolder stores remote customizations
+	RemoteCustomizationsFolder = "m2kcustomizations"
 )
 
 const (

common/vcs/vcs.go

@@ -41,8 +41,8 @@ type NoCompatibleVCSFound struct {
 	URLInput string
 }
 
-// GetInputClonedPath takes input and folder name performs clone with the appropriate VCS and then return the file system and remote paths
-func GetInputClonedPath(input, folderName string, overwrite bool) string {
+// GetClonedPath takes input and folder name performs clone with the appropriate VCS and then return the file system and remote paths
+func GetClonedPath(input, folderName string, overwrite bool) string {
 	vcsRepo, err := GetVCSRepo(input)
 	var vcsSrcPath string
 	if err != nil {

lib/planner.go

@@ -32,7 +32,7 @@ import (
 func CreatePlan(ctx context.Context, inputPath, outputPath string, customizationsPath, transformerSelector, prjName string) (plantypes.Plan, error) {
 	logrus.Trace("CreatePlan start")
 	defer logrus.Trace("CreatePlan end")
-	remoteInputFSPath := vcs.GetInputClonedPath(inputPath, common.RemoteSourcesFolder, true)
+	remoteInputFSPath := vcs.GetClonedPath(inputPath, common.RemoteSourcesFolder, true)
 	logrus.Debugf("common.TempPath: '%s' inputPath: '%s' remoteInputFSPath '%s'", common.TempPath, inputPath, remoteInputFSPath)
 	plan := plantypes.NewPlan()
 	plan.Name = prjName

lib/utils.go

@@ -22,37 +22,43 @@ import (
 	"path/filepath"
 
 	"github.com/konveyor/move2kube/common"
+	"github.com/konveyor/move2kube/common/vcs"
 	"github.com/konveyor/move2kube/filesystem"
 )
 
 // CheckAndCopyCustomizations checks if the customizations path is an existing directory and copies to assets
 func CheckAndCopyCustomizations(customizationsPath string) error {
-	if customizationsPath == "" {
+	remoteCustomizationsPath := vcs.GetClonedPath(customizationsPath, common.RemoteCustomizationsFolder, true)
+	customizationsFSPath := customizationsPath
+	if remoteCustomizationsPath != "" {
+		customizationsFSPath = remoteCustomizationsPath
+	}
+	if customizationsFSPath == "" {
 		return nil
 	}
-	customizationsPath, err := filepath.Abs(customizationsPath)
+	customizationsFSPath, err := filepath.Abs(customizationsFSPath)
 	if err != nil {
-		return fmt.Errorf("failed to make the customizations directory path '%s' absolute. Error: %w", customizationsPath, err)
+		return fmt.Errorf("failed to make the customizations directory path '%s' absolute. Error: %w", customizationsFSPath, err)
 	}
-	fi, err := os.Stat(customizationsPath)
+	fi, err := os.Stat(customizationsFSPath)
 	if os.IsNotExist(err) {
-		return fmt.Errorf("the given customizations directory '%s' does not exist. Error: %w", customizationsPath, err)
+		return fmt.Errorf("the given customizations directory '%s' does not exist. Error: %w", customizationsFSPath, err)
 	}
 	if err != nil {
-		return fmt.Errorf("failed to stat the given customizations directory '%s' Error: %w", customizationsPath, err)
+		return fmt.Errorf("failed to stat the given customizations directory '%s' Error: %w", customizationsFSPath, err)
 	}
 	if !fi.IsDir() {
-		return fmt.Errorf("the given customizations path '%s' is a file. Expected a directory", customizationsPath)
+		return fmt.Errorf("the given customizations path '%s' is a file. Expected a directory", customizationsFSPath)
 	}
 	pwd, err := os.Getwd()
 	if err != nil {
 		return fmt.Errorf("failed to get the current working directory. Error: %w", err)
 	}
-	if common.IsParent(pwd, customizationsPath) {
-		return fmt.Errorf("the given customizations directory '%s' is a parent of the current working directory", customizationsPath)
+	if common.IsParent(pwd, customizationsFSPath) {
+		return fmt.Errorf("the given customizations directory '%s' is a parent of the current working directory", customizationsFSPath)
 	}
-	if err = CopyCustomizationsAssetsData(customizationsPath); err != nil {
-		return fmt.Errorf("failed to copy the customizations data from the directory '%s' . Error: %w", customizationsPath, err)
+	if err = CopyCustomizationsAssetsData(customizationsFSPath); err != nil {
+		return fmt.Errorf("failed to copy the customizations data from the directory '%s' . Error: %w", customizationsFSPath, err)
 	}
 	return nil
 }

types/plan/planutils.go

@@ -40,7 +40,7 @@ func ReadPlan(path string, sourceDir string) (Plan, error) {
 		plan.Spec.SourceDir = sourceDir
 	}
 	if plan.Spec.SourceDir != "" {
-		remoteSrcPath := vcs.GetInputClonedPath(plan.Spec.SourceDir, common.RemoteSourcesFolder, false)
+		remoteSrcPath := vcs.GetClonedPath(plan.Spec.SourceDir, common.RemoteSourcesFolder, false)
 		if remoteSrcPath != "" {
 			plan.Spec.SourceDir = remoteSrcPath
 		}
@@ -60,7 +60,7 @@ func ReadPlan(path string, sourceDir string) (Plan, error) {
 // WritePlan encodes the plan to yaml converting absolute paths to relative.
 func WritePlan(path string, plan Plan) error {
 	inputFSPath := plan.Spec.SourceDir
-	remoteSrcPath := vcs.GetInputClonedPath(plan.Spec.SourceDir, common.RemoteSourcesFolder, false)
+	remoteSrcPath := vcs.GetClonedPath(plan.Spec.SourceDir, common.RemoteSourcesFolder, false)
 	if remoteSrcPath != "" {
 		inputFSPath = remoteSrcPath
 	}