fix: remove some dead code

stop using draft library unnecessarily
add version command

related to jenkins-x/jx#8670

pkg/cmd/importcmd/pack.go

@@ -3,6 +3,7 @@ package importcmd
 import (
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -11,7 +12,6 @@ import (
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/chartutil"
 
-	"github.com/Azure/draft/pkg/osutil"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/files"
 	"github.com/pkg/errors"
 )
@@ -73,14 +73,15 @@ func (p *Pack) SaveDir(dest, packName string) error {
 	// save the rest of the files
 	for relPath, f := range p.Files {
 		path := filepath.Join(dest, relPath)
-		exists, err := osutil.Exists(path)
+		_, err := os.Stat(path)
 		if err != nil {
-			return errors.Wrapf(err, "failed to check if path exists %s", path)
-		}
-		if !exists {
-			err := saveFile(path, f)
-			if err != nil {
-				return err
+			if errors.Is(err, fs.ErrNotExist) {
+				err := saveFile(path, f)
+				if err != nil {
+					return err
+				}
+			} else {
+				return fmt.Errorf("failed to check if path exists %s: %w", path, err)
 			}
 		}
 	}

pkg/cmd/root/enable/enable.go

@@ -10,9 +10,7 @@ import (
 	"github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/cobras/helper"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/cobras/templates"
-	"github.com/jenkins-x/lighthouse-client/pkg/triggerconfig"
 	"github.com/spf13/cobra"
-	tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 )
 
 // Options contains the command line options
@@ -32,14 +30,6 @@ var (
 	`)
 )
 
-// Trigger the found trigger configs
-type Trigger struct {
-	Path      string
-	Config    *triggerconfig.Config
-	Names     []string
-	Pipelines map[string]*tektonv1beta1.PipelineRun
-}
-
 // NewCmdPipelineEnable creates the command
 func NewCmdPipelineEnable() (*cobra.Command, *Options) {
 	o := &Options{}

pkg/cmd/root/root.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/jenkins-x-plugins/jx-project/pkg/cmd/root/version"
+
 	"github.com/jenkins-x-plugins/jx-project/pkg/cmd/root/enable"
 
 	"github.com/jenkins-x-plugins/jx-project/pkg/cmd/common"
@@ -83,6 +85,7 @@ func NewCmdMain() (*cobra.Command, *WizardOptions) {
 	cmd.AddCommand(NewCmdCreateSpring())
 	cmd.AddCommand(importcmd.NewCmdImport())
 	cmd.AddCommand(pullrequest.NewCmdCreatePullRequest())
+	cmd.AddCommand(version.NewCmdVersion())
 
 	return cmd, options
 }

pkg/cmd/root/version/version.go

@@ -31,7 +31,7 @@ type Options struct {
 }
 
 // NewCmdVersion creates a command object for the "version" command
-func NewCmdVersion() (*cobra.Command, *Options) {
+func NewCmdVersion() *cobra.Command {
 	o := &Options{}
 
 	cmd := &cobra.Command{
@@ -42,7 +42,7 @@ func NewCmdVersion() (*cobra.Command, *Options) {
 			helper.CheckErr(err)
 		},
 	}
-	return cmd, o
+	return cmd
 }
 
 // Run implements the command

pkg/draft/draft.go

@@ -4,54 +4,16 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
-	"github.com/Azure/draft/pkg/draft/draftpath"
-	"github.com/Azure/draft/pkg/draft/pack/repo"
-
 	"github.com/Azure/draft/pkg/linguist"
 	"github.com/jenkins-x/jx-logging/v3/pkg/log"
 )
 
-// copied from draft so we can change the $DRAFT_HOME to ~/.jx/draft and lookup jx draft packs
+// copied from draft so we can change to lookup jx draft packs
 // credit original from: https://github.com/Azure/draft/blob/8e1a459/cmd/draft/create.go#L163
 
-// DoPackDetection performs pack detection across all the packs available in $(draft home)/packs in
-// alphabetical order, returning the pack dirpath and any errors that occurred during the pack detection.
-func DoPackDetection(home draftpath.Home, out io.Writer, dir string) (string, error) {
-	log.Logger().Infof("performing pack detection in folder %s", dir)
-	langs, err := linguist.ProcessDir(dir)
-	if err != nil {
-		return "", fmt.Errorf("there was an error detecting the language: %s", err)
-	}
-	if len(langs) == 0 {
-		return "", fmt.Errorf("there was an error detecting the language")
-	}
-	for _, lang := range langs {
-		detectedLang := linguist.Alias(lang)
-		fmt.Fprintf(out, "--> Draft detected %s (%f%%)\n", detectedLang.Language, detectedLang.Percent)
-		for _, repository := range repo.FindRepositories(home.Packs()) {
-			packDir := path.Join(repository.Dir, repo.PackDirName)
-			packs, err := os.ReadDir(packDir)
-			if err != nil {
-				return "", fmt.Errorf("there was an error reading %s: %v", packDir, err)
-			}
-			for _, file := range packs {
-				if file.IsDir() {
-					if strings.EqualFold(detectedLang.Language, file.Name()) {
-						packPath := filepath.Join(packDir, file.Name())
-						return packPath, nil
-					}
-				}
-			}
-		}
-		fmt.Fprintf(out, "--> Could not find a pack for %s. Trying to find the next likely language match...\n", detectedLang.Language)
-	}
-	return "", fmt.Errorf("there was an error detecting the language using packs from %s", home.Packs())
-}
-
 // DoPackDetectionForBuildPack performs detection of the language based on a sepcific build pack
 func DoPackDetectionForBuildPack(out io.Writer, dir, packDir string) (string, error) {
 	log.Logger().Infof("performing pack detection in folder %s", dir)