Improve documentation and fix warnings.

Author: clems4ever

internal/knowledge/query_and_or_expression.go

@@ -31,6 +31,7 @@ func (aoe AndOrExpression) String() string {
 	return "(empty)"
 }
 
+// BuildAndOrExpression build a string representation of AndOrExpression.
 func BuildAndOrExpression(tree AndOrExpression) (string, error) {
 	if tree.Expression != "" {
 		return tree.Expression, nil
@@ -69,6 +70,7 @@ func BuildAndOrExpression(tree AndOrExpression) (string, error) {
 	return "", nil
 }
 
+// CrossProductExpressions computes the cross product of 2 sets of expressions. This is used to transform OR expressions into a union of AND expressions.
 func CrossProductExpressions(and1 []AndOrExpression, and2 []AndOrExpression) []AndOrExpression {
 	outExpr := []AndOrExpression{}
 	for i := range and1 {

internal/knowledge/query_and_or_expression_test.go

@@ -10,72 +10,72 @@ func TestAndOrExpression(t *testing.T) {
 	exprs := AndOrExpression{
 		And: true,
 		Children: []AndOrExpression{
-			AndOrExpression{
+			{
 				And: false,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "a0.type = 'ip'",
 					},
 				},
 			},
-			AndOrExpression{
+			{
 				And: false,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "a0.type = 'device'",
 					},
 				},
 			},
-			AndOrExpression{
+			{
 				And: false,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "a0.type = 'metascan_task_id'",
 					},
 				},
 			},
-			AndOrExpression{
+			{
 				And: false,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "r0.type = 'observed'",
 					},
 				},
 			},
-			AndOrExpression{
+			{
 				And: true,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "r0.from_id = a1.id",
 					},
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "r0.to_id = a0.id",
 					},
 				},
 			},
-			AndOrExpression{
+			{
 				And: false,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "r1.type = 'scanned'",
 					},
 				},
 			},
-			AndOrExpression{
+			{
 				And: true,
 				Children: []AndOrExpression{
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "r1.from_id = a2.id",
 					},
-					AndOrExpression{
+					{
 						And:        false,
 						Expression: "r1.to_id = a0.id",
 					},

internal/knowledge/query_sql_test.go

@@ -232,6 +232,7 @@ RETURN ip`,
 SELECT a0.id, a0.value, a0.type FROM assets a0, assets a1, assets a2, relations r0, relations r1
 WHERE ((((((a0.type = 'ip' AND a1.type = 'device') AND a2.type = 'task') AND r0.type = 'observed') AND (r0.from_id = a1.id AND r0.to_id = a0.id)) AND r1.type = 'scanned') AND (r1.from_id = a2.id AND r1.to_id = a0.id))
 			`,
+			Selected: true,
 		},
 	}