Fix issue where .manifest files didn't register as roots

We previously traversed the path downwards, so if we had
`foo/bar/.manifest` and `foo/bar/baz` was provided, we would
not find `foo/bar` as a root. Now search for manifests from the
root.

Fixes #1077

Signed-off-by: Anders Eknert <anders@styra.com>

internal/io/io.go

@@ -135,6 +135,8 @@ func WalkFiles(root string, f func(path string) error) error {
 	})
 }
 
+// FindManifestLocations walks the file system rooted at root, and returns the
+// *relative* paths of directories containing a .manifest file.
 func FindManifestLocations(root string) ([]string, error) {
 	var foundBundleRoots []string
 

pkg/config/config.go

@@ -219,12 +219,6 @@ func FindBundleRootDirectories(path string) ([]string, error) {
 			foundBundleRoots = append(foundBundleRoots, roots...)
 		}
 
-		// rather than calling rio.FindManifestLocations later, let's
-		// check for .manifest directories as part of the same walk
-		if !info.IsDir() && info.Name() == ".manifest" {
-			foundBundleRoots = append(foundBundleRoots, filepath.Dir(path))
-		}
-
 		return nil
 	}); err != nil {
 		return nil, fmt.Errorf("failed to walk path: %w", err)
@@ -268,6 +262,13 @@ func rootsFromRegalDirectory(regalDir *os.File) ([]string, error) {
 		foundBundleRoots = append(foundBundleRoots, customRulesDir)
 	}
 
+	manifestRoots, err := rio.FindManifestLocations(filepath.Dir(regalDir.Name()))
+	if err != nil {
+		return nil, fmt.Errorf("failed while looking for manifest locations: %w", err)
+	}
+
+	foundBundleRoots = append(foundBundleRoots, util.Map(util.FilepathJoiner(parent), manifestRoots)...)
+
 	return foundBundleRoots, nil
 }