Add Golang input discovery

bobtask/input.go

@@ -10,7 +10,11 @@ import (
 	"strings"
 
 	"github.com/benchkram/bob/bob/global"
+	"github.com/benchkram/bob/pkg/boblog"
 	"github.com/benchkram/bob/pkg/filepathutil"
+	"github.com/benchkram/bob/pkg/inputdiscovery"
+	"github.com/benchkram/bob/pkg/inputdiscovery/goinputdiscovery"
+	"github.com/benchkram/bob/pkg/sliceutil"
 	"github.com/benchkram/bob/pkg/usererror"
 	"github.com/benchkram/errz"
 )
@@ -40,14 +44,15 @@ func (t *Task) FilterInputs(wd string) (err error) {
 	return nil
 }
 
-// filteredInputs returns inputs filtered by ignores and file targets.
+// FilteredInputs returns inputs filtered by ignores and file targets.
 // Calls sanitize on the result.
 func (t *Task) FilteredInputs(projectRoot string) (_ []string, err error) {
 
 	inputDirty := split(fmt.Sprintf("%s\n%s", t.InputDirty, defaultIgnores))
 	inputDirtyRooted := inputDirty
 	if t.dir != "." {
 		inputDirtyRooted = make([]string, len(inputDirty))
+
 		for i, input := range inputDirty {
 
 			err = t.sanitizeInput(input)
@@ -61,13 +66,43 @@ func (t *Task) FilteredInputs(projectRoot string) (_ []string, err error) {
 				continue
 			}
 			inputDirtyRooted[i] = filepath.Join(t.dir, input)
+
+			for _, prefix := range []string{goinputdiscovery.Keyword} {
+				if strings.HasPrefix(input, prefix) {
+					inputDirtyRooted[i] = prefix + filepath.Join(t.dir, strings.TrimPrefix(input, prefix))
+					break
+				}
+			}
+		}
+	}
+
+	// Auto input discovery
+	var inputDirtyRootedDiscovered []string
+	for _, input := range inputDirtyRooted {
+		// TODO: collect keywords for auto discovery some place
+		if strings.HasPrefix(input, goinputdiscovery.Keyword+inputdiscovery.KeywordSeparator) {
+			packagePathRel := strings.TrimPrefix(input, goinputdiscovery.Keyword+inputdiscovery.KeywordSeparator)
+			// Join calls filepath.Clean after joining elements
+			packagePathAbs := filepath.Join(projectRoot, packagePathRel)
+			goInputDiscovery := goinputdiscovery.New(goinputdiscovery.WithProjectDir(projectRoot))
+
+			goInputs, err := goInputDiscovery.DiscoverInputs(packagePathAbs)
+			if err != nil {
+				return nil, usererror.Wrap(fmt.Errorf("golang auto input discovery failed: %w", err))
+			}
+
+			boblog.Log.V(4).Info(fmt.Sprintf("Auto input discovery for Golang package: %s; found inputs: %v", packagePathAbs, goInputs))
+
+			inputDirtyRootedDiscovered = append(inputDirtyRootedDiscovered, goInputs...)
+		} else {
+			inputDirtyRootedDiscovered = append(inputDirtyRootedDiscovered, input)
 		}
 	}
 
 	// Determine inputs and files to be ignored
 	var inputs []string
 	var ignores []string
-	for _, input := range inputDirtyRooted {
+	for _, input := range inputDirtyRootedDiscovered {
 		// Ignore starts with !
 		if strings.HasPrefix(input, "!") {
 			input = strings.TrimPrefix(input, "!")
@@ -134,8 +169,8 @@ func (t *Task) FilteredInputs(projectRoot string) (_ []string, err error) {
 		ignores = append(ignores, path)
 	}
 
-	inputs = unique(inputs)
-	ignores = unique(ignores)
+	inputs = sliceutil.Unique(inputs)
+	ignores = sliceutil.Unique(ignores)
 
 	// Filter
 	filteredInputs := make([]string, 0, len(inputs))
@@ -175,20 +210,6 @@ func rooted(ss []string, prefix string) []string {
 	return ss
 }
 
-func unique(ss []string) []string {
-	unique := make([]string, 0, len(ss))
-
-	um := make(map[string]struct{})
-	for _, s := range ss {
-		if _, ok := um[s]; !ok {
-			um[s] = struct{}{}
-			unique = append(unique, s)
-		}
-	}
-
-	return unique
-}
-
 func appendUnique(a []string, xx ...string) []string {
 	for _, x := range xx {
 		add := true

flake.nix

@@ -55,7 +55,7 @@
             #       got:    sha256-BzlZiAXA8wQ7RU6N1knPYH/BDX1Ae+2+4pVJ41ecK7A=*/
             #
             # If on `nix build` you get above error, just replace the value vendorSha256 with value from `got`
-            vendorSha256 = "sha256-S1XUgjdSVTWXehOLCxXcvj0SH12cxqvYadVlCw/saF4=";
+            vendorSha256 = "sha256-+ZOVb+D9CSTK8brHYNP5sK5X4HvNwzxKsP7RkP86CQQ=";
 
             excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ];
 

go.mod

@@ -26,12 +26,14 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/sanity-io/litter v1.5.5
 	github.com/schollz/progressbar/v3 v3.11.0
+	github.com/sergi/go-diff v1.3.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.13.0
 	github.com/stretchr/testify v1.8.2
 	github.com/whilp/git-urls v1.0.0
 	github.com/xlab/treeprint v1.1.0
-	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
+	golang.org/x/sync v0.2.0
+	golang.org/x/tools v0.9.3
 	google.golang.org/protobuf v1.28.0
 	gopkg.in/yaml.v3 v3.0.1
 	mvdan.cc/sh v2.6.4+incompatible
@@ -138,7 +140,6 @@ require (
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b // indirect
-	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
@@ -166,11 +167,12 @@ require (
 	go.opentelemetry.io/otel/trace v1.4.1 // indirect
 	go.opentelemetry.io/proto/otlp v0.12.0 // indirect
 	golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
-	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
-	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
-	golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect