bundle: rearrange embed.FS setup (StyraInc#279)

No functional changes, I hope!

Signed-off-by: Stephan Renatus <stephan@styra.com>

bundle/bundle.go

@@ -0,0 +1,11 @@
+package bundle
+
+import (
+	"embed"
+)
+
+// Bundle FS will include the tests as well, but since that has negligible impact on the size of the binary,
+// it's preferable to filter them out from the bundle than to e.g. create a separate directory for tests
+//
+//go:embed *
+var Bundle embed.FS

cmd/lint.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -172,14 +171,7 @@ func lint(args []string, params lintCommandParams) (report.Report, error) {
 		}
 	}
 
-	// Create new fs from root of bundle, to avoid having to deal with
-	// "bundle" in paths (i.e. `data.bundle.regal`)
-	bfs, err := fs.Sub(embeds.EmbedBundleFS, "bundle")
-	if err != nil {
-		return report.Report{}, fmt.Errorf("failed reading embedded bundle %w", err)
-	}
-
-	regalRules := rio.MustLoadRegalBundleFS(bfs)
+	regalRules := rio.MustLoadRegalBundleFS(embeds.EmbedBundleFS)
 
 	var regalDir *os.File
 

cmd/test.go

@@ -7,7 +7,6 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"io/fs"
 	"os"
 	"strings"
 	"time"
@@ -131,16 +130,7 @@ func opaTest(args []string) int {
 		return 1
 	}
 
-	// Create new fs from root of bundle, to avoid having to deal with
-	// "bundle" in paths (i.e. `data.bundle.regal`)
-	bfs, err := fs.Sub(embeds.EmbedBundleFS, "bundle")
-	if err != nil {
-		fmt.Fprintln(os.Stderr, fmt.Errorf("failed reading embedded bundle %w", err))
-
-		return 1
-	}
-
-	regalRules := rio.MustLoadRegalBundleFS(bfs)
+	regalRules := rio.MustLoadRegalBundleFS(embeds.EmbedBundleFS)
 
 	if bundles == nil {
 		bundles = make(map[string]*bundle.Bundle)

internal/embeds/embeds.go

@@ -1,9 +1,13 @@
 //nolint:gochecknoglobals
 package embeds
 
-import "embed"
+import (
+	"embed"
 
-var EmbedBundleFS embed.FS
+	"github.com/styrainc/regal/bundle"
+)
+
+var EmbedBundleFS = bundle.Bundle
 
 //go:embed templates
 var EmbedTemplatesFS embed.FS

internal/io/io.go

@@ -94,7 +94,7 @@ func CloseFileIgnore(file *os.File) {
 }
 
 func ExcludeTestFilter() filter.LoaderFilter {
-	return func(abspath string, info files.FileInfo, depth int) bool {
+	return func(_ string, info files.FileInfo, _ int) bool {
 		return strings.HasSuffix(info.Name(), "_test.rego") &&
 			// (anderseknert): This is an outlier, but not sure we need something
 			// more polished to deal with this for the time being.

main.go

@@ -1,30 +1,17 @@
 package main
 
 import (
-	"embed"
 	"log"
 	"os"
 
 	"github.com/styrainc/regal/cmd"
-	"github.com/styrainc/regal/internal/embeds"
 )
 
-// Note: this will bundle the tests as well, but since that has negligible impact on the size of the binary,
-// it's preferable to filter them out from the bundle than to e.g. create a separate directory for tests
-//
-//go:embed all:bundle
-var bundle embed.FS
-
 func main() {
 	// Remove date and time from any `log.*` calls, as that doesn't add much of value here
 	// Evaluate options for logging later..
 	log.SetFlags(0)
 
-	// Embedded files and directories can only traverse down in the tree, i.e. no parent paths,
-	// so while this isn't pretty, we'll use a separate package to carry state from here. If you
-	// know of a better way of doing this, don't hesitate to fix this.
-	embeds.EmbedBundleFS = bundle
-
 	if err := cmd.RootCommand.Execute(); err != nil {
 		os.Exit(1)
 	}