🧹 enable bool assertions by default (#124)

policy/executor/graph.go

@@ -25,7 +25,6 @@ func ExecuteResolvedPolicy(schema *resources.Schema, runtime *resources.Runtime,
 	builder := builderFromResolvedPolicy(resolvedPolicy)
 	builder.AddDatapointCollector(collector)
 	builder.AddScoreCollector(collector)
-	builder.WithFeatureBoolAssertions(features.IsActive(cnquery.BoolAssertions))
 	if progressFn != nil {
 		builder.WithProgressReporter(progressFn)
 	}
@@ -95,7 +94,6 @@ func ExecuteFilterQueries(schema *resources.Schema, runtime *resources.Runtime,
 
 func ExecuteQuery(schema *resources.Schema, runtime *resources.Runtime, codeBundle *llx.CodeBundle, props map[string]*llx.Primitive, features cnquery.Features) (*policy.Score, map[string]*llx.RawResult, error) {
 	builder := internal.NewBuilder()
-	builder.WithFeatureBoolAssertions(features.IsActive(cnquery.BoolAssertions))
 
 	builder.AddQuery(codeBundle, nil, props)
 	for _, checksum := range internal.CodepointChecksums(codeBundle) {

policy/executor/internal/builder.go

@@ -51,8 +51,6 @@ type GraphBuilder struct {
 	// queryTimeout is the amount of time to wait for the underlying lumi
 	// runtime to send all the expected datapoints.
 	queryTimeout time.Duration
-
-	featureBoolAssertions bool
 }
 
 func NewBuilder() *GraphBuilder {
@@ -133,10 +131,6 @@ func (b *GraphBuilder) WithQueryTimeout(timeout time.Duration) {
 	b.queryTimeout = timeout
 }
 
-func (b *GraphBuilder) WithFeatureBoolAssertions(featureBoolAssertions bool) {
-	b.featureBoolAssertions = featureBoolAssertions
-}
-
 func (b *GraphBuilder) Build(schema *resources.Schema, runtime *resources.Runtime, assetMrn string) (*GraphExecutor, error) {
 	resultChan := make(chan *llx.RawResult, 128)
 
@@ -192,7 +186,7 @@ func (b *GraphBuilder) Build(schema *resources.Schema, runtime *resources.Runtim
 		} else {
 			unrunnableQueries = append(unrunnableQueries, q)
 		}
-		ge.addReportingQueryNode(queryID, q, b.featureBoolAssertions)
+		ge.addReportingQueryNode(queryID, q)
 	}
 
 	scoresToCollect := make([]string, len(b.collectScoreQrIDs))
@@ -350,16 +344,15 @@ func (ge *GraphExecutor) addExecutionQueryNode(queryID string, q query, resolved
 	ge.nodes[n.id] = n
 }
 
-func (ge *GraphExecutor) addReportingQueryNode(queryID string, q query, featureBoolAssertions bool) {
+func (ge *GraphExecutor) addReportingQueryNode(queryID string, q query) {
 	n, ok := ge.nodes[NodeID(queryID)]
 	if ok {
 		return
 	}
 
 	nodeData := &ReportingQueryNodeData{
-		results:               map[string]*DataResult{},
-		queryID:               queryID,
-		featureBoolAssertions: featureBoolAssertions,
+		results: map[string]*DataResult{},
+		queryID: queryID,
 	}
 
 	n = &Node{

policy/executor/internal/nodes.go

@@ -251,8 +251,7 @@ func (nodeData *DatapointNodeData) recalculate() *envelope {
 
 // ReportingQueryNodeData is the data for queries of type ReportingQueryNodeType.
 type ReportingQueryNodeData struct {
-	featureBoolAssertions bool
-	queryID               string
+	queryID string
 
 	results     map[string]*DataResult
 	invalidated bool
@@ -338,19 +337,12 @@ func (nodeData *ReportingQueryNodeData) score() *policy.Score {
 			continue
 		}
 
-		if nodeData.featureBoolAssertions {
-			success, valid := cur.Data.IsSuccess()
-			if !success && valid {
-				allTrue = false
-			}
-			if valid {
-				allSkipped = false
-			}
-		} else {
+		success, valid := cur.Data.IsSuccess()
+		if !success && valid {
+			allTrue = false
+		}
+		if valid {
 			allSkipped = false
-			if truthy, _ := cur.Data.IsTruthy(); !truthy {
-				allTrue = false
-			}
 		}
 	}
 

policy/executor/internal/nodes_test.go

@@ -633,11 +633,10 @@ func TestReportingQueryNode(t *testing.T) {
 	})
 }
 
-func TestReportingQueryNode_FeatureBoolAssertions(t *testing.T) {
+func TestReportingQueryNode_BoolAssertion(t *testing.T) {
 	newNodeData := func() *ReportingQueryNodeData {
 		data := &ReportingQueryNodeData{
-			queryID:               "testqueryid",
-			featureBoolAssertions: true,
+			queryID: "testqueryid",
 		}
 		return data
 	}