From 9ed0bde57d114a31efa31484cf088b679c866d1c Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Mon, 17 Oct 2022 11:32:00 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20easier=20configuration=20for=20the?= =?UTF-8?q?=20compiler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 4 ++-- policy/executor/executor.go | 2 +- policy/executor/executor_test.go | 2 +- policy/executor/graph.go | 2 +- policy/executor/mustcompile.go | 2 +- policy/mquery.go | 3 +-- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f3656cd6..758bcb4f 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c github.com/spf13/viper v1.13.0 github.com/stretchr/testify v1.8.0 - go.mondoo.com/cnquery v0.0.0-20221016203430-4b6d2815157f + go.mondoo.com/cnquery v0.0.0-20221017082813-a5bce55f0560 go.mondoo.com/ranger-rpc v0.5.1-0.20220923135836-9e7732899d34 go.opentelemetry.io/otel v1.11.0 golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 diff --git a/go.sum b/go.sum index 6b1572de..89d8d277 100644 --- a/go.sum +++ b/go.sum @@ -1566,8 +1566,8 @@ go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6y go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.mondoo.com/cnquery v0.0.0-20221016203430-4b6d2815157f h1:1ZIFCJcWuc0w2h/d5n4Gym04PjjD3cp2f9QNBTUi76Q= -go.mondoo.com/cnquery v0.0.0-20221016203430-4b6d2815157f/go.mod h1:E7+94D2X1SMG2Gc7HL5P6FONssPF9i0cXlK9Vr5e+G4= +go.mondoo.com/cnquery v0.0.0-20221017082813-a5bce55f0560 h1:3x5ybu3N0OIJSgjLEfXgo4+dtdH5huRATpZBDFnHJr8= +go.mondoo.com/cnquery v0.0.0-20221017082813-a5bce55f0560/go.mod h1:E7+94D2X1SMG2Gc7HL5P6FONssPF9i0cXlK9Vr5e+G4= go.mondoo.com/ranger-rpc v0.5.1-0.20220923135836-9e7732899d34 h1:mtPZ1J+nRI/ivV+n41bjIwY6Rfxb2Jf49svZSQMGHIA= go.mondoo.com/ranger-rpc v0.5.1-0.20220923135836-9e7732899d34/go.mod h1:3YKcqFrlPgaB4FZ4EoLgdmRtwMQdO7RoAkZYFn+F1eY= go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= diff --git a/policy/executor/executor.go b/policy/executor/executor.go index d9af6609..aff85ac4 100644 --- a/policy/executor/executor.go +++ b/policy/executor/executor.go @@ -203,7 +203,7 @@ func (e *Executor) AreAllResultsCollected() bool { // Compile a given code with the default schema func (e *Executor) Compile(code string, props map[string]*llx.Primitive) (*llx.CodeBundle, error) { - return mqlc.Compile(code, e.schema, cnquery.Features{byte(cnquery.PiperCode)}, props) + return mqlc.Compile(code, props, mqlc.NewConfig(e.schema, cnquery.DefaultFeatures)) } func (e *Executor) AddCode(code string, props map[string]*llx.Primitive) (*llx.CodeBundle, error) { diff --git a/policy/executor/executor_test.go b/policy/executor/executor_test.go index 67fdbae1..e2278db1 100644 --- a/policy/executor/executor_test.go +++ b/policy/executor/executor_test.go @@ -98,7 +98,7 @@ func runTest(t *testing.T, code string, expected map[string]value, callers ...fu received[res.CodeID]++ }) - codeBundle, err := mqlc.Compile(code, resource_pack.Registry.Schema(), cnquery.Features{byte(cnquery.PiperCode)}, nil) + codeBundle, err := mqlc.Compile(code, nil, mqlc.NewConfig(resource_pack.Registry.Schema(), cnquery.DefaultFeatures)) require.NoError(t, err) executor.AddCodeBundle(codeBundle, nil) diff --git a/policy/executor/graph.go b/policy/executor/graph.go index 539bb0a0..2e6c8edc 100644 --- a/policy/executor/graph.go +++ b/policy/executor/graph.go @@ -46,7 +46,7 @@ func ExecuteFilterQueries(schema *resources.Schema, runtime *resources.Runtime, builder := internal.NewBuilder() for _, m := range queries { - codeBundle, err := mqlc.Compile(m.Query, schema, cnquery.Features{}, nil) + codeBundle, err := mqlc.Compile(m.Query, nil, mqlc.NewConfig(schema, cnquery.DefaultFeatures)) if err != nil { errs = append(errs, err) continue diff --git a/policy/executor/mustcompile.go b/policy/executor/mustcompile.go index b859675f..93eb4c12 100644 --- a/policy/executor/mustcompile.go +++ b/policy/executor/mustcompile.go @@ -8,7 +8,7 @@ import ( ) func MustCompile(code string) *llx.CodeBundle { - codeBundle, err := mqlc.Compile(code, info.Registry.Schema(), cnquery.DefaultFeatures, nil) + codeBundle, err := mqlc.Compile(code, nil, mqlc.NewConfig(info.Registry.Schema(), cnquery.DefaultFeatures)) if err != nil { panic(err) } diff --git a/policy/mquery.go b/policy/mquery.go index 9ad06a15..6d90e63e 100644 --- a/policy/mquery.go +++ b/policy/mquery.go @@ -24,8 +24,7 @@ func (m *Mquery) Compile(props map[string]*llx.Primitive) (*llx.CodeBundle, erro schema := info.Registry.Schema() - v2Code, err := mqlc.Compile(m.Query, schema, - cnquery.Features{byte(cnquery.PiperCode)}, props) + v2Code, err := mqlc.Compile(m.Query, props, mqlc.NewConfig(schema, cnquery.DefaultFeatures)) if err != nil { return nil, err }