Skip to content

Commit

Permalink
resubmit pull request to resolve issue project-flogo#224
Browse files Browse the repository at this point in the history
  • Loading branch information
yxuco committed Dec 10, 2020
1 parent b3ef93c commit 15c5d86
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.
19 changes: 0 additions & 19 deletions trigger/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,3 @@ func HandlerFromContext(ctx context.Context) (*HandlerInfo, bool) {
u, ok := ctx.Value(handlerKey).(*HandlerInfo)
return u, ok
}

// This allows trigger developer to pass request parameters to handler w/o going through output mapper, e.g.,
// ctx := trigger.NewContextWithValues(context.Background(), values)
// results, err := handler.Handle(ctx, triggerData.ToMap())

type valueKey string

const contextValueKey valueKey = "RequestParams"

// NewContextWithValues returns a new Context that carries specified request parameter values
func NewContextWithValues(ctx context.Context, values map[string]interface{}) context.Context {
return context.WithValue(ctx, contextValueKey, values)
}

// ValuesFromContext extracts request parameters from a context
func ValuesFromContext(ctx context.Context) (map[string]interface{}, bool) {
values, ok := ctx.Value(contextValueKey).(map[string]interface{})
return values, ok
}
7 changes: 0 additions & 7 deletions trigger/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,6 @@ func (h *handlerImpl) Handle(ctx context.Context, triggerData interface{}) (resu
inputMap = triggerValues
}

// extract request parameters from trigger context, and make them available in actions
if reqParams, ok := ValuesFromContext(ctx); ok {
for k, v := range reqParams {
inputMap[k] = v
}
}

if ioMd := act.act.IOMetadata(); ioMd != nil {
for name, tv := range ioMd.Input {
if val, ok := inputMap[name]; ok {
Expand Down

0 comments on commit 15c5d86

Please sign in to comment.