removed json, added relative path to tests

Author: alyssa-db

acceptance/dlt/install-dlt/output.txt

@@ -1,25 +1,24 @@
 
 === install dlt
->>> errcode [CLI] install-dlt -o json
-dlt successfully installed in directory "[BUILD_DIR]"
+>>> errcode [CLI] install-dlt -d ./subdir
+dlt successfully installed in directory "./subdir"
 
->>> [BUILD_DIR]/dlt
-DLT command verified
+>>> errcode ./subdir/dlt
+DLT CLI (stub, to be filled in)
 
 === dlt already installed
->>> errcode [CLI] install-dlt
-dlt already installed in directory "[BUILD_DIR]"
+>>> errcode [CLI] install-dlt -d ./subdir
+dlt already installed in directory "./subdir"
 
 === dlt file exists, should not overwrite
->>> errcode [CLI] install-dlt -d tmpdir -o json
-cannot install dlt CLI: "tmpdir/dlt" already exists
-Error: installation failed
+>>> errcode [CLI] install-dlt -d ./subdir
+Error: cannot install dlt CLI: "subdir/dlt" already exists
 
 Exit code: 1
 
-=== Executable not called as databricks
->>> errcode ./notdatabricks install-dlt -o json
-dlt successfully installed in directory "[TEST_TMP_DIR]"
+=== databricks executable called with alias
+>>> errcode ./subdir/notdatabricks install-dlt -d ./subdir
+dlt successfully installed in directory "./subdir"
 
->>> [TEST_TMP_DIR]/dlt
-DLT command verified
+>>> errcode ./subdir/dlt
+DLT CLI (stub, to be filled in)

acceptance/dlt/install-dlt/script

@@ -1,20 +1,25 @@
+tmpdir="./subdir"
+dlt="$tmpdir/dlt"
+mkdir -p $tmpdir
+
 title "install dlt"
-dlt=$(trace errcode $CLI install-dlt -o json | jq -r .symlink_path)
-trace $dlt | head -n1 | grep -q "DLT CLI" && echo "DLT command verified" || echo "DLT command failed"
+trace errcode $CLI install-dlt -d $tmpdir
+trace errcode $dlt | head -n1
 
 title "dlt already installed"
-trace errcode $CLI install-dlt
-rm -f "$(dirname $CLI)/dlt"
+trace errcode $CLI install-dlt -d $tmpdir
+rm -f $dlt
 
 title "dlt file exists, should not overwrite"
-mkdir -p tmpdir
-touch tmpdir/dlt
-trace errcode $CLI install-dlt -d tmpdir -o json | jq -r .symlink_path
-rm -rf tmpdir
+touch $dlt
+trace errcode $CLI install-dlt -d $tmpdir
+rm -f $dlt
+
+title "databricks executable called with alias"
+cp $CLI $tmpdir/notdatabricks
+trace errcode $tmpdir/notdatabricks install-dlt -d $tmpdir
+trace errcode $dlt | head -n1
 
-title "Executable not called as databricks"
-cp $CLI notdatabricks
-dlt=$(trace errcode ./notdatabricks install-dlt -o json | jq -r .symlink_path)
-trace $dlt | head -n1 | grep -q "DLT CLI" && echo "DLT command verified" || echo "DLT command failed"
-rm -f notdatabricks
-rm -f dlt
+# Cleanup
+rm -f $tmpdir/notdatabricks $dlt
+rm -rf $tmpdir

cmd/dlt/install_dlt.go

@@ -7,24 +7,18 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/databricks/cli/cmd/root"
 	"github.com/databricks/cli/libs/cmdio"
-	"github.com/databricks/cli/libs/flags"
 	"github.com/spf13/cobra"
 )
 
-type installDLTResponse struct {
-	SymlinkPath string `json:"symlink_path"`
-}
-
-func installDLTSymlink(directory string) (string, error) {
+func installDLTSymlink(directory string) error {
 	path, err := os.Executable()
 	if err != nil {
-		return "", err
+		return err
 	}
 	realPath, err := filepath.EvalSymlinks(path)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	dir := directory
@@ -36,26 +30,25 @@ func installDLTSymlink(directory string) (string, error) {
 	_, err = os.Lstat(dltPath)
 	if err != nil {
 		if !errors.Is(err, os.ErrNotExist) {
-			return "", err
+			return err
 		}
 		err = os.Symlink(realPath, dltPath)
 		if err != nil {
-			return "", err
+			return err
 		}
 		cmdio.LogString(context.Background(), fmt.Sprintf("dlt successfully installed in directory %q", dir))
-		return dltPath, nil
+		return nil
 	}
 
 	target, err := filepath.EvalSymlinks(dltPath)
 	if err != nil {
-		return "", err
+		return err
 	}
 	if realPath == target {
 		cmdio.LogString(context.Background(), fmt.Sprintf("dlt already installed in directory %q", dir))
-		return dltPath, nil
+		return nil
 	}
-	cmdio.LogString(context.Background(), fmt.Sprintf("cannot install dlt CLI: %q already exists", dltPath))
-	return "", errors.New("installation failed")
+	return fmt.Errorf("cannot install dlt CLI: %q already exists", dltPath)
 }
 
 func InstallDLT() *cobra.Command {
@@ -65,19 +58,7 @@ func InstallDLT() *cobra.Command {
 		Short:  "Install DLT",
 		Hidden: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			dltPath, err := installDLTSymlink(directory)
-			if err != nil {
-				return err
-			}
-			response := installDLTResponse{
-				SymlinkPath: dltPath,
-			}
-			switch root.OutputType(cmd) {
-			case flags.OutputJSON:
-				return cmdio.Render(cmd.Context(), response)
-			default:
-				return nil
-			}
+			return installDLTSymlink(directory)
 		},
 	}
 	cmd.Flags().StringVarP(&directory, "directory", "d", "", "Directory in which to install dlt CLI (defaults to databricks CLI's directory)")