Support fnmatch in the resource selector

* Add resourceid.Match(s1, s2 string) * Add resourceid.T.Match() * Make resource.T.MatchRID() use resourceid.T.Match() * Use resourceid.Match() in the GET /resource* api handlers instead of the simple rid equality test Example: $ ./om3 '*' resource status ls --rid f*0 OBJECT NODE RID TYPE STATUS drbd001 dev2n1 fs#0 fs.flag down drbd001 dev2n2 fs#0 fs.flag down drbd001 dev2n3 fs#0 fs.flag down
opensvc · Sep 15, 2023 · ebd5af1 · ebd5af1
1 parent ca00acb
commit ebd5af1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/core/resource/resource.go b/core/resource/resource.go
@@ -504,19 +504,7 @@ func (t *T) Log() *zerolog.Logger {
 //     pattern.
 //     ex: fs#1 matches fs#1
 func (t T) MatchRID(s string) bool {
-	rid, err := resourceid.Parse(s)
-	if err != nil {
-		return false
-	}
-	if !rid.DriverGroup().IsValid() {
-		return false
-	}
-	if rid.Index() == "" {
-		// ex: fs#1 matches fs
-		return t.ResourceID.DriverGroup().String() == rid.DriverGroup().String()
-	}
-	// ex: fs#1 matches fs#1
-	return t.ResourceID.String() == s
+	return t.ResourceID.Match(s)
 
 }
 

diff --git a/core/resourceid/resourceid.go b/core/resourceid/resourceid.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/danwakefield/fnmatch"
 	"github.com/opensvc/om3/core/driver"
 )
 
@@ -74,3 +75,21 @@ func (t *T) UnmarshalJSON(b []byte) error {
 	t.Name = temp
 	return nil
 }
+
+func Match(s1, s2 string) bool {
+	if rid1, err := Parse(s1); err != nil {
+		return false
+	} else {
+		return rid1.Match(s2)
+	}
+}
+
+func (t T) Match(s string) bool {
+	if rid, err := Parse(s); err == nil && rid.DriverGroup().IsValid() && rid.Index() == "" {
+		// ex: fs#1 matches fs
+		return t.DriverGroup().String() == rid.DriverGroup().String()
+	}
+	// ex: fs#1 matches fs#1, f*
+	return fnmatch.Match(s, t.Name, 0)
+
+}
diff --git a/daemon/daemonapi/get_resource.go b/daemon/daemonapi/get_resource.go
@@ -7,6 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/opensvc/om3/core/instance"
+	"github.com/opensvc/om3/core/resourceid"
 	"github.com/opensvc/om3/daemon/api"
 )
 
@@ -32,7 +33,7 @@ func (a *DaemonApi) GetResource(ctx echo.Context, params api.GetResourceParams)
 		monitor := instance.MonitorData.Get(config.Path, config.Node)
 		status := instance.StatusData.Get(config.Path, config.Node)
 		for rid, resourceConfig := range config.Value.Resources {
-			if params.Resource != nil && rid != *params.Resource {
+			if params.Resource != nil && !resourceid.Match(rid, *params.Resource) {
 				continue
 			}
 			d := api.ResourceItem{

diff --git a/daemon/daemonapi/get_resource_config.go b/daemon/daemonapi/get_resource_config.go
@@ -7,6 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/opensvc/om3/core/instance"
+	"github.com/opensvc/om3/core/resourceid"
 	"github.com/opensvc/om3/daemon/api"
 )
 
@@ -30,7 +31,7 @@ func (a *DaemonApi) GetResourceConfig(ctx echo.Context, params api.GetResourceCo
 			continue
 		}
 		for rid, resourceConfig := range config.Value.Resources {
-			if params.Resource != nil && rid != *params.Resource {
+			if params.Resource != nil && !resourceid.Match(rid, *params.Resource) {
 				continue
 			}
 			d := api.ResourceConfigItem{

diff --git a/daemon/daemonapi/get_resource_monitor.go b/daemon/daemonapi/get_resource_monitor.go
@@ -7,6 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/opensvc/om3/core/instance"
+	"github.com/opensvc/om3/core/resourceid"
 	"github.com/opensvc/om3/daemon/api"
 )
 
@@ -30,7 +31,7 @@ func (a *DaemonApi) GetResourceMonitor(ctx echo.Context, params api.GetResourceM
 			continue
 		}
 		for rid, resourceMonitor := range monitor.Value.Resources {
-			if params.Resource != nil && rid != *params.Resource {
+			if params.Resource != nil && !resourceid.Match(rid, *params.Resource) {
 				continue
 			}
 			d := api.ResourceMonitorItem{

diff --git a/daemon/daemonapi/get_resource_status.go b/daemon/daemonapi/get_resource_status.go
@@ -7,6 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/opensvc/om3/core/instance"
+	"github.com/opensvc/om3/core/resourceid"
 	"github.com/opensvc/om3/daemon/api"
 )
 
@@ -30,7 +31,7 @@ func (a *DaemonApi) GetResourceStatus(ctx echo.Context, params api.GetResourceSt
 			continue
 		}
 		for rid, resourceStatus := range status.Value.Resources {
-			if params.Resource != nil && rid != *params.Resource {
+			if params.Resource != nil && !resourceid.Match(rid, *params.Resource) {
 				continue
 			}
 			d := api.ResourceStatusItem{