Rewrite policy resolver

internal/datalakes/inmemory/policyhub.go

@@ -522,7 +522,7 @@ func (db *Db) entityGraphExecutionChecksum(ctx context.Context, mrn string) (str
 		}
 	}
 
-	return policy.BundleExecutionChecksum(policyObj, framework), nil
+	return policy.BundleExecutionChecksum(ctx, policyObj, framework), nil
 }
 
 // EntityGraphContentChecksum retrieves the content checksum for a given entity.

policy/bundle.go

@@ -91,7 +91,7 @@ func (l *BundleLoader) BundleFromPaths(paths ...string) (*Bundle, error) {
 
 // BundleExecutionChecksum creates a combined execution checksum from a policy
 // and framework. Either may be nil.
-func BundleExecutionChecksum(policy *Policy, framework *Framework) string {
+func BundleExecutionChecksum(ctx context.Context, policy *Policy, framework *Framework) string {
 	res := checksums.New
 	if policy != nil {
 		res = res.Add(policy.GraphExecutionChecksum)
@@ -102,7 +102,11 @@ func BundleExecutionChecksum(policy *Policy, framework *Framework) string {
 	// So far the checksum only includes the policy and the framework
 	// It does not change if any of the jobs changes, only if the policy or the framework changes
 	// To update the resolved policy, when we change how it is generated, change the incoporated version of the resolver
-	res = res.Add(RESOLVER_VERSION)
+	if IsNextGenResolver(ctx) {
+		res = res.Add(RESOLVER_VERSION_NG)
+	} else {
+		res = res.Add(RESOLVER_VERSION)
+	}
 
 	return res.String()
 }

policy/cnspec_policy.proto

@@ -556,12 +556,16 @@ message ReportingJob {
 
   enum Type {
     UNSPECIFIED = 0;
-    CHECK = 1;
-    DATA_QUERY = 2;
     CONTROL = 3;
     POLICY = 4;
     FRAMEWORK = 5;
     RISK_FACTOR = 6;
+
+    // DO NOT USE CHECK OR DATA_QUERY, THEY ARE DEPRECATED
+    // Here's the reason why:
+    // A query can be either or both. We cannot pick one in all cases
+    CHECK = 1;
+    DATA_QUERY = 2;
   }
 
   string checksum = 1;