diff --git a/cmd/eval_test.go b/cmd/eval_test.go index b6efce8d5d..d942f9c4cc 100755 --- a/cmd/eval_test.go +++ b/cmd/eval_test.go @@ -2050,12 +2050,12 @@ func TestPolicyWithStrictFlag(t *testing.T) { { note: "strict mode should error on duplicate imports", policy: `package x - import future.keywords.if - import future.keywords.if - foo = 2`, + import data.bar + import data.bar + foo = bar`, query: "data.foo", expectedCode: "rego_compile_error", - expectedMessage: "import must not shadow import future.keywords.if", + expectedMessage: "import must not shadow import data.bar", }, { note: "strict mode should error on unused imports", @@ -2164,12 +2164,12 @@ func TestBundleWithStrictFlag(t *testing.T) { { note: "strict mode should error on duplicate imports in this bundle", policy: `package x - import future.keywords.if - import future.keywords.if - foo = 2`, + import data.bar + import data.bar + foo = bar`, query: "data.foo", expectedCode: "rego_compile_error", - expectedMessage: "import must not shadow import future.keywords.if", + expectedMessage: "import must not shadow import data.bar", }, { note: "strict mode should error on unused imports in this bundle", diff --git a/runtime/runtime.go b/runtime/runtime.go index 9b7ff6a06a..9f218c87e6 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -355,13 +355,7 @@ func NewRuntime(ctx context.Context, params Params) (*Runtime, error) { } } - regoVersion := ast.DefaultRegoVersion - if params.V0Compatible { - // v0 takes precedence over v1 - regoVersion = ast.RegoV0 - } else if params.V1Compatible { - regoVersion = ast.RegoV1 - } + regoVersion := params.regoVersion() loaded, err := initload.LoadPathsForRegoVersion(regoVersion, params.Paths, params.Filter, params.BundleMode, params.BundleVerificationConfig, params.SkipBundleVerification, false, false, nil, nil) if err != nil { diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go index f2e21f64c1..44e6c034bb 100644 --- a/runtime/runtime_test.go +++ b/runtime/runtime_test.go @@ -297,20 +297,23 @@ func TestRuntimeReplWithBundleBuiltWithV1Compatibility(t *testing.T) { func TestRuntimeReplProcessWatchV1Compatible(t *testing.T) { tests := []struct { note string + v0Compatible bool v1Compatible bool policy string expErrs []string expOutput string }{ { - note: "v0.x, keywords not used", + note: "v0, keywords not used", + v0Compatible: true, policy: `package test p[1] { data.foo == "bar" }`, }, { - note: "v0.x, keywords not imported", + note: "v0, keywords not imported", + v0Compatible: true, policy: `package test p contains 1 if { data.foo == "bar" @@ -321,7 +324,8 @@ p contains 1 if { }, }, { - note: "v0.x, keywords imported", + note: "v0, keywords imported", + v0Compatible: true, policy: `package test import future.keywords p contains 1 if { @@ -329,7 +333,8 @@ p contains 1 if { }`, }, { - note: "v0.x, rego.v1 imported", + note: "v0, rego.v1 imported", + v0Compatible: true, policy: `package test import rego.v1 p contains 1 if { @@ -338,7 +343,7 @@ p contains 1 if { }, { - note: "v1.0, keywords not used", + note: "v1, keywords not used", v1Compatible: true, policy: `package test p[1] { @@ -350,7 +355,7 @@ p[1] { }, }, { - note: "v1.0, keywords not imported", + note: "v1, keywords not imported", v1Compatible: true, policy: `package test p contains 1 if { @@ -358,7 +363,7 @@ p contains 1 if { }`, }, { - note: "v1.0, keywords imported", + note: "v1, keywords imported", v1Compatible: true, policy: `package test import future.keywords @@ -367,7 +372,7 @@ p contains 1 if { }`, }, { - note: "v1.0, rego.v1 imported", + note: "v1, rego.v1 imported", v1Compatible: true, policy: `package test import rego.v1 @@ -398,6 +403,7 @@ p contains 1 if { params.Output = &output params.Paths = []string{rootDir} params.Watch = true + params.V0Compatible = tc.v0Compatible params.V1Compatible = tc.v1Compatible rt, err := NewRuntime(ctx, params) @@ -445,20 +451,23 @@ p contains 1 if { func TestRuntimeServerProcessWatchV1Compatible(t *testing.T) { tests := []struct { note string + v0Compatible bool v1Compatible bool policy string expErrs []string expOutput string }{ { - note: "v0.x, keywords not used", + note: "v0, keywords not used", + v0Compatible: true, policy: `package test p[1] { data.foo == "bar" }`, }, { - note: "v0.x, keywords not imported", + note: "v0, keywords not imported", + v0Compatible: true, policy: `package test p contains 1 if { data.foo == "bar" @@ -469,7 +478,8 @@ p contains 1 if { }, }, { - note: "v0.x, keywords imported", + note: "v0, keywords imported", + v0Compatible: true, policy: `package test import future.keywords p contains 1 if { @@ -477,7 +487,8 @@ p contains 1 if { }`, }, { - note: "v0.x, rego.v1 imported", + note: "v0, rego.v1 imported", + v0Compatible: true, policy: `package test import rego.v1 p contains 1 if { @@ -485,7 +496,7 @@ p contains 1 if { }`, }, { - note: "v1.0, keywords not used", + note: "v1, keywords not used", v1Compatible: true, policy: `package test p[1] { @@ -497,7 +508,7 @@ p[1] { }, }, { - note: "v1.0, keywords not imported", + note: "v1, keywords not imported", v1Compatible: true, policy: `package test p contains 1 if { @@ -505,7 +516,7 @@ p contains 1 if { }`, }, { - note: "v1.0, keywords imported", + note: "v1, keywords imported", v1Compatible: true, policy: `package test import future.keywords @@ -514,7 +525,7 @@ p contains 1 if { }`, }, { - note: "v1.0, rego.v1 imported", + note: "v1, rego.v1 imported", v1Compatible: true, policy: `package test import rego.v1 @@ -547,6 +558,7 @@ p contains 1 if { params.AddrSetByUser = true params.Paths = []string{rootDir} params.Watch = true + params.V0Compatible = tc.v0Compatible params.V1Compatible = tc.v1Compatible rt, err := NewRuntime(ctx, params) @@ -663,10 +675,11 @@ func TestRuntimeWithAuthzSchemaVerification(t *testing.T) { fs := map[string]string{ "test/authz.rego": `package system.authz + import rego.v1 default allow := false - allow { + allow if { input.identity = "foo" }`, } @@ -684,10 +697,11 @@ func TestRuntimeWithAuthzSchemaVerification(t *testing.T) { } badModule := []byte(`package system.authz + import rego.v1 default allow := false - allow { + allow if { input.identty = "foo" }`) @@ -718,6 +732,7 @@ func TestRuntimeWithAuthzSchemaVerificationTransitive(t *testing.T) { fs := map[string]string{ "test/authz.rego": `package system.authz + import rego.v1 default allow := false @@ -725,16 +740,16 @@ func TestRuntimeWithAuthzSchemaVerificationTransitive(t *testing.T) { # even though "is_secret" is called via 2 paths, there should be only one resulting error # 1-step dependency - allow { + allow if { is_secret } # 2-step dependency - allow { + allow if { allow2 } - allow2 { + allow2 if { is_secret }`, } @@ -825,12 +840,14 @@ func TestServerInitialized(t *testing.T) { func TestServerInitializedWithRegoV1(t *testing.T) { tests := []struct { note string + v0Compatible bool v1Compatible bool files map[string]string expErr string }{ { - note: "Rego v0, keywords not imported", + note: "Rego v0, keywords not imported", + v0Compatible: true, files: map[string]string{ "policy.rego": `package test p if { @@ -841,7 +858,8 @@ func TestServerInitializedWithRegoV1(t *testing.T) { expErr: "rego_parse_error: var cannot be used for rule name", }, { - note: "Rego v0, rego.v1 imported", + note: "Rego v0, rego.v1 imported", + v0Compatible: true, files: map[string]string{ "policy.rego": `package test import rego.v1 @@ -852,7 +870,8 @@ func TestServerInitializedWithRegoV1(t *testing.T) { }, }, { - note: "Rego v0, future.keywords imported", + note: "Rego v0, future.keywords imported", + v0Compatible: true, files: map[string]string{ "policy.rego": `package test import future.keywords.if @@ -863,7 +882,8 @@ func TestServerInitializedWithRegoV1(t *testing.T) { }, }, { - note: "Rego v0, no keywords used", + note: "Rego v0, no keywords used", + v0Compatible: true, files: map[string]string{ "policy.rego": `package test p { @@ -938,6 +958,7 @@ func TestServerInitializedWithRegoV1(t *testing.T) { params.Addrs = &[]string{"localhost:0"} params.GracefulShutdownPeriod = 1 params.Logger = logging.NewNoOpLogger() + params.V0Compatible = tc.v0Compatible params.V1Compatible = tc.v1Compatible rt, err := NewRuntime(ctx, params) diff --git a/test/e2e/distributedtracing/distributedtracing_test.go b/test/e2e/distributedtracing/distributedtracing_test.go index a671bc2f06..294db43c6e 100644 --- a/test/e2e/distributedtracing/distributedtracing_test.go +++ b/test/e2e/distributedtracing/distributedtracing_test.go @@ -592,8 +592,9 @@ func TestServerSpanWithSystemAuthzPolicy(t *testing.T) { ) authzPolicy := []byte(`package system.authz +import rego.v1 default allow = false -allow { +allow if { input.path = ["health"] }`) diff --git a/test/e2e/print/print_test.go b/test/e2e/print/print_test.go index c6598e87d5..3973b40846 100644 --- a/test/e2e/print/print_test.go +++ b/test/e2e/print/print_test.go @@ -16,8 +16,9 @@ func TestEnablePrintStatementsForFilesystemPolicies(t *testing.T) { files := map[string]string{ "/test.rego": ` package test + import rego.v1 - p { + p if { print("hello world") } `, diff --git a/test/e2e/tls/tls_test.go b/test/e2e/tls/tls_test.go index 80b8bd77ef..6cd6609f09 100644 --- a/test/e2e/tls/tls_test.go +++ b/test/e2e/tls/tls_test.go @@ -56,9 +56,10 @@ func TestMain(m *testing.M) { // We need the policy to be present already, otherwise authorization // for the health endpoint is going to fail on server startup. authzPolicy := []byte(`package system.authz +import rego.v1 import input.identity default allow = false -allow { +allow if { identity = "CN=my-client" }`)