diff --git a/compile/compile.go b/compile/compile.go index 1e8b99ae8a..8114ada6e3 100644 --- a/compile/compile.go +++ b/compile/compile.go @@ -20,11 +20,11 @@ import ( "github.com/open-policy-agent/opa/bundle" "github.com/open-policy-agent/opa/internal/compiler/wasm" "github.com/open-policy-agent/opa/internal/debug" - "github.com/open-policy-agent/opa/internal/ir" "github.com/open-policy-agent/opa/internal/planner" "github.com/open-policy-agent/opa/internal/ref" initload "github.com/open-policy-agent/opa/internal/runtime/init" "github.com/open-policy-agent/opa/internal/wasm/encoding" + "github.com/open-policy-agent/opa/ir" "github.com/open-policy-agent/opa/loader" "github.com/open-policy-agent/opa/rego" "github.com/open-policy-agent/opa/storage" diff --git a/compile/compile_test.go b/compile/compile_test.go index 1262c64b18..221a4b6997 100644 --- a/compile/compile_test.go +++ b/compile/compile_test.go @@ -16,8 +16,8 @@ import ( "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/bundle" "github.com/open-policy-agent/opa/format" - "github.com/open-policy-agent/opa/internal/ir" "github.com/open-policy-agent/opa/internal/ref" + "github.com/open-policy-agent/opa/ir" "github.com/open-policy-agent/opa/loader" "github.com/open-policy-agent/opa/util" "github.com/open-policy-agent/opa/util/test" diff --git a/internal/compiler/wasm/wasm.go b/internal/compiler/wasm/wasm.go index 21fe41358e..5a7b38131e 100644 --- a/internal/compiler/wasm/wasm.go +++ b/internal/compiler/wasm/wasm.go @@ -15,12 +15,12 @@ import ( "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/internal/compiler/wasm/opa" "github.com/open-policy-agent/opa/internal/debug" - "github.com/open-policy-agent/opa/internal/ir" "github.com/open-policy-agent/opa/internal/wasm/encoding" "github.com/open-policy-agent/opa/internal/wasm/instruction" "github.com/open-policy-agent/opa/internal/wasm/module" "github.com/open-policy-agent/opa/internal/wasm/types" "github.com/open-policy-agent/opa/internal/wasm/util" + "github.com/open-policy-agent/opa/ir" opatypes "github.com/open-policy-agent/opa/types" ) diff --git a/internal/planner/planner.go b/internal/planner/planner.go index 4b19a0b312..62e2b4c37b 100644 --- a/internal/planner/planner.go +++ b/internal/planner/planner.go @@ -14,7 +14,7 @@ import ( "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/ast/location" "github.com/open-policy-agent/opa/internal/debug" - "github.com/open-policy-agent/opa/internal/ir" + "github.com/open-policy-agent/opa/ir" ) // QuerySet represents the input to the planner. @@ -2133,11 +2133,11 @@ func rewrittenVar(vars map[ast.Var]ast.Var, k ast.Var) ast.Var { // allow for optimization using CallDynamicStmt. // // It's possible if all of these conditions hold: -// - all vars in ref have been seen -// - all ground terms (strings) match some child key on their respective -// layer of the ruletrie -// - there are no child trees left (only rulesets) if we're done checking -// ref +// - all vars in ref have been seen +// - all ground terms (strings) match some child key on their respective +// layer of the ruletrie +// - there are no child trees left (only rulesets) if we're done checking +// ref // // The last condition is necessary because we don't deal with _which key a // var actually matched_ -- so we don't know which subtree to evaluate diff --git a/internal/planner/planner_test.go b/internal/planner/planner_test.go index c633098ed1..bd488972cf 100644 --- a/internal/planner/planner_test.go +++ b/internal/planner/planner_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/open-policy-agent/opa/ast" - "github.com/open-policy-agent/opa/internal/ir" + "github.com/open-policy-agent/opa/ir" ) func TestPlannerHelloWorld(t *testing.T) { @@ -386,7 +386,9 @@ func (*cmpWalker) Before(interface{}) {} func (*cmpWalker) After(interface{}) {} // Visit takes, for example, -// *ir.MakeNullStmt{Location: ir.Location{Index:0, Col:1, Row:1}}, +// +// *ir.MakeNullStmt{Location: ir.Location{Index:0, Col:1, Row:1}}, +// // and for the first MakeNullStmt it finds, extracts its location, // and compares it to the one passed was needle. Other fields of the // struct, such as Target for ir.MakeNullStmt, are ignored. diff --git a/internal/planner/varstack.go b/internal/planner/varstack.go index 6701c516ef..dccff1b5c1 100644 --- a/internal/planner/varstack.go +++ b/internal/planner/varstack.go @@ -6,7 +6,7 @@ package planner import ( "github.com/open-policy-agent/opa/ast" - "github.com/open-policy-agent/opa/internal/ir" + "github.com/open-policy-agent/opa/ir" ) type varstack []map[ast.Var]ir.Local diff --git a/internal/planner/varstack_test.go b/internal/planner/varstack_test.go index e342065645..5a56b28670 100644 --- a/internal/planner/varstack_test.go +++ b/internal/planner/varstack_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/open-policy-agent/opa/ast" - "github.com/open-policy-agent/opa/internal/ir" + "github.com/open-policy-agent/opa/ir" ) func TestVarStackPushPop(t *testing.T) { diff --git a/internal/ir/encoding/encoding_test.go b/ir/encoding/encoding_test.go similarity index 95% rename from internal/ir/encoding/encoding_test.go rename to ir/encoding/encoding_test.go index c0082a26df..a14e42fb40 100644 --- a/internal/ir/encoding/encoding_test.go +++ b/ir/encoding/encoding_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/open-policy-agent/opa/ast" - "github.com/open-policy-agent/opa/internal/ir" "github.com/open-policy-agent/opa/internal/planner" + "github.com/open-policy-agent/opa/ir" ) func TestRoundTrip(t *testing.T) { diff --git a/internal/ir/ir.go b/ir/ir.go similarity index 100% rename from internal/ir/ir.go rename to ir/ir.go diff --git a/internal/ir/marshal.go b/ir/marshal.go similarity index 96% rename from internal/ir/marshal.go rename to ir/marshal.go index aecc9f9642..69f4b5caf6 100644 --- a/internal/ir/marshal.go +++ b/ir/marshal.go @@ -1,3 +1,7 @@ +// Copyright 2022 The OPA Authors. All rights reserved. +// Use of this source code is governed by an Apache2 +// license that can be found in the LICENSE file. + package ir import ( diff --git a/internal/ir/pretty.go b/ir/pretty.go similarity index 100% rename from internal/ir/pretty.go rename to ir/pretty.go diff --git a/internal/ir/walk.go b/ir/walk.go similarity index 100% rename from internal/ir/walk.go rename to ir/walk.go diff --git a/rego/rego.go b/rego/rego.go index fc118a1de5..fb47618c7a 100644 --- a/rego/rego.go +++ b/rego/rego.go @@ -19,10 +19,10 @@ import ( bundleUtils "github.com/open-policy-agent/opa/internal/bundle" "github.com/open-policy-agent/opa/internal/compiler/wasm" "github.com/open-policy-agent/opa/internal/future" - "github.com/open-policy-agent/opa/internal/ir" "github.com/open-policy-agent/opa/internal/planner" "github.com/open-policy-agent/opa/internal/rego/opa" "github.com/open-policy-agent/opa/internal/wasm/encoding" + "github.com/open-policy-agent/opa/ir" "github.com/open-policy-agent/opa/loader" "github.com/open-policy-agent/opa/metrics" "github.com/open-policy-agent/opa/resolver"