Skip to content

Commit 25e35f2

Browse files
authored
[cleanup] Remove init rec feature (#1890)
## Summary This feature is not really maintained and out of date. I think value is fairly limited. fixes #1788 ## How was it tested? CICD
1 parent 6a8b5dc commit 25e35f2

File tree

24 files changed

+17
-1028
lines changed

24 files changed

+17
-1028
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616
github.com/briandowns/spinner v1.23.0
1717
github.com/cavaliergopher/grab/v3 v3.0.1
1818
github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184
19-
github.com/creekorful/mvnparser v1.5.0
2019
github.com/denisbrodbeck/machineid v1.0.1
2120
github.com/f1bonacc1/process-compose v0.88.0
2221
github.com/fatih/color v1.16.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
125125
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
126126
github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
127127
github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
128-
github.com/creekorful/mvnparser v1.5.0 h1:tcaof1yFnyzz2t4tWAM7mwYcRLgiHB1Ch5hJHtnBoDk=
129-
github.com/creekorful/mvnparser v1.5.0/go.mod h1:FeYOFPluW+0s5hTa8JSCjHjpo4lWGq190OHbMuvqbBE=
130128
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
131129
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
132130
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

internal/boxcli/global.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func globalListCmd() *cobra.Command {
7272
}
7373

7474
func listGlobalCmdFunc(cmd *cobra.Command, args []string) error {
75-
path, err := ensureGlobalConfig(cmd)
75+
path, err := ensureGlobalConfig()
7676
if err != nil {
7777
return errors.WithStack(err)
7878
}
@@ -92,7 +92,7 @@ func listGlobalCmdFunc(cmd *cobra.Command, args []string) error {
9292

9393
var globalConfigPath string
9494

95-
func ensureGlobalConfig(cmd *cobra.Command) (string, error) {
95+
func ensureGlobalConfig() (string, error) {
9696
if globalConfigPath != "" {
9797
return globalConfigPath, nil
9898
}
@@ -101,7 +101,7 @@ func ensureGlobalConfig(cmd *cobra.Command) (string, error) {
101101
if err != nil {
102102
return "", err
103103
}
104-
_, err = devbox.InitConfig(globalConfigPath, cmd.ErrOrStderr())
104+
_, err = devbox.InitConfig(globalConfigPath)
105105
if err != nil {
106106
return "", err
107107
}
@@ -112,7 +112,7 @@ func setGlobalConfigForDelegatedCommands(
112112
globalCmd *cobra.Command,
113113
) func(cmd *cobra.Command, args []string) error {
114114
return func(cmd *cobra.Command, args []string) error {
115-
globalPath, err := ensureGlobalConfig(cmd)
115+
globalPath, err := ensureGlobalConfig()
116116
if err != nil {
117117
return err
118118
}
@@ -132,7 +132,7 @@ func ensureGlobalEnvEnabled(cmd *cobra.Command, args []string) error {
132132
if cmd.Name() == "shellenv" {
133133
return nil
134134
}
135-
path, err := ensureGlobalConfig(cmd)
135+
path, err := ensureGlobalConfig()
136136
if err != nil {
137137
return errors.WithStack(err)
138138
}

internal/boxcli/init.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ func initCmd() *cobra.Command {
1919
"You can then add packages using `devbox add`",
2020
Args: cobra.MaximumNArgs(1),
2121
RunE: func(cmd *cobra.Command, args []string) error {
22-
return runInitCmd(cmd, args)
22+
return runInitCmd(args)
2323
},
2424
}
2525

2626
return command
2727
}
2828

29-
func runInitCmd(cmd *cobra.Command, args []string) error {
29+
func runInitCmd(args []string) error {
3030
path := pathArg(args)
3131

32-
_, err := devbox.InitConfig(path, cmd.ErrOrStderr())
32+
_, err := devbox.InitConfig(path)
3333
return errors.WithStack(err)
3434
}

internal/devbox/devbox.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ type Devbox struct {
7676

7777
var legacyPackagesWarningHasBeenShown = false
7878

79-
func InitConfig(dir string, writer io.Writer) (bool, error) {
80-
return devconfig.Init(dir, writer)
79+
func InitConfig(dir string) (bool, error) {
80+
return devconfig.Init(dir)
8181
}
8282

8383
func Open(opts *devopt.Opts) (*Devbox, error) {

internal/devbox/devbox_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func TestComputeDevboxPathWhenRemoving(t *testing.T) {
123123

124124
func devboxForTesting(t *testing.T) *Devbox {
125125
path := t.TempDir()
126-
_, err := devconfig.Init(path, os.Stdout)
126+
_, err := devconfig.Init(path)
127127
require.NoError(t, err, "InitConfig should not fail")
128128
d, err := Open(&devopt.Opts{
129129
Dir: path,

internal/devconfig/init.go

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,18 @@ package devconfig
55

66
import (
77
"errors"
8-
"fmt"
9-
"io"
108
"os"
119
"path/filepath"
12-
"strings"
13-
14-
"github.com/fatih/color"
1510

1611
"go.jetpack.io/devbox/internal/devconfig/configfile"
17-
"go.jetpack.io/devbox/internal/initrec"
1812
)
1913

20-
func Init(dir string, writer io.Writer) (created bool, err error) {
21-
created, err = initConfigFile(filepath.Join(dir, configfile.DefaultName))
22-
if err != nil || !created {
23-
return created, err
24-
}
25-
26-
// package suggestion
27-
pkgsToSuggest, err := initrec.Get(dir)
28-
if err != nil {
29-
return created, err
30-
}
31-
if len(pkgsToSuggest) > 0 {
32-
s := fmt.Sprintf("devbox add %s", strings.Join(pkgsToSuggest, " "))
33-
fmt.Fprintf(
34-
writer,
35-
"We detected extra packages you may need. To install them, run `%s`\n",
36-
color.HiYellowString(s),
37-
)
38-
}
39-
return created, err
40-
}
41-
42-
func initConfigFile(path string) (created bool, err error) {
43-
file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0o644)
14+
func Init(dir string) (created bool, err error) {
15+
file, err := os.OpenFile(
16+
filepath.Join(dir, configfile.DefaultName),
17+
os.O_RDWR|os.O_CREATE|os.O_EXCL,
18+
0o644,
19+
)
4420
if errors.Is(err, os.ErrExist) {
4521
return false, nil
4622
}

internal/initrec/analyzer/analyzer.go

Lines changed: 0 additions & 61 deletions
This file was deleted.

internal/initrec/analyzer/version.go

Lines changed: 0 additions & 62 deletions
This file was deleted.

internal/initrec/analyzer/version_test.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)