✨ mqueries.RefreshChecksums + migrate tests

policy/cnspec_policy.proto

@@ -372,10 +372,10 @@ message ScoreDistribution {
 
 service PolicyHub {
   rpc SetBundle(Bundle) returns (Empty) {}
-  rpc DeletePolicy(Mrn) returns (Empty) {}
   rpc ValidateBundle(Bundle) returns (Empty) {}
-  rpc GetPolicy(Mrn) returns (Policy) {}
   rpc GetBundle(Mrn) returns (Bundle) {}
+  rpc GetPolicy(Mrn) returns (Policy) {}
+  rpc DeletePolicy(Mrn) returns (Empty) {}
   rpc GetPolicyFilters(Mrn) returns (Mqueries) {}
   rpc List(ListReq) returns (Policies) {}
   rpc DefaultPolicies(DefaultPoliciesReq) returns (URLs) {}

policy/mquery.go

@@ -241,3 +241,13 @@ func ChecksumAssetFilters(queries []*Mquery) (string, error) {
 
 	return afc.String(), nil
 }
+
+// RefreshChecksums of all queries
+func (m *Mqueries) RefreshChecksums(props map[string]*llx.Primitive) error {
+	for i := range m.Items {
+		if _, err := m.Items[i].RefreshChecksumAndType(props); err != nil {
+			return err
+		}
+	}
+	return nil
+}

policy/mquery_test.go

@@ -0,0 +1,45 @@
+package policy
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMquery_Whitespaces(t *testing.T) {
+	mq := Mquery{
+		Query: "  mondoo { version \n}   \t\n  ",
+	}
+
+	mqexpect := Mquery{
+		Query: "mondoo { version \n}",
+	}
+
+	bundle, err := mq.RefreshChecksumAndType(nil)
+	assert.NoError(t, err)
+	assert.NotNil(t, bundle)
+
+	bundle, err = mqexpect.RefreshChecksumAndType(nil)
+	assert.NoError(t, err)
+	assert.NotNil(t, bundle)
+
+	assert.Equal(t, mqexpect.CodeId, mq.CodeId)
+}
+
+func TestMquery_CodeIDs(t *testing.T) {
+	mqAssetFilter := Mquery{
+		Query: "mondoo { version \n}",
+	}
+
+	mqReg := Mquery{
+		Query: "mondoo { version \n}",
+	}
+
+	_, err := mqAssetFilter.RefreshAsAssetFilter("//some.mrn")
+	assert.NoError(t, err)
+
+	_, err = mqReg.RefreshChecksumAndType(nil)
+	assert.NoError(t, err)
+
+	assert.Equal(t, mqReg.CodeId, mqAssetFilter.CodeId)
+}

policy/resolver.go

@@ -415,7 +415,7 @@ func (s *LocalServices) tryResolve(ctx context.Context, policyMrn string, assetF
 		return nil, err
 	}
 	if len(matchingFilters) == 0 {
-		return nil, newPolicyAssetMatchError(assetFilters, policyObj)
+		return nil, NewPolicyAssetMatchError(assetFilters, policyObj)
 	}
 
 	assetFiltersMap := make(map[string]struct{}, len(matchingFilters))
@@ -545,7 +545,7 @@ func (s *LocalServices) tryResolve(ctx context.Context, policyMrn string, assetF
 	return &resolvedPolicy, nil
 }
 
-func newPolicyAssetMatchError(assetFilters []*Mquery, p *Policy) error {
+func NewPolicyAssetMatchError(assetFilters []*Mquery, p *Policy) error {
 	if len(assetFilters) == 0 {
 		// send a proto error with details, so that the agent can render it properly
 		msg := "asset does not match any of the activated policies"