chore: update config traversal to handle new relationship way

flanksource · Mar 26, 2024 · 0f75713 · 0f75713
1 parent fd78b37
commit 0f75713
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/query/config_cache.go b/query/config_cache.go
@@ -74,7 +74,7 @@ func SyncConfigCache(ctx context.Context) error {
 			return fmt.Errorf("error setting config relationships in cache: %w", err)
 		}
 		for _, relID := range relIDs {
-			configIDRelatedTypeToRelatedIDs[configItemRelatedTypeCacheKey(cID, configIDTypeMap[relID])] = append(configIDRelatedTypeToRelatedIDs[configItemRelatedTypeCacheKey(cID, configIDTypeMap[relID])], relID)
+			configIDRelatedTypeToRelatedIDs[configItemRelatedTypeCacheKey(relID, configIDTypeMap[cID])] = append(configIDRelatedTypeToRelatedIDs[configItemRelatedTypeCacheKey(relID, configIDTypeMap[cID])], cID)
 		}
 	}
 

diff --git a/tests/config_traversal_test.go b/tests/config_traversal_test.go
@@ -26,8 +26,8 @@ var _ = ginkgo.Describe("Config traversal", ginkgo.Ordered, func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		configRelations := []models.ConfigRelationship{
-			{ConfigID: configItems["deployment"].ID.String(), RelatedID: configItems["helm-release-of-deployment"].ID.String(), Relation: "HelmReleaseDeployment"},
-			{ConfigID: configItems["helm-release-of-deployment"].ID.String(), RelatedID: configItems["kustomize-of-helm-release"].ID.String(), Relation: "KustomizationHelmRelease"},
+			{ConfigID: configItems["helm-release-of-deployment"].ID.String(), RelatedID: configItems["deployment"].ID.String(), Relation: "HelmReleaseDeployment"},
+			{ConfigID: configItems["kustomize-of-helm-release"].ID.String(), RelatedID: configItems["helm-release-of-deployment"].ID.String(), Relation: "KustomizationHelmRelease"},
 		}
 		err = ctx.DB().Clauses(clause.OnConflict{DoNothing: true}).Save(configRelations).Error
 		Expect(err).ToNot(HaveOccurred())
@@ -39,6 +39,10 @@ var _ = ginkgo.Describe("Config traversal", ginkgo.Ordered, func() {
 		Expect(got).ToNot(BeNil())
 		Expect(got.ID.String()).To(Equal(configItems["helm-release-of-deployment"].ID.String()))
 
+		got = query.TraverseConfig(DefaultContext, configItems["helm-release-of-deployment"].ID.String(), "Kubernetes::Kustomization")
+		Expect(got).ToNot(BeNil())
+		Expect(got.ID.String()).To(Equal(configItems["kustomize-of-helm-release"].ID.String()))
+
 		got = query.TraverseConfig(DefaultContext, configItems["deployment"].ID.String(), "Kubernetes::HelmRelease/Kubernetes::Kustomization")
 		Expect(got).ToNot(BeNil())
 		Expect(got.ID.String()).To(Equal(configItems["kustomize-of-helm-release"].ID.String()))