Events: add node for formatting/filtering cloudevents (#1390)

This commit is contained in:
Jim authored and GitHub committed 2021-07-25 17:40:54 -04:00
1 parent 1ebb8efab6
commit 11124794bf
43 files changed
+1591 -320

No files matched your search

+3 -5
View File
@@ -22,7 +22,6 @@ import (
"github.com/hashicorp/boundary/internal/session"
"github.com/hashicorp/boundary/internal/target"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-secure-stdlib/base62"
"github.com/hashicorp/go-secure-stdlib/mlock"
"github.com/patrickmn/go-cache"
ua "go.uber.org/atomic"
@@ -75,10 +74,9 @@ func New(conf *Config) (*Controller, error) {
if conf.RawConfig.Controller == nil {
conf.RawConfig.Controller = new(config.Controller)
}
if conf.RawConfig.Controller.Name == "" {
if conf.RawConfig.Controller.Name, err = base62.Random(10); err != nil {
return nil, fmt.Errorf("error auto-generating controller name: %w", err)
}
if conf.RawConfig.Controller.Name, err = conf.RawConfig.Controller.InitNameIfEmpty(); err != nil {
return nil, fmt.Errorf("error auto-generating controller name: %w", err)
}
if !conf.RawConfig.DisableMlock {
@@ -1,13 +1,9 @@
package handlers
import (
"reflect"
"github.com/hashicorp/boundary/internal/errors"
"github.com/hashicorp/boundary/internal/filter"
"github.com/hashicorp/go-bexpr"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
"google.golang.org/protobuf/types/known/wrapperspb"
)
// filterItem captures all the different namespaces that can be used when
@@ -27,7 +23,7 @@ func NewFilter(f string) (*Filter, error) {
if f == "" {
return &Filter{}, nil
}
e, err := bexpr.CreateEvaluator(f, bexpr.WithTagName("json"), bexpr.WithHookFn(wellKnownTypeFilterHook))
e, err := bexpr.CreateEvaluator(f, bexpr.WithTagName("json"), bexpr.WithHookFn(filter.WellKnownTypeFilterHook))
if err != nil {
return nil, errors.Wrap(err, op, errors.WithMsg("couldn't build filter"), errors.WithCode(errors.InvalidParameter))
}
@@ -49,37 +45,3 @@ func (f *Filter) Match(item interface{}) bool {
// result in an error using the underlying library is simply interpreted as not a match.
return err == nil && m
}
// wellKnownTypeFilterHook is passed to bexpr to treat all proto well-known
// types as the types they wrap for comparison.
func wellKnownTypeFilterHook(v reflect.Value) reflect.Value {
if !v.CanInterface() {
return v
}
ret := v.Interface()
switch pm := v.Interface().(type) {
case *wrapperspb.BoolValue:
ret = pm.GetValue()
case *wrapperspb.BytesValue:
ret = pm.GetValue()
case *wrapperspb.StringValue:
ret = pm.GetValue()
case *wrapperspb.DoubleValue:
ret = pm.GetValue()
case *wrapperspb.FloatValue:
ret = pm.GetValue()
case *wrapperspb.Int32Value:
ret = pm.GetValue()
case *wrapperspb.Int64Value:
ret = pm.GetValue()
case *wrapperspb.UInt32Value:
ret = pm.GetValue()
case *wrapperspb.UInt64Value:
ret = pm.GetValue()
case *structpb.Struct:
ret = pm.AsMap()
case *timestamppb.Timestamp:
ret = pm.AsTime()
}
return reflect.ValueOf(ret)
}
@@ -1,7 +1,6 @@
package handlers
import (
"reflect"
"testing"
"github.com/stretchr/testify/assert"
@@ -118,20 +117,3 @@ func TestNewFilter(t *testing.T) {
})
}
}
func TestWellKnownTypeFilterHook(t *testing.T) {
conversions := map[interface{}]interface{}{
wrapperspb.String("foo"): "foo",
wrapperspb.UInt64(123): uint64(123),
wrapperspb.Int64(123): int64(123),
wrapperspb.UInt32(123): uint32(123),
wrapperspb.Int32(123): int32(123),
wrapperspb.Float(123): float32(123),
wrapperspb.Double(123): float64(123),
wrapperspb.Bytes([]byte("foo")): []byte("foo"),
wrapperspb.Bool(true): true,
}
for in, out := range conversions {
assert.Equal(t, reflect.ValueOf(out).Interface(), wellKnownTypeFilterHook(reflect.ValueOf(in)).Interface())
}
}
+12 -11
View File
@@ -457,23 +457,24 @@ func NewTestController(t *testing.T, opts *TestControllerOpts) *TestController {
})
}
if err := tc.b.SetupEventing(tc.b.Logger, tc.b.StderrLock, base.WithEventerConfig(opts.Config.Eventing)); err != nil {
if opts.Config.Controller == nil {
opts.Config.Controller = new(config.Controller)
}
if opts.Config.Controller.Name == "" {
opts.Config.Controller.Name, err = opts.Config.Controller.InitNameIfEmpty()
if err != nil {
t.Fatal(err)
}
tc.b.Logger.Info("controller name generated", "name", opts.Config.Controller.Name)
}
if err := tc.b.SetupEventing(tc.b.Logger, tc.b.StderrLock, opts.Config.Controller.Name, base.WithEventerConfig(opts.Config.Eventing)); err != nil {
t.Fatal(err)
}
// Initialize status grace period
tc.b.SetStatusGracePeriodDuration(opts.StatusGracePeriodDuration)
if opts.Config.Controller == nil {
opts.Config.Controller = new(config.Controller)
}
if opts.Config.Controller.Name == "" {
opts.Config.Controller.Name, err = base62.Random(5)
if err != nil {
t.Fatal(err)
}
tc.b.Logger.Info("controller name generated", "name", opts.Config.Controller.Name)
}
tc.name = opts.Config.Controller.Name
if opts.InitialResourcesSuffix != "" {