chore: rename labelsMatchExpressions to labelsSatisfyMatchExpressions

grafana · May 5, 2024 · 4fa7dc5 · 4fa7dc5
1 parent 5997012
commit 4fa7dc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controllers/controller_shared.go b/controllers/controller_shared.go
@@ -39,7 +39,7 @@ func GetMatchingInstances(ctx context.Context, k8sClient client.Client, labelSel
 	var selectedList v1beta1.GrafanaList
 
 	for _, instance := range list.Items {
-		selected := labelsMatchExpressions(instance.Labels, labelSelector.MatchExpressions)
+		selected := labelsSatisfyMatchExpressions(instance.Labels, labelSelector.MatchExpressions)
 		if selected {
 			selectedList.Items = append(selectedList.Items, instance)
 		}
@@ -48,7 +48,7 @@ func GetMatchingInstances(ctx context.Context, k8sClient client.Client, labelSel
 	return selectedList, err
 }
 
-func labelsMatchExpressions(labels map[string]string, matchExpressions []metav1.LabelSelectorRequirement) bool {
+func labelsSatisfyMatchExpressions(labels map[string]string, matchExpressions []metav1.LabelSelectorRequirement) bool {
 	if len(labels) == 0 {
 		return false
 	}

diff --git a/controllers/controller_shared_test.go b/controllers/controller_shared_test.go
@@ -23,7 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func TestLabelsMatchExpressions(t *testing.T) {
+func TestLabelsSatisfyMatchExpressions(t *testing.T) {
 	tests := []struct {
 		name             string
 		labels           map[string]string
@@ -197,7 +197,7 @@ func TestLabelsMatchExpressions(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := labelsMatchExpressions(tt.labels, tt.matchExpressions)
+			got := labelsSatisfyMatchExpressions(tt.labels, tt.matchExpressions)
 			assert.Equal(t, tt.want, got)
 		})
 	}