Set input bag during apa (istio#3687)

zqzstar · Feb 22, 2018 · 15071de · 15071de
1 parent d939140
commit 15071de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/mixer/pkg/runtime2/dispatcher/dispatcher.go b/mixer/pkg/runtime2/dispatcher/dispatcher.go
@@ -243,6 +243,7 @@ func (d *Dispatcher) dispatch(session *session) error {
 				state.instance = instance
 				if session.variety == tpb.TEMPLATE_VARIETY_ATTRIBUTE_GENERATOR {
 					state.mapper = group.Mappers[j]
+					state.inputBag = session.bag
 				}
 
 				// Dispatch for singleton dispatches

diff --git a/mixer/pkg/runtime2/dispatcher/dispatcher_test.go b/mixer/pkg/runtime2/dispatcher/dispatcher_test.go
@@ -416,6 +416,10 @@ ident                         : dest.istio-system
 '
 [tapa] InstanceBuilderFn() <= (SUCCESS)
 [tapa] DispatchGenAttrs => instance: '&Empty{}'
+[tapa] DispatchGenAttrs => attrs:    '---
+ident                         : dest.istio-system
+'
+[tapa] DispatchGenAttrs => mapper(exists):   'true'
 [tapa] DispatchGenAttrs <= (SUCCESS)
 `,
 	},
@@ -443,6 +447,10 @@ ident                         : dest.istio-system
 '
 [tapa] InstanceBuilderFn() <= (SUCCESS)
 [tapa] DispatchGenAttrs => instance: '&Empty{}'
+[tapa] DispatchGenAttrs => attrs:    '---
+ident                         : dest.istio-system
+'
+[tapa] DispatchGenAttrs => mapper(exists):   'true'
 [tapa] DispatchGenAttrs <= (ERROR)
 
 `,

diff --git a/mixer/pkg/runtime2/testing/data/templates.go b/mixer/pkg/runtime2/testing/data/templates.go
@@ -153,6 +153,8 @@ func createFakeTemplate(name string, s FakeTemplateSettings, l *Logger, variety
 		DispatchGenAttrs: func(ctx context.Context, handler adapter.Handler, instance interface{},
 			attrs attribute.Bag, mapper template.OutputMapperFn) (*attribute.MutableBag, error) {
 			l.writeFormat(name, "DispatchGenAttrs => instance: '%+v'", instance)
+			l.writeFormat(name, "DispatchGenAttrs => attrs:    '%+v'", attrs.DebugString())
+			l.writeFormat(name, "DispatchGenAttrs => mapper(exists):   '%+v'", mapper != nil)
 
 			signalCallAndWait(s)