When creating a new Rego object, bundles are not allocated. This will…

… cause an error when passing ParsedBundle option. This change initializes bundles at the beginning.

Signed-off-by: Xin Jin <xin@styra.com>

rego/rego.go

@@ -840,6 +840,7 @@ func New(options ...func(r *Rego)) *Rego {
 		compiledQueries: map[queryType]compiledQuery{},
 		builtinDecls:    map[string]*ast.Builtin{},
 		builtinFuncs:    map[string]*topdown.Builtin{},
+		bundles:         map[string]*bundle.Bundle{},
 	}
 
 	for _, option := range options {
@@ -877,10 +878,6 @@ func New(options ...func(r *Rego)) *Rego {
 		r.partialNamespace = defaultPartialNamespace
 	}
 
-	if r.bundles == nil {
-		r.bundles = map[string]*bundle.Bundle{}
-	}
-
 	return r
 }
 

rego/rego_test.go

@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/open-policy-agent/opa/ast"
+	"github.com/open-policy-agent/opa/bundle"
 	"github.com/open-policy-agent/opa/internal/storage/mock"
 	"github.com/open-policy-agent/opa/metrics"
 	"github.com/open-policy-agent/opa/storage"
@@ -1011,6 +1012,35 @@ func TestMissingLocation(t *testing.T) {
 	}
 }
 
+func TestBundlePassing(t *testing.T) {
+
+	opaBundle := bundle.Bundle{
+		Modules: []bundle.ModuleFile{
+			{
+				Path: "policy.rego",
+				Parsed: ast.MustParseModule(`package foo
+                         allow = true`),
+				Raw: []byte(`package foo
+                         allow = true`),
+			},
+		},
+		Manifest: bundle.Manifest{Revision: "test", Roots: &[]string{"/"}},
+	}
+
+	// Pass a bundle
+	r := New(
+		ParsedBundle("123", &opaBundle),
+		Query("x = data.foo.allow"),
+	)
+
+	res, err := r.Eval(context.Background())
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	assertResultSet(t, res, `[[true]]`)
+}
+
 func TestModulePassing(t *testing.T) {
 
 	// This module will not be loaded since it has the same filename as the