Skip to content

Commit

Permalink
rego-v1: Future-proofing misc tests to be 1.0 compatible
Browse files Browse the repository at this point in the history 
This is the last few tests to be refactored before all tests are compatible with the v1-by-default switch coming in OPA 1.0.

Signed-off-by: Johan Fylling <johan.dev@fylling.se>
  • Loading branch information
@johanfylling
johanfylling authored Sep 26, 2024
1 parent 0385717 commit 27dcd29
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 43 deletions.
16 changes: 8 additions & 8 deletions cmd/eval_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 1 addition & 7 deletions runtime/runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
71 changes: 46 additions & 25 deletions runtime/runtime_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -321,15 +324,17 @@ 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 {
data.foo == "bar"
}`,
},
{
note: "v0.x, rego.v1 imported",
note: "v0, rego.v1 imported",
v0Compatible: true,
policy: `package test
import rego.v1
p contains 1 if {
Expand All @@ -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] {
Expand All @@ -350,15 +355,15 @@ p[1] {
},
},
{
note: "v1.0, keywords not imported",
note: "v1, keywords not imported",
v1Compatible: true,
policy: `package test
p contains 1 if {
data.foo == "bar"
}`,
},
{
note: "v1.0, keywords imported",
note: "v1, keywords imported",
v1Compatible: true,
policy: `package test
import future.keywords
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand All @@ -469,23 +478,25 @@ 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 {
data.foo == "bar"
}`,
},
{
note: "v0.x, rego.v1 imported",
note: "v0, rego.v1 imported",
v0Compatible: true,
policy: `package test
import rego.v1
p contains 1 if {
data.foo == "bar"
}`,
},
{
note: "v1.0, keywords not used",
note: "v1, keywords not used",
v1Compatible: true,
policy: `package test
p[1] {
Expand All @@ -497,15 +508,15 @@ p[1] {
},
},
{
note: "v1.0, keywords not imported",
note: "v1, keywords not imported",
v1Compatible: true,
policy: `package test
p contains 1 if {
data.foo == "bar"
}`,
},
{
note: "v1.0, keywords imported",
note: "v1, keywords imported",
v1Compatible: true,
policy: `package test
import future.keywords
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
}`,
}
Expand All @@ -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"
}`)

Expand Down Expand Up @@ -718,23 +732,24 @@ func TestRuntimeWithAuthzSchemaVerificationTransitive(t *testing.T) {

fs := map[string]string{
"test/authz.rego": `package system.authz
import rego.v1
default allow := false
is_secret := input.identty == "secret"
# 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
}`,
}
Expand Down Expand Up @@ -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 {
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/distributedtracing/distributedtracing_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}`)

Expand Down
3 changes: 2 additions & 1 deletion test/e2e/print/print_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
`,
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/tls/tls_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}`)

Expand Down

0 comments on commit 27dcd29

Please sign in to comment.