Merge pull request #144 from armosec/fix-since-until

chore: Add indexes for collections

db/mongo/index.go

@@ -19,6 +19,13 @@ var collectionIndexes = map[string][]mongo.IndexModel{
 				{Key: "guid", Value: 1},
 			},
 		},
+		{
+			Keys: bson.D{
+				{Key: "activeSubscription.licenseType", Value: 1},
+				{Key: "activeSubscription.subscriptionStatus", Value: 1},
+				{Key: "subscription_date", Value: 1},
+			},
+		},
 	},
 	consts.UsersNotificationsCacheCollection: {
 		{
@@ -322,6 +329,50 @@ var collectionIndexes = map[string][]mongo.IndexModel{
 			},
 		},
 	},
+	consts.ClustersCollection: {
+		{
+			Keys: bson.D{
+				{Key: "_id", Value: 1},
+				{Key: "customers", Value: 1},
+			},
+		},
+	},
+	// We are paying the proce of not handling this index from config service but as a module
+	consts.TokensCollection: {
+		{
+			Keys: bson.D{
+				{Key: "customerGuid", Value: 1},
+				{Key: "value", Value: 1},
+				{Key: "type", Value: 1},
+			},
+		},
+	},
+	consts.VulnerabilityExceptionPolicyCollection: {
+		{
+			Keys: bson.D{
+				{Key: "guid", Value: 1},
+			},
+		},
+		{
+			Keys: bson.D{
+				{Key: "name", Value: 1},
+			},
+		},
+		{
+			Keys: bson.D{
+				{Key: "customers", Value: 1},
+			},
+		},
+		{
+			Keys: bson.D{
+				{Key: "attributes.namespaceOnly", Value: 1},
+				{Key: "designators.attributes.cluster", Value: 1},
+				{Key: "designators.attributes.namespace", Value: 1},
+				// can't index on both customer and designators, as they are in different arrays
+				// {Key: "customers", Value: 1},
+			},
+		},
+	},
 }
 
 // defaultIndex is the default index for all collections unless overridden in collectionIndexes

testers_test.go

@@ -4,6 +4,7 @@ import (
 	"config-service/types"
 	"encoding/json"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/armosec/armoapi-go/armotypes"
@@ -652,12 +653,15 @@ func testGetDocsWithOptions[T types.DocContent](suite *MainTestSuite, path strin
 	if err != nil {
 		suite.FailNow(err.Error())
 	}
-	sort.Slice(docs, func(i, j int) bool {
-		return docs[i].GetName() < docs[j].GetName()
-	})
-	sort.Slice(expectedDocs, func(i, j int) bool {
-		return expectedDocs[i].GetName() < expectedDocs[j].GetName()
-	})
+	sortFunc := func(a T, b T) int {
+		if nameInt := strings.Compare(a.GetName(), b.GetName()); nameInt != 0 {
+			return nameInt
+		} else {
+			return strings.Compare(a.GetGUID(), b.GetGUID())
+		}
+	}
+	slices.SortFunc(docs, sortFunc)
+	slices.SortFunc(expectedDocs, sortFunc)
 	diff := cmp.Diff(docs, expectedDocs, compareOpts...)
 	suite.Equal("", diff)
 	return docs

utils/consts/const.go

@@ -53,6 +53,7 @@ const (
 	RuntimeIncidentCollection                   = "v1_runtime_incidents"
 	RuntimeIncidentPolicyCollection             = "v1_runtime_incident_policies"
 	IntegrationReferenceCollection              = "v1_integration_references"
+	TokensCollection                            = "tokens"
 
 	//Common document fields
 	IdField          = "_id"