v1 build-tag and import for side effects

Makefile

@@ -112,7 +112,7 @@ install: generate
 	$(GO) install $(GO_TAGS) -ldflags $(LDFLAGS)
 
 .PHONY: test
-test: go-test wasm-test
+test: go-test go-test-v0 go-test-v0-import wasm-test
 
 .PHONY: go-build
 go-build: generate
@@ -122,6 +122,14 @@ go-build: generate
 go-test: generate
 	$(GO) test $(GO_TAGS),slow ./...
 
+.PHONY: go-test-v0
+go-test-v0: generate
+	$(GO) test $(GO_TAGS),opa_rego_v0,slow ./...
+
+.PHONY: go-test-v0-import
+go-test-v0-import: generate
+	$(GO) test $(GO_TAGS),test_rego_default_v0_import ./test/rego_default/...
+
 .PHONY: race-detector
 race-detector: generate
 	$(GO) test $(GO_TAGS),slow -race -vet=off ./...

ast/compile.go

@@ -1717,7 +1717,7 @@ func (c *Compiler) checkDuplicateImports() {
 
 	for _, name := range c.sorted {
 		mod := c.Modules[name]
-		if c.strict || mod.regoV1Compatible() {
+		if c.strict || moduleIsRegoV1(mod) {
 			modules = append(modules, mod)
 		}
 	}
@@ -1731,7 +1731,7 @@ func (c *Compiler) checkDuplicateImports() {
 func (c *Compiler) checkKeywordOverrides() {
 	for _, name := range c.sorted {
 		mod := c.Modules[name]
-		if c.strict || mod.regoV1Compatible() {
+		if c.strict || moduleIsRegoV1(mod) {
 			errs := checkRootDocumentOverrides(mod)
 			for _, err := range errs {
 				c.err(err)
@@ -1740,6 +1740,20 @@ func (c *Compiler) checkKeywordOverrides() {
 	}
 }
 
+func moduleIsRegoV1(mod *Module) bool {
+	switch mod.regoVersion {
+	case RegoUndefined:
+		switch DefaultRegoVersion() {
+		case RegoV1, RegoV0CompatV1:
+			return true
+		default:
+			return false
+		}
+	}
+
+	return mod.regoV1Compatible()
+}
+
 // resolveAllRefs resolves references in expressions to their fully qualified values.
 //
 // For instance, given the following module:

ast/parser.go

@@ -17,6 +17,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
+	"github.com/open-policy-agent/opa/internal/rego/version"
 	"gopkg.in/yaml.v3"
 
 	"github.com/open-policy-agent/opa/ast/internal/scanner"
@@ -30,11 +31,10 @@ var RegoV1CompatibleRef = Ref{VarTerm("rego"), StringTerm("v1")}
 // RegoVersion defines the Rego syntax requirements for a module.
 type RegoVersion int
 
-const DefaultRegoVersion = RegoVersion(0)
-
 const (
+	RegoUndefined RegoVersion = iota
 	// RegoV0 is the default, original Rego syntax.
-	RegoV0 RegoVersion = iota
+	RegoV0
 	// RegoV0CompatV1 requires modules to comply with both the RegoV0 and RegoV1 syntax (as when 'rego.v1' is imported in a module).
 	// Shortly, RegoV1 compatibility is required, but 'rego.v1' or 'future.keywords' must also be imported.
 	RegoV0CompatV1
@@ -45,6 +45,10 @@ const (
 	RegoV1
 )
 
+func DefaultRegoVersion() RegoVersion {
+	return RegoVersion(version.DefaultRegoVersion)
+}
+
 func (v RegoVersion) Int() int {
 	if v == RegoV1 {
 		return 1
@@ -156,8 +160,10 @@ type ParserOptions struct {
 }
 
 // EffectiveRegoVersion returns the effective RegoVersion to use for parsing.
-// Deprecated: Use RegoVersion instead.
-func (po *ParserOptions) EffectiveRegoVersion() RegoVersion {
+func (po ParserOptions) EffectiveRegoVersion() RegoVersion {
+	if po.RegoVersion == RegoUndefined {
+		return DefaultRegoVersion()
+	}
 	return po.RegoVersion
 }
 
@@ -314,7 +320,7 @@ func (p *Parser) Parse() ([]Statement, []*Comment, Errors) {
 
 	allowedFutureKeywords := map[string]tokens.Token{}
 
-	if p.po.RegoVersion == RegoV1 {
+	if p.po.EffectiveRegoVersion() == RegoV1 {
 		// RegoV1 includes all future keywords in the default language definition
 		for k, v := range futureKeywords {
 			allowedFutureKeywords[k] = v
@@ -373,7 +379,7 @@ func (p *Parser) Parse() ([]Statement, []*Comment, Errors) {
 	}
 
 	selected := map[string]tokens.Token{}
-	if p.po.AllFutureKeywords || p.po.RegoVersion == RegoV1 {
+	if p.po.AllFutureKeywords || p.po.EffectiveRegoVersion() == RegoV1 {
 		for kw, tok := range allowedFutureKeywords {
 			selected[kw] = tok
 		}
@@ -394,7 +400,7 @@ func (p *Parser) Parse() ([]Statement, []*Comment, Errors) {
 	}
 	p.s.s = p.s.s.WithKeywords(selected)
 
-	if p.po.RegoVersion == RegoV1 {
+	if p.po.EffectiveRegoVersion() == RegoV1 {
 		for kw, tok := range allowedFutureKeywords {
 			p.s.s.AddKeyword(kw, tok)
 		}
@@ -2710,7 +2716,7 @@ func (p *Parser) regoV1Import(imp *Import) {
 		return
 	}
 
-	if p.po.RegoVersion == RegoV1 {
+	if p.po.EffectiveRegoVersion() == RegoV1 {
 		// We're parsing for Rego v1, where the 'rego.v1' import is a no-op.
 		return
 	}

ast/parser_ext.go

@@ -689,7 +689,12 @@ func parseModule(filename string, stmts []Statement, comments []*Comment, regoCo
 
 	// The comments slice only holds comments that were not their own statements.
 	mod.Comments = append(mod.Comments, comments...)
-	mod.regoVersion = regoCompatibilityMode
+
+	if regoCompatibilityMode == RegoUndefined {
+		mod.regoVersion = DefaultRegoVersion()
+	} else {
+		mod.regoVersion = regoCompatibilityMode
+	}
 
 	for i, stmt := range stmts[1:] {
 		switch stmt := stmt.(type) {

ast/policy.go

@@ -100,7 +100,7 @@ var Wildcard = &Term{Value: Var("_")}
 const WildcardPrefix = "$"
 
 // Keywords contains strings that map to language keywords.
-var Keywords = KeywordsForRegoVersion(DefaultRegoVersion)
+var Keywords = KeywordsForRegoVersion(DefaultRegoVersion())
 
 var KeywordsV0 = [...]string{
 	"not",
@@ -791,14 +791,21 @@ type toStringOpts struct {
 	regoVersion RegoVersion
 }
 
+func (o toStringOpts) RegoVersion() RegoVersion {
+	if o.regoVersion == RegoUndefined {
+		return DefaultRegoVersion()
+	}
+	return o.regoVersion
+}
+
 func (rule *Rule) stringWithOpts(opts toStringOpts) string {
 	buf := []string{}
 	if rule.Default {
 		buf = append(buf, "default")
 	}
 	buf = append(buf, rule.Head.stringWithOpts(opts))
 	if !rule.Default {
-		switch opts.regoVersion {
+		switch opts.RegoVersion() {
 		case RegoV1, RegoV0CompatV1:
 			buf = append(buf, "if")
 		}
@@ -861,7 +868,7 @@ func (rule *Rule) elseString(opts toStringOpts) string {
 		buf = append(buf, value.String())
 	}
 
-	switch opts.regoVersion {
+	switch opts.RegoVersion() {
 	case RegoV1, RegoV0CompatV1:
 		buf = append(buf, "if")
 	}
@@ -1043,7 +1050,7 @@ func (head *Head) stringWithOpts(opts toStringOpts) string {
 	case len(head.Args) != 0:
 		buf.WriteString(head.Args.String())
 	case len(head.Reference) == 1 && head.Key != nil:
-		switch opts.regoVersion {
+		switch opts.RegoVersion() {
 		case RegoV0:
 			buf.WriteRune('[')
 			buf.WriteString(head.Key.String())

ast/policy_test.go

@@ -616,7 +616,7 @@ func TestRuleString(t *testing.T) {
 			assertRuleString(t, tc.rule, tc.expV0, toStringOpts{regoVersion: RegoV0})
 			assertRuleString(t, tc.rule, tc.expV1, toStringOpts{regoVersion: RegoV1})
 
-			switch DefaultRegoVersion {
+			switch DefaultRegoVersion() {
 			case RegoV0:
 				assertRuleString(t, tc.rule, tc.expV0, toStringOpts{})
 			case RegoV1:
@@ -863,7 +863,7 @@ import rego.v1
 p := 7 if { true }`
 
 	if module.String() != exp {
-		t.Fatalf("expected %q but got %q", exp, module.String())
+		t.Fatalf("expected:\n\n%q\n\nbut got:\n\n%q", exp, module.String())
 	}
 }
 

bundle/bundle.go

@@ -244,8 +244,8 @@ func (m Manifest) Copy() Manifest {
 func (m Manifest) String() string {
 	m.Init()
 	if m.RegoVersion != nil {
-		return fmt.Sprintf("<revision: %q, rego_version: %d, roots: %v, wasm: %+v, metadata: %+v>",
-			m.Revision, *m.RegoVersion, *m.Roots, m.WasmResolvers, m.Metadata)
+		return fmt.Sprintf("<revision: %q, rego_version: %d, file_rego_versions: %v, roots: %v, wasm: %+v, metadata: %+v>",
+			m.Revision, *m.RegoVersion, m.FileRegoVersions, *m.Roots, m.WasmResolvers, m.Metadata)
 	}
 	return fmt.Sprintf("<revision: %q, roots: %v, wasm: %+v, metadata: %+v>",
 		m.Revision, *m.Roots, m.WasmResolvers, m.Metadata)
@@ -711,10 +711,10 @@ func (r *Reader) Read() (Bundle, error) {
 
 	// Parse modules
 	popts := r.ParserOptions()
-	popts.RegoVersion = bundle.RegoVersion(popts.RegoVersion)
+	popts.RegoVersion = bundle.RegoVersion(popts.EffectiveRegoVersion())
 	for _, mf := range modules {
 		modulePopts := popts
-		if modulePopts.RegoVersion, err = bundle.RegoVersionForFile(mf.RelativePath, popts.RegoVersion); err != nil {
+		if modulePopts.RegoVersion, err = bundle.RegoVersionForFile(mf.RelativePath, popts.EffectiveRegoVersion()); err != nil {
 			return bundle, err
 		}
 		r.metrics.Timer(metrics.RegoModuleParse).Start()
@@ -1203,6 +1203,10 @@ func (b *Bundle) SetRegoVersion(v ast.RegoVersion) {
 // If there is no defined version for the given path, the default version def is returned.
 // If the version does not correspond to ast.RegoV0 or ast.RegoV1, an error is returned.
 func (b *Bundle) RegoVersionForFile(path string, def ast.RegoVersion) (ast.RegoVersion, error) {
+	if def == ast.RegoUndefined {
+		def = ast.DefaultRegoVersion()
+	}
+
 	version, err := b.Manifest.numericRegoVersionForFile(path)
 	if err != nil {
 		return def, err
@@ -1410,6 +1414,10 @@ func MergeWithRegoVersion(bundles []*Bundle, regoVersion ast.RegoVersion, usePat
 		return nil, errors.New("expected at least one bundle")
 	}
 
+	if regoVersion == ast.RegoUndefined {
+		regoVersion = ast.DefaultRegoVersion()
+	}
+
 	if len(bundles) == 1 {
 		result := bundles[0]
 		// We respect the bundle rego-version, defaulting to the provided rego version if not set.

cmd/build.go

@@ -309,7 +309,7 @@ func dobuild(params buildParams, args []string) error {
 		WithPartialNamespace(params.ns).
 		WithFollowSymlinks(params.followSymlinks)
 
-	regoVersion := ast.DefaultRegoVersion
+	regoVersion := ast.DefaultRegoVersion()
 	if params.v0Compatible {
 		// v0 takes precedence over v1
 		regoVersion = ast.RegoV0

cmd/build_test.go

@@ -905,7 +905,7 @@ p2 := 2
 				tr := tar.NewReader(gr)
 
 				expManifest := strings.ReplaceAll(tc.manifest, "%REGO_VERSION%",
-					fmt.Sprintf("%d", ast.DefaultRegoVersion.Int()))
+					fmt.Sprintf("%d", ast.DefaultRegoVersion().Int()))
 
 				found := false
 				for {
@@ -1712,7 +1712,7 @@ q contains 1 if {
 								}
 								expVal = strings.ReplaceAll(expVal, "%ROOT%", root)
 								expVal = strings.ReplaceAll(expVal, "%DEFAULT_REGO_VERSION%",
-									fmt.Sprintf("%d", ast.DefaultRegoVersion.Int()))
+									fmt.Sprintf("%d", ast.DefaultRegoVersion().Int()))
 								if string(b) != expVal {
 									t.Fatalf("expected %v:\n\n%v\n\nbut got:\n\n%v", expName, expVal, string(b))
 								}

cmd/check.go

@@ -54,7 +54,7 @@ func (p *checkParams) regoVersion() ast.RegoVersion {
 	if p.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 const (

cmd/deps.go

@@ -38,7 +38,7 @@ func (p *depsCommandParams) regoVersion() ast.RegoVersion {
 	if p.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 const (

cmd/eval.go

@@ -83,7 +83,7 @@ func (p *evalCommandParams) regoVersion() ast.RegoVersion {
 	} else if p.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 func newEvalCommandParams() evalCommandParams {

cmd/fmt.go

@@ -45,7 +45,7 @@ func (p *fmtCommandParams) regoVersion() ast.RegoVersion {
 	if p.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 var formatCommand = &cobra.Command{

cmd/oracle.go

@@ -37,7 +37,7 @@ func (p *findDefinitionParams) regoVersion() ast.RegoVersion {
 	if p.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 func init() {

cmd/parse.go

@@ -41,7 +41,7 @@ func (p *parseParams) regoVersion() ast.RegoVersion {
 	if p.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 var configuredParseParams = parseParams{

cmd/refactor.go

@@ -37,7 +37,7 @@ func (m *moveCommandParams) regoVersion() ast.RegoVersion {
 	if m.v1Compatible {
 		return ast.RegoV1
 	}
-	return ast.DefaultRegoVersion
+	return ast.DefaultRegoVersion()
 }
 
 func init() {
@@ -149,7 +149,7 @@ func doMove(params moveCommandParams, args []string, out io.Writer) error {
 			return err
 		}
 
-		formatted, err := format.Ast(mod)
+		formatted, err := format.AstWithOpts(mod, format.Opts{RegoVersion: params.regoVersion()})
 		if err != nil {
 			return newError("failed to parse Rego source file: %v", err)
 		}

cmd/refactor_test.go

@@ -107,7 +107,12 @@ func TestDoMoveRenamePackage(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				formatted := format.MustAst(tc.expected)
+				var formatted []byte
+				if tc.v0Compatible {
+					formatted = format.MustAstWithOpts(tc.expected, format.Opts{RegoVersion: ast.RegoV0})
+				} else {
+					formatted = format.MustAstWithOpts(tc.expected, format.Opts{RegoVersion: ast.RegoV1})
+				}
 
 				if !reflect.DeepEqual(formatted, buf.Bytes()) {
 					t.Fatalf("Expected module:\n%v\n\nGot:\n%v\n", string(formatted), buf.String())
@@ -227,7 +232,12 @@ func TestDoMoveOverwriteFile(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				actual := ast.MustParseModule(string(data))
+				var actual *ast.Module
+				if tc.v0Compatible {
+					actual = ast.MustParseModuleWithOpts(string(data), ast.ParserOptions{RegoVersion: ast.RegoV0})
+				} else {
+					actual = ast.MustParseModuleWithOpts(string(data), ast.ParserOptions{RegoVersion: ast.RegoV1})
+				}
 
 				if !tc.expected.Equal(actual) {
 					t.Fatalf("Expected module:\n%v\n\nGot:\n%v\n", tc.expected, actual)