Migrate selection from map[string]bool to set.StringSet

Author: rhybrillou

pkg/sac/effectiveaccessscope/conversion.go

@@ -113,10 +113,7 @@ func convertRulesToSelectors(scopeRules *storage.SimpleAccessScope_Rules) (*sele
 	output.clustersByName = set.NewStringSet(includedClusterNames...)
 
 	includedClusterIDs := scopeRules.GetIncludedClusterIds()
-	output.clustersByID = make(map[string]bool, len(includedClusterIDs))
-	for _, clusterID := range includedClusterIDs {
-		output.clustersByID[clusterID] = true
-	}
+	output.clustersByID = set.NewStringSet(includedClusterIDs...)
 
 	// Convert each selector to labels.Selector.
 	namespaceSelectors, namespaceSelectorErr := convertEachSetBasedLabelSelectorToK8sLabelSelector(scopeRules.GetNamespaceLabelSelectors())
@@ -126,8 +123,8 @@ func convertRulesToSelectors(scopeRules *storage.SimpleAccessScope_Rules) (*sele
 	output.namespacesByLabel = namespaceSelectors
 
 	includedNamespaces := scopeRules.GetIncludedNamespaces()
-	output.namespacesByClusterID = make(map[string]map[string]bool)
-	output.namespacesByClusterName = make(map[string]set.StringSet, len(includedNamespaces))
+	output.namespacesByClusterID = make(map[string]set.StringSet)
+	output.namespacesByClusterName = make(map[string]set.StringSet)
 	for _, namespace := range includedNamespaces {
 		clusterID := namespace.GetClusterId()
 		clusterName := namespace.GetClusterName()

pkg/sac/effectiveaccessscope/conversion_test.go

@@ -267,15 +267,12 @@ func TestConvertRulesToSelectors(t *testing.T) {
 				NamespaceLabelSelectors: nil,
 			},
 			expected: &selectors{
-				clustersByID: map[string]bool{
-					fixtureconsts.Cluster1: true,
-					fixtureconsts.Cluster2: true,
-				},
+				clustersByID:    set.NewStringSet(fixtureconsts.Cluster1, fixtureconsts.Cluster2),
 				clustersByName:  set.NewStringSet(clusterName1, clusterName2),
 				clustersByLabel: make([]labels.Selector, 0),
-				namespacesByClusterID: map[string]map[string]bool{
-					fixtureconsts.Cluster1: {namespaceName2: true},
-					fixtureconsts.Cluster2: {namespaceName1: true},
+				namespacesByClusterID: map[string]set.StringSet{
+					fixtureconsts.Cluster1: set.NewStringSet(namespaceName2),
+					fixtureconsts.Cluster2: set.NewStringSet(namespaceName1),
 				},
 				namespacesByClusterName: map[string]set.StringSet{
 					clusterName1: set.NewStringSet(namespaceName1),
@@ -294,20 +291,18 @@ func TestConvertRulesToSelectors(t *testing.T) {
 
 func emptySelector() *selectors {
 	return &selectors{
-		clustersByID:            make(map[string]bool),
+		clustersByID:            set.NewStringSet(),
 		clustersByName:          set.NewStringSet(),
 		clustersByLabel:         make([]labels.Selector, 0),
-		namespacesByClusterID:   make(map[string]map[string]bool),
+		namespacesByClusterID:   make(map[string]set.StringSet),
 		namespacesByClusterName: make(map[string]set.StringSet),
 		namespacesByLabel:       make([]labels.Selector, 0),
 	}
 }
 
 func selectOnlyClustersByID(clusterIDs []string) *selectors {
 	selector := emptySelector()
-	for _, clusterID := range clusterIDs {
-		selector.clustersByID[clusterID] = true
-	}
+	selector.clustersByID.AddAll(clusterIDs...)
 	return selector
 }
 
@@ -323,10 +318,7 @@ func selectNamespacesByCluster(
 ) *selectors {
 	selector := emptySelector()
 	for clusterID, clusterNamespaces := range namespacesByClusterID {
-		selector.namespacesByClusterID[clusterID] = make(map[string]bool)
-		for _, ns := range clusterNamespaces {
-			selector.namespacesByClusterID[clusterID][ns] = true
-		}
+		selector.namespacesByClusterID[clusterID] = set.NewStringSet(clusterNamespaces...)
 	}
 	for clusterName, clusterNamespaces := range namespacesByClusterName {
 		selector.namespacesByClusterName[clusterName] = set.NewStringSet(clusterNamespaces...)

pkg/sac/effectiveaccessscope/effective_access_scope.go

@@ -64,11 +64,11 @@ func (n *namespacesScopeSubTree) copy() *namespacesScopeSubTree {
 }
 
 type selectors struct {
-	clustersByID    map[string]bool
+	clustersByID    set.StringSet
 	clustersByName  set.StringSet
 	clustersByLabel []labels.Selector
 
-	namespacesByClusterID   map[string]map[string]bool
+	namespacesByClusterID   map[string]set.StringSet
 	namespacesByClusterName map[string]set.StringSet
 	namespacesByLabel       []labels.Selector
 }
@@ -79,7 +79,7 @@ func (s *selectors) matchCluster(cluster Cluster) scopeState {
 	}
 
 	clusterID := cluster.GetId()
-	if s.clustersByID != nil && s.clustersByID[clusterID] {
+	if s.clustersByID != nil && s.clustersByID.Contains(clusterID) {
 		return Included
 	}
 

pkg/sac/effectiveaccessscope/effective_access_scope_test.go

@@ -1385,9 +1385,7 @@ func TestSelectorsMatchCluster(t *testing.T) {
 		},
 		"cluster matched by ID is included": {
 			ruleSelector: &selectors{
-				clustersByID: map[string]bool{
-					clusterEarth.GetId(): true,
-				},
+				clustersByID: set.NewStringSet(clusterEarth.GetId()),
 			},
 			cluster:  clusterEarth,
 			expected: Included,
@@ -1449,10 +1447,8 @@ func TestSelectorsMatchNamespace(t *testing.T) {
 		},
 		"namespace matched by cluster ID is included": {
 			ruleSelectors: &selectors{
-				namespacesByClusterID: map[string]map[string]bool{
-					nsSkunkWorks.GetClusterId(): {
-						nsSkunkWorks.GetName(): true,
-					},
+				namespacesByClusterID: map[string]set.StringSet{
+					nsSkunkWorks.GetClusterId(): set.NewStringSet(nsSkunkWorks.GetName()),
 				},
 			},
 			namespace: nsSkunkWorks,