Skip to content

Commit 23bee15

Browse files
committed
uninstall: don't refer config.CliOpts in 'uninstall' package
1 parent 9710aca commit 23bee15

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

cli/cmd/uninstall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func uninstallValidArgsFunc(cmd *cobra.Command, args []string, toComplete string
1111
if len(args) > 0 {
1212
return []string{}, cobra.ShellCompDirectiveNoFileComp
1313
}
14-
return uninstall.GetList(cliOpts, cmd.Name()),
14+
return uninstall.GetAvailableVersions(cmd.Name(), cliOpts.Env.BinDir),
1515
cobra.ShellCompDirectiveNoFileComp
1616
}
1717

cli/uninstall/uninstall.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/tarantool/tt/cli/install"
1212

1313
"github.com/apex/log"
14-
"github.com/tarantool/tt/cli/config"
1514
"github.com/tarantool/tt/cli/search"
1615
"github.com/tarantool/tt/cli/util"
1716
"github.com/tarantool/tt/cli/version"
@@ -208,18 +207,19 @@ func getDefault(program, dir string) (string, error) {
208207
return ver, nil
209208
}
210209

211-
// GetList generates a list of options to uninstall.
212-
func GetList(cliOpts *config.CliOpts, program string) []string {
210+
// GetAvailableVersions returns a list of the program's versions installed into
211+
// the binDir directory.
212+
func GetAvailableVersions(program string, binDir string) []string {
213213
list := []string{}
214214
re := regexp.MustCompile(
215215
"^" + progRegexp + version.FsSeparator + verRegexp + "$",
216216
)
217217

218-
if cliOpts.Env.BinDir == "" {
218+
if binDir == "" {
219219
return nil
220220
}
221221

222-
installedPrograms, err := os.ReadDir(cliOpts.Env.BinDir)
222+
installedPrograms, err := os.ReadDir(binDir)
223223
if err != nil {
224224
return nil
225225
}

cli/uninstall/uninstall_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (mock *mockRepository) ValidateAll() error {
2525
return nil
2626
}
2727

28-
func TestGetList(t *testing.T) {
28+
func TestGetAvailableVersions(t *testing.T) {
2929
assert := assert.New(t)
3030
workDir := t.TempDir()
3131

@@ -52,13 +52,13 @@ func TestGetList(t *testing.T) {
5252

5353
cliOpts, _, err := configure.GetCliOpts(cfgPath, &mockRepository{})
5454
require.NoError(t, err)
55-
result := GetList(cliOpts, "tt")
55+
result := GetAvailableVersions("tt", cliOpts.Env.BinDir)
5656
assert.Equal(result, []string{"1.2.3"})
5757

58-
result = GetList(cliOpts, "tarantool")
58+
result = GetAvailableVersions("tarantool", cliOpts.Env.BinDir)
5959
assert.Equal(result, []string{"1.2.10"})
6060

61-
result = GetList(cliOpts, "tarantool-ee")
61+
result = GetAvailableVersions("tarantool-ee", cliOpts.Env.BinDir)
6262
assert.Equal(result, []string{"master"})
6363
}
6464

0 commit comments

Comments
 (0)