Pull request logicmonitor#144: fix(deleted-group): Fixed creation of _deleted resource group

fix(deleted-group): Fixed creation of _deleted resource group in old and new resource tree structure

Squashed commit of the following:

commit cf33ecc74fed9890d24a298bdb2cbd1523446389
Author: Shubhashri Shirode <[email protected]>
Date:   Tue Oct 26 19:41:20 2021 +0530

    refactor

commit 4d0a38bfee823956ad30f46adb27ed5cdb6061e2
Author: Shubhashri Shirode <[email protected]>
Date:   Mon Oct 25 23:45:44 2021 +0530

    Added _deleted group for clusterscopeed resources as well.

commit 8b9078e683454af5b1794738a85b3e294fbdf0c6
Author: Shubhashri Shirode <[email protected]>
Date:   Mon Oct 25 23:14:05 2021 +0530

    Fixed build error

commit 1b297f3caf21eaf80a63a03ac9f2c7d135daf0cc
Author: Shubhashri Shirode <[email protected]>
Date:   Mon Oct 25 15:24:07 2021 +0530

    fix(deleted-group): Fixed creation of _deleted resource group

Author: lmshubhashri

pkg/sync/initsyncer.go

@@ -74,26 +74,7 @@ func (i *InitSyncer) Sync(lctx *lmctx.LMContext) {
 	log.Tracef("Current cache: %v", list)
 
 	log.Infof("Deleting duplicate resources if any")
-	for _, entry := range list {
-		log.Tracef("Iterate resource cache entry : %v ", entry)
-		cacheResourceName := entry.K
-		cacheResourceMeta := entry.V
-
-		if ignoreSync[cacheResourceName.Resource] || cacheResourceName.Resource == enums.Namespaces {
-			continue
-		}
-
-		if strings.HasSuffix(cacheResourceMeta.Container, "-dupl") {
-			childLctx := lmlog.LMContextWithFields(lctx, logrus.Fields{
-				"name":  cacheResourceName.Resource.FQName(cacheResourceName.Name),
-				"type":  cacheResourceName.Resource.Singular(),
-				"ns":    cacheResourceMeta.Container,
-				"event": "sync",
-			})
-			childLctx = childLctx.LMContextWith(map[string]interface{}{constants.PartitionKey: fmt.Sprintf("%s-%s", cacheResourceName.Resource.String(), cacheResourceName.Name)})
-			i.deleteResource(childLctx, cacheResourceName, cacheResourceMeta)
-		}
-	}
+	i.removeDuplicateResources(lctx, list, ignoreSync)
 
 	for _, entry := range list {
 		log.Tracef("Iterate resource cache entry : %v ", entry)
@@ -111,7 +92,7 @@ func (i *InitSyncer) Sync(lctx *lmctx.LMContext) {
 		})
 		childLctx = childLctx.LMContextWith(map[string]interface{}{constants.PartitionKey: fmt.Sprintf("%s-%s", cacheResourceName.Resource.String(), cacheResourceName.Name)})
 
-		if cacheResourceName.Resource == enums.Namespaces {
+		if cacheResourceName.Resource == enums.Namespaces && cacheResourceName.Name != constants.DeletedResourceGroup {
 			if err := i.deleteNamespace(allK8SResourcesStore, childLctx, cacheResourceName, cacheResourceMeta, log, conf); err != nil && !errors.Is(err, aerrors.ErrResourceGroupIsNotEmpty) &&
 				!errors.Is(err, aerrors.ErrResourceGroupParentIsNotValid) &&
 				!strings.Contains(err.Error(), util.ClusterGroupName(conf.ClusterName)) {
@@ -137,6 +118,30 @@ func (i *InitSyncer) Sync(lctx *lmctx.LMContext) {
 	}
 }
 
+func (i *InitSyncer) removeDuplicateResources(lctx *lmctx.LMContext, list []types.IterItem, ignoreSync map[enums.ResourceType]bool) {
+	log := lmlog.Logger(lctx)
+	for _, entry := range list {
+		log.Tracef("Iterate resource cache entry : %v ", entry)
+		cacheResourceName := entry.K
+		cacheResourceMeta := entry.V
+
+		if ignoreSync[cacheResourceName.Resource] || cacheResourceName.Resource == enums.Namespaces {
+			continue
+		}
+
+		if strings.HasSuffix(cacheResourceMeta.Container, "-dupl") {
+			childLctx := lmlog.LMContextWithFields(lctx, logrus.Fields{
+				"name":  cacheResourceName.Resource.FQName(cacheResourceName.Name),
+				"type":  cacheResourceName.Resource.Singular(),
+				"ns":    cacheResourceMeta.Container,
+				"event": "sync",
+			})
+			childLctx = childLctx.LMContextWith(map[string]interface{}{constants.PartitionKey: fmt.Sprintf("%s-%s", cacheResourceName.Resource.String(), cacheResourceName.Name)})
+			i.deleteResource(childLctx, cacheResourceName, cacheResourceMeta)
+		}
+	}
+}
+
 func (i *InitSyncer) deleteNamespace(allK8SResourcesStore *resourcecache.Store, childLctx *lmctx.LMContext, cacheResourceName types.ResourceName, cacheResourceMeta types.ResourceMeta, log *logrus.Entry, conf *config.Config) error {
 	if _, ok := allK8SResourcesStore.Get(childLctx, cacheResourceName); !ok {
 		list := i.ResourceManager.GetResourceCache().ListWithFilter(func(k types.ResourceName, v types.ResourceMeta) bool {

pkg/tree/tree.go

@@ -73,7 +73,16 @@ func GetResourceGroupTree(lctx *lmctx.LMContext, dgBuilder types.ResourceManager
 						dgBuilder.AppliesTo(dgbuilder.NewAppliesToBuilder().HasCategory(resource.GetCategory()).And().Auto("clustername").Equals(conf.ClusterName)),
 						dgBuilder.CustomProperties(dgbuilder.NewPropertyBuilder().AddProperties(conf.ResourceGroupProperties.Get(resource))),
 					},
-					ChildGroups: nil,
+					ChildGroups: []*types.ResourceGroupTree{
+						{
+							DontCreate: doNotCreateDeletedGroup,
+							Options: []types.ResourceGroupOption{
+								dgBuilder.GroupName(constants.DeletedResourceGroup),
+								dgBuilder.DisableAlerting(true),
+								dgBuilder.AppliesTo(dgbuilder.NewAppliesToBuilder().HasCategory(resource.GetDeletedCategory()).And().Auto("clustername").Equals(conf.ClusterName)),
+							},
+						},
+					},
 				})
 		}
 	}
@@ -112,17 +121,6 @@ func GetResourceGroupTree2(lctx *lmctx.LMContext, dgBuilder types.ResourceManage
 	}
 	nodes := enums.Nodes
 	doNotCreateDeletedGroup := conf.DeleteResources
-	deletedBuilder := dgbuilder.NewAppliesToBuilder().
-		Auto("clustername").Equals(conf.ClusterName).And().
-		OpenBracket()
-	for _, e := range enums.ALLResourceTypes {
-		if e == enums.Namespaces || !e.IsNamespaceScopedResource() {
-			continue
-		}
-		deletedBuilder = deletedBuilder.HasCategory(e.GetDeletedCategory()).Or()
-	}
-	deletedBuilder.TrimOrCloseBracket()
-
 	clusterProps, ok := conf.ResourceGroupProperties.Raw["cluster"]
 	if !ok {
 		clusterProps = []config.PropOpts{}
@@ -156,7 +154,16 @@ func GetResourceGroupTree2(lctx *lmctx.LMContext, dgBuilder types.ResourceManage
 				Options: []types.ResourceGroupOption{
 					dgBuilder.GroupName(constants.ClusterScopedGroupName),
 				},
-				ChildGroups: clusterscoped,
+				ChildGroups: append(clusterscoped,
+					&types.ResourceGroupTree{
+						DontCreate: doNotCreateDeletedGroup,
+						Options: []types.ResourceGroupOption{
+							dgBuilder.GroupName(constants.DeletedResourceGroup),
+							dgBuilder.DisableAlerting(true),
+							dgBuilder.AppliesTo(getDeleteBuilderForClusterScopedResources(conf.ClusterName)),
+						},
+						ChildGroups: nil,
+					}),
 			},
 			{
 				Options: []types.ResourceGroupOption{
@@ -193,7 +200,7 @@ func GetResourceGroupTree2(lctx *lmctx.LMContext, dgBuilder types.ResourceManage
 						Options: []types.ResourceGroupOption{
 							dgBuilder.GroupName(constants.DeletedResourceGroup),
 							dgBuilder.DisableAlerting(true),
-							dgBuilder.AppliesTo(deletedBuilder),
+							dgBuilder.AppliesTo(getDeleteBuilderForNamespaceScopedResources(conf.ClusterName)),
 						},
 					},
 				},
@@ -234,3 +241,31 @@ func checkAndUpdateClusterGroup(lctx *lmctx.LMContext, config *config.Config, lm
 	}
 	return nil
 }
+
+func getDeleteBuilderForNamespaceScopedResources(clusterName string) types.AppliesToBuilder {
+	deletedBuilderForNamespaceScoped := dgbuilder.NewAppliesToBuilder().
+		Auto("clustername").Equals(clusterName).And().
+		OpenBracket()
+	for _, e := range enums.ALLResourceTypes {
+		if e == enums.Namespaces || !e.IsNamespaceScopedResource() {
+			continue
+		}
+		deletedBuilderForNamespaceScoped = deletedBuilderForNamespaceScoped.HasCategory(e.GetDeletedCategory()).Or()
+	}
+	deletedBuilderForNamespaceScoped.TrimOrCloseBracket()
+	return deletedBuilderForNamespaceScoped
+}
+
+func getDeleteBuilderForClusterScopedResources(clusterName string) types.AppliesToBuilder {
+	deletedBuilderForClusterScoped := dgbuilder.NewAppliesToBuilder().
+		Auto("clustername").Equals(clusterName).And().
+		OpenBracket()
+	for _, e := range enums.ALLResourceTypes {
+		if e == enums.Namespaces || e.IsNamespaceScopedResource() {
+			continue
+		}
+		deletedBuilderForClusterScoped = deletedBuilderForClusterScoped.HasCategory(e.GetDeletedCategory()).Or()
+	}
+	deletedBuilderForClusterScoped.TrimOrCloseBracket()
+	return deletedBuilderForClusterScoped
+}