From 88f25f09689da7103161591646b095f595040c1c Mon Sep 17 00:00:00 2001 From: Manuel Weber Date: Fri, 1 Nov 2024 23:48:19 +0100 Subject: [PATCH] add/linter: queryMqlMissing -> fixed????++ Signed-off-by: Manuel Weber --- internal/bundle/lint.go | 3 ++- internal/bundle/lint_test.go | 2 +- internal/bundle/testdata/missing-mql-variants.mql.yaml | 7 ++----- internal/bundle/testdata/missing-mql.mql.yaml | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/internal/bundle/lint.go b/internal/bundle/lint.go index 2de27c37..4f6287c2 100644 --- a/internal/bundle/lint.go +++ b/internal/bundle/lint.go @@ -589,7 +589,8 @@ func lintQuery(query *Mquery, file string, globalQueriesUids map[string]int, ass } } - if query.Mql == "// not implemented yet" { + reNotImplemented := regexp.MustCompile(`\/\/\snot\simplemented\syet`) + if reNotImplemented.MatchString(query.Mql) { res.Entries = append(res.Entries, Entry{ RuleID: queryMqlMissing, Message: fmt.Sprintf("query %s does not define a mql field", uid), diff --git a/internal/bundle/lint_test.go b/internal/bundle/lint_test.go index abc911aa..acbcb1e7 100644 --- a/internal/bundle/lint_test.go +++ b/internal/bundle/lint_test.go @@ -106,7 +106,7 @@ func TestLintFail_MissingMQLVariant(t *testing.T) { require.NoError(t, err) assert.Equal(t, 1, len(results.BundleLocations)) - assert.Equal(t, 2, len(results.Entries)) + assert.Equal(t, 1, len(results.Entries)) assert.True(t, results.HasError()) entry := results.Entries[0] diff --git a/internal/bundle/testdata/missing-mql-variants.mql.yaml b/internal/bundle/testdata/missing-mql-variants.mql.yaml index 8334a1dd..52853641 100644 --- a/internal/bundle/testdata/missing-mql-variants.mql.yaml +++ b/internal/bundle/testdata/missing-mql-variants.mql.yaml @@ -19,9 +19,6 @@ queries: title: Missing MQL 1 variants: - uid: mql-missing--foo - - uid: mql-missing--bar - - uid: mql-missing--foo - mql: "// not implemented yet" - - uid: mql-missing--bar - mql: "// not implemented yet" \ No newline at end of file + mql: | + // not implemented yet diff --git a/internal/bundle/testdata/missing-mql.mql.yaml b/internal/bundle/testdata/missing-mql.mql.yaml index 2a29e284..fa59b4e1 100644 --- a/internal/bundle/testdata/missing-mql.mql.yaml +++ b/internal/bundle/testdata/missing-mql.mql.yaml @@ -17,4 +17,4 @@ policies: queries: - uid: mql-missing--1.1 title: Missing MQL 1 - mql: "// not implemented yet" + mql: // not implemented yet