From 357a0785bcd09e068c240595f12f14ab29fae066 Mon Sep 17 00:00:00 2001
From: Dmitry Chepurovskiy <dm3ch@dm3ch.net>
Date: Wed, 29 Jul 2020 23:30:16 +0300
Subject: [PATCH] Added selector filtering

Signed-off-by: Dmitry Chepurovskiy <dm3ch@dm3ch.net>
---
 pkg/action/list.go            | 13 +++++++++++++
 pkg/storage/driver/cfgmaps.go |  4 +++-
 pkg/storage/driver/secrets.go |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkg/action/list.go b/pkg/action/list.go
index 854a8942b..9cf7ec138 100644
--- a/pkg/action/list.go
+++ b/pkg/action/list.go
@@ -20,6 +20,8 @@ import (
 	"path"
 	"regexp"
 
+	"k8s.io/apimachinery/pkg/labels"
+
 	"helm.sh/helm/v3/pkg/release"
 	"helm.sh/helm/v3/pkg/releaseutil"
 )
@@ -152,11 +154,22 @@ func (l *List) Run() ([]*release.Release, error) {
 		}
 	}
 
+	selectorObj, err := labels.Parse(l.Selector)
+	if err != nil {
+		return nil, err
+	}
+
 	results, err := l.cfg.Releases.List(func(rel *release.Release) bool {
 		// Skip anything that doesn't match the filter.
 		if filter != nil && !filter.MatchString(rel.Name) {
 			return false
 		}
+
+		// Skip anything that doesn't match the selector
+		if ! selectorObj.Matches(labels.Set(rel.Labels)) {
+			return false
+		}
+		
 		return true
 	})
 
diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go
index 05213bbdd..94c278875 100644
--- a/pkg/storage/driver/cfgmaps.go
+++ b/pkg/storage/driver/cfgmaps.go
@@ -105,8 +105,10 @@ func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Releas
 			cfgmaps.Log("list: failed to decode release: %v: %s", item, err)
 			continue
 		}
+
+		rls.Labels = item.ObjectMeta.Labels
+
 		if filter(rls) {
-			rls.Labels = item.ObjectMeta.Labels
 			results = append(results, rls)
 		}
 	}
diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go
index 1503bc054..64dcf8216 100644
--- a/pkg/storage/driver/secrets.go
+++ b/pkg/storage/driver/secrets.go
@@ -97,8 +97,10 @@ func (secrets *Secrets) List(filter func(*rspb.Release) bool) ([]*rspb.Release,
 			secrets.Log("list: failed to decode release: %v: %s", item, err)
 			continue
 		}
+		
+		rls.Labels = item.ObjectMeta.Labels
+
 		if filter(rls) {
-			rls.Labels = item.ObjectMeta.Labels
 			results = append(results, rls)
 		}
 	}