feat(resources): add label selector support to commands which retrieve resources

This adds support for label selectors to the `get` `get-meta` and `fetch` commands, allowing users to filter resources based on labels. The label selector can be specified using the `-l` or `--selector` flag, following the format used in Kubernetes (e.g., `-l key=value,other=value`). This enhancement improves the usability of these commands by enabling more targeted retrieval of resources based on their labels.

Author: moustafab

cmd/grafanactl/resources/fetch.go

@@ -15,6 +15,7 @@ type fetchRequest struct {
 	StopOnError        bool
 	ExcludeManaged     bool
 	ExpectSingleTarget bool
+	LabelSelector      string
 	Processors         []remote.Processor
 }
 
@@ -50,6 +51,12 @@ func fetchResources(ctx context.Context, opts fetchRequest, args []string) (*fet
 		return nil, err
 	}
 
+	if opts.LabelSelector != "" {
+		for i := range filters {
+			filters[i].LabelSelector = opts.LabelSelector
+		}
+	}
+
 	pull, err := remote.NewDefaultPuller(ctx, opts.Config)
 	if err != nil {
 		return nil, err

cmd/grafanactl/resources/get.go

@@ -20,8 +20,9 @@ import (
 )
 
 type getOpts struct {
-	IO      cmdio.Options
-	OnError OnErrorMode
+	IO            cmdio.Options
+	OnError       OnErrorMode
+	LabelSelector string
 }
 
 func (opts *getOpts) setup(flags *pflag.FlagSet) {
@@ -31,6 +32,8 @@ func (opts *getOpts) setup(flags *pflag.FlagSet) {
 	opts.IO.RegisterCustomCodec("wide", &tableCodec{wide: true})
 	opts.IO.DefaultFormat("text")
 
+	flags.StringVarP(&opts.LabelSelector, "selector", "l", "", "Filter resources by label selector (e.g. -l key=value,other=value)")
+
 	// Bind all the flags
 	opts.IO.BindFlags(flags)
 }
@@ -98,8 +101,9 @@ func getCmd(configOpts *cmdconfig.Options) *cobra.Command {
 			}
 
 			res, err := fetchResources(ctx, fetchRequest{
-				Config:      cfg,
-				StopOnError: opts.OnError.StopOnError(),
+				Config:        cfg,
+				StopOnError:   opts.OnError.StopOnError(),
+				LabelSelector: opts.LabelSelector,
 			}, args)
 			if err != nil {
 				return err

cmd/grafanactl/resources/get_meta.go

@@ -23,14 +23,17 @@ import (
 )
 
 type getMetaOpts struct {
-	IO cmdio.Options
+	IO            cmdio.Options
+	LabelSelector string
 }
 
 func (opts *getMetaOpts) setup(flags *pflag.FlagSet) {
 	opts.IO.RegisterCustomCodec("text", &partialMetaTableCodec{wide: false})
 	opts.IO.RegisterCustomCodec("wide", &partialMetaTableCodec{wide: true})
 	opts.IO.DefaultFormat("text")
 
+	flags.StringVarP(&opts.LabelSelector, "selector", "l", "", "Filter resources by label selector (e.g. -l key=value,other=value)")
+
 	opts.IO.BindFlags(flags)
 }
 

internal/resources/filter.go

@@ -41,9 +41,10 @@ func (t FilterType) String() string {
 // Unlike Selector, filters use the Descriptor to identify the resource type,
 // which fully defines the target API resource.
 type Filter struct {
-	Type         FilterType
-	Descriptor   Descriptor
-	ResourceUIDs []string
+	Type          FilterType
+	Descriptor    Descriptor
+	ResourceUIDs  []string
+	LabelSelector string
 }
 
 func (f Filter) String() string {

internal/resources/remote/puller.go

@@ -111,7 +111,7 @@ func (p *Puller) Pull(ctx context.Context, req PullRequest) (*OperationSummary,
 		errg.Go(func() error {
 			switch filt.Type {
 			case resources.FilterTypeAll:
-				res, err := p.client.List(ctx, filt.Descriptor, metav1.ListOptions{})
+				res, err := p.client.List(ctx, filt.Descriptor, metav1.ListOptions{LabelSelector: filt.LabelSelector})
 				if err != nil {
 					if req.StopOnError {
 						return err