ac78c23021
Fixes: #4222 # Data Filtering This PR will implement filtering for the following endpoints: ## Supported HTTP Endpoints - `/agent/checks` - `/agent/services` - `/catalog/nodes` - `/catalog/service/:service` - `/catalog/connect/:service` - `/catalog/node/:node` - `/health/node/:node` - `/health/checks/:service` - `/health/service/:service` - `/health/connect/:service` - `/health/state/:state` - `/internal/ui/nodes` - `/internal/ui/services` More can be added going forward and any endpoint which is used to list some data is a good candidate. ## Usage When using the HTTP API a `filter` query parameter can be used to pass a filter expression to Consul. Filter Expressions take the general form of: ``` <selector> == <value> <selector> != <value> <value> in <selector> <value> not in <selector> <selector> contains <value> <selector> not contains <value> <selector> is empty <selector> is not empty not <other expression> <expression 1> and <expression 2> <expression 1> or <expression 2> ``` Normal boolean logic and precedence is supported. All of the actual filtering and evaluation logic is coming from the [go-bexpr](https://github.com/hashicorp/go-bexpr) library ## Other changes Adding the `Internal.ServiceDump` RPC endpoint. This will allow the UI to filter services better.
78 lines
2 KiB
Go
78 lines
2 KiB
Go
package objx
|
|
|
|
// Exclude returns a new Map with the keys in the specified []string
|
|
// excluded.
|
|
func (m Map) Exclude(exclude []string) Map {
|
|
excluded := make(Map)
|
|
for k, v := range m {
|
|
if !contains(exclude, k) {
|
|
excluded[k] = v
|
|
}
|
|
}
|
|
return excluded
|
|
}
|
|
|
|
// Copy creates a shallow copy of the Obj.
|
|
func (m Map) Copy() Map {
|
|
copied := Map{}
|
|
for k, v := range m {
|
|
copied[k] = v
|
|
}
|
|
return copied
|
|
}
|
|
|
|
// Merge blends the specified map with a copy of this map and returns the result.
|
|
//
|
|
// Keys that appear in both will be selected from the specified map.
|
|
// This method requires that the wrapped object be a map[string]interface{}
|
|
func (m Map) Merge(merge Map) Map {
|
|
return m.Copy().MergeHere(merge)
|
|
}
|
|
|
|
// MergeHere blends the specified map with this map and returns the current map.
|
|
//
|
|
// Keys that appear in both will be selected from the specified map. The original map
|
|
// will be modified. This method requires that
|
|
// the wrapped object be a map[string]interface{}
|
|
func (m Map) MergeHere(merge Map) Map {
|
|
for k, v := range merge {
|
|
m[k] = v
|
|
}
|
|
return m
|
|
}
|
|
|
|
// Transform builds a new Obj giving the transformer a chance
|
|
// to change the keys and values as it goes. This method requires that
|
|
// the wrapped object be a map[string]interface{}
|
|
func (m Map) Transform(transformer func(key string, value interface{}) (string, interface{})) Map {
|
|
newMap := Map{}
|
|
for k, v := range m {
|
|
modifiedKey, modifiedVal := transformer(k, v)
|
|
newMap[modifiedKey] = modifiedVal
|
|
}
|
|
return newMap
|
|
}
|
|
|
|
// TransformKeys builds a new map using the specified key mapping.
|
|
//
|
|
// Unspecified keys will be unaltered.
|
|
// This method requires that the wrapped object be a map[string]interface{}
|
|
func (m Map) TransformKeys(mapping map[string]string) Map {
|
|
return m.Transform(func(key string, value interface{}) (string, interface{}) {
|
|
if newKey, ok := mapping[key]; ok {
|
|
return newKey, value
|
|
}
|
|
return key, value
|
|
})
|
|
}
|
|
|
|
// Checks if a string slice contains a string
|
|
func contains(s []string, e string) bool {
|
|
for _, a := range s {
|
|
if a == e {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|