From 500df0ac9ffcaaf3e67dd9c5cf691e6be931c931 Mon Sep 17 00:00:00 2001 From: Derek Wang Date: Fri, 26 Jun 2020 15:02:39 -0700 Subject: [PATCH] feat: Replace gatewayName with eventSourceName in Sensor dependencies (#687) * feat: Replace gatewayName with eventSourceName in Sensor dependencies This is the first step of merging Gateway to EventSource. * fix validation * test case * still test case * codegen * revert example changes * revert docs * still doc --- api/openapi-spec/swagger.json | 7 +- api/sensor.html | 14 +- api/sensor.md | 21 + controllers/sensor/validate.go | 6 +- docs/demo/notebooks.md | 2 +- gateways/client/cloud-events.go | 2 +- gateways/client/cloud-events_test.go | 5 +- gateways/client/event-source_test.go | 3 + pkg/apis/sensor/v1alpha1/generated.pb.go | 539 ++++++++++-------- pkg/apis/sensor/v1alpha1/generated.proto | 8 +- pkg/apis/sensor/v1alpha1/openapi_generated.go | 11 +- pkg/apis/sensor/v1alpha1/types.go | 9 +- sensors/dependencies/resolution.go | 28 +- sensors/dependencies/resolution_test.go | 9 +- sensors/listener.go | 2 +- 15 files changed, 392 insertions(+), 274 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index fde62dbe6b..217cdc845c 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -1813,6 +1813,7 @@ "required": [ "name", "gatewayName", + "eventSourceName", "eventName" ], "properties": { @@ -1820,12 +1821,16 @@ "description": "EventName is the name of the event", "type": "string" }, + "eventSourceName": { + "description": "EventSourceName is the name of EventSource that Sensor depends on", + "type": "string" + }, "filters": { "description": "Filters and rules governing toleration of success and constraints on the context and data of an event", "$ref": "#/definitions/io.argoproj.sensor.v1alpha1.EventDependencyFilter" }, "gatewayName": { - "description": "GatewayName is the name of the gateway from whom the event is received", + "description": "GatewayName is the name of the gateway from whom the event is received DEPRECATED: Use EventSourceName instead.", "type": "string" }, "name": { diff --git a/api/sensor.html b/api/sensor.html index 9b36dbce50..bdea29e8da 100644 --- a/api/sensor.html +++ b/api/sensor.html @@ -819,7 +819,19 @@

EventDependency -

GatewayName is the name of the gateway from whom the event is received

+

GatewayName is the name of the gateway from whom the event is received +DEPRECATED: Use EventSourceName instead.

+ + + + +eventSourceName
+ +string + + + +

EventSourceName is the name of EventSource that Sensor depends on

diff --git a/api/sensor.md b/api/sensor.md index b3fdbbb6e5..b65cb4ca6b 100644 --- a/api/sensor.md +++ b/api/sensor.md @@ -1638,6 +1638,27 @@ Name is a unique name of this dependency

GatewayName is the name of the gateway from whom the event is received +DEPRECATED: Use EventSourceName instead. + +

+ + + + + + + + + +eventSourceName
string + + + + + +

+ +EventSourceName is the name of EventSource that Sensor depends on

diff --git a/controllers/sensor/validate.go b/controllers/sensor/validate.go index 0d9410bea9..51a2bfadc8 100644 --- a/controllers/sensor/validate.go +++ b/controllers/sensor/validate.go @@ -453,9 +453,9 @@ func validateDependencies(eventDependencies []v1alpha1.EventDependency) error { if dep.Name == "" { return errors.New("event dependency must define a name") } - - if dep.GatewayName == "" { - return errors.New("event dependency must define the gateway name") + // TODO: GatewayName will be deprecated + if dep.EventSourceName == "" && dep.GatewayName == "" { + return errors.New("event dependency must define the EventSource name") } if dep.EventName == "" { diff --git a/docs/demo/notebooks.md b/docs/demo/notebooks.md index 79ab524697..1921dc2000 100644 --- a/docs/demo/notebooks.md +++ b/docs/demo/notebooks.md @@ -94,7 +94,7 @@ In this demo, we are going to set up an image processing pipeline using 2 notebo serviceAccountName: argo-events-sa dependencies: - name: test-dep - gatewayName: webhook-gateway + eventSourceName: webhook-event-source eventName: example subscription: http: diff --git a/gateways/client/cloud-events.go b/gateways/client/cloud-events.go index 07da867c66..8c3af392df 100644 --- a/gateways/client/cloud-events.go +++ b/gateways/client/cloud-events.go @@ -138,7 +138,7 @@ func (gatewayContext *GatewayContext) transformEvent(gatewayEvent *gateways.Even event.SetID(fmt.Sprintf("%x", uuid.New())) event.SetSpecVersion(cloudevents.VersionV03) event.SetType(string(gatewayContext.gateway.Spec.Type)) - event.SetSource(gatewayContext.gateway.Name) + event.SetSource(gatewayContext.gateway.Spec.EventSourceRef.Name) event.SetDataContentType("application/json") event.SetSubject(gatewayEvent.Name) event.SetTime(time.Now()) diff --git a/gateways/client/cloud-events_test.go b/gateways/client/cloud-events_test.go index a6d371a376..cfd4253e21 100644 --- a/gateways/client/cloud-events_test.go +++ b/gateways/client/cloud-events_test.go @@ -37,13 +37,16 @@ func TestTransformEvent(t *testing.T) { }, Spec: v1alpha1.GatewaySpec{ Type: "webhook", + EventSourceRef: &v1alpha1.EventSourceRef{ + Name: "test-event-source", + }, }, }, } cloudevent, err := ctx.transformEvent(event) assert.Nil(t, err) assert.NotNil(t, cloudevent.Context.AsV03()) - assert.Equal(t, "test-gateway", cloudevent.Source()) + assert.Equal(t, "test-event-source", cloudevent.Source()) assert.Equal(t, "hello", cloudevent.Subject()) assert.Equal(t, "webhook", cloudevent.Type()) diff --git a/gateways/client/event-source_test.go b/gateways/client/event-source_test.go index 4d185e1e66..6c36c058c7 100644 --- a/gateways/client/event-source_test.go +++ b/gateways/client/event-source_test.go @@ -48,6 +48,9 @@ func getGatewayContext() *GatewayContext { Namespace: "fake-namespace", }, Spec: v1alpha1.GatewaySpec{ + EventSourceRef: &v1alpha1.EventSourceRef{ + Name: "fake-event-source", + }, Subscribers: &v1alpha1.Subscribers{ HTTP: []string{}, }, diff --git a/pkg/apis/sensor/v1alpha1/generated.pb.go b/pkg/apis/sensor/v1alpha1/generated.pb.go index 2d2bcd205d..757addf049 100644 --- a/pkg/apis/sensor/v1alpha1/generated.pb.go +++ b/pkg/apis/sensor/v1alpha1/generated.pb.go @@ -1310,258 +1310,259 @@ func init() { } var fileDescriptor_6c4bded897df1f16 = []byte{ - // 4009 bytes of a gzipped FileDescriptorProto + // 4028 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x3b, 0x4d, 0x6f, 0x24, 0xc7, 0x75, 0x3b, 0x5f, 0xe4, 0xcc, 0xe3, 0xac, 0xc8, 0x2d, 0x69, 0x6d, 0x8a, 0x96, 0xc8, 0x45, 0x1b, 0x71, 0x64, 0xc3, 0x1e, 0x4a, 0x2b, 0x39, 0xa1, 0x64, 0x20, 0x16, 0x67, 0xc8, 0xfd, 0x22, 0x77, 0x49, 0x57, 0x73, 0xb5, 0x80, 0x63, 0xc4, 0xdb, 0xec, 0xa9, 0x99, 0x69, 0xb1, 0xa7, 0xbb, 0xd3, - 0x55, 0xc3, 0xf5, 0x00, 0x89, 0x13, 0x40, 0xc8, 0x21, 0x48, 0x00, 0x27, 0xb0, 0x7e, 0x44, 0x0e, - 0x81, 0xef, 0x01, 0x02, 0x04, 0x08, 0x12, 0x44, 0x87, 0x1c, 0x9c, 0x43, 0x00, 0x9f, 0x88, 0x88, + 0x55, 0xc3, 0xf5, 0x00, 0x89, 0x13, 0x40, 0xc8, 0x21, 0x48, 0x00, 0x27, 0x88, 0x7e, 0x44, 0x0e, + 0x81, 0xef, 0x01, 0x02, 0x04, 0x08, 0x12, 0x44, 0x87, 0x1c, 0x9c, 0x43, 0x02, 0x9f, 0x88, 0x88, 0x3e, 0xe4, 0x90, 0x00, 0xb9, 0xe4, 0xb4, 0x17, 0x07, 0xf5, 0xd5, 0x5d, 0xdd, 0x33, 0xbb, 0x3b, - 0xc3, 0x5e, 0x53, 0x01, 0x7c, 0x9b, 0x79, 0xef, 0xd5, 0x7b, 0xf5, 0xf1, 0xbe, 0xab, 0x1a, 0xee, - 0xf4, 0x3d, 0x36, 0x18, 0x1d, 0xb7, 0xdc, 0x70, 0xb8, 0xe9, 0xc4, 0xfd, 0x30, 0x8a, 0xc3, 0x8f, - 0xc5, 0x8f, 0x6f, 0x91, 0x53, 0x12, 0x30, 0xba, 0x19, 0x9d, 0xf4, 0x37, 0x9d, 0xc8, 0xa3, 0x9b, - 0x94, 0x04, 0x34, 0x8c, 0x37, 0x4f, 0xdf, 0x71, 0xfc, 0x68, 0xe0, 0xbc, 0xb3, 0xd9, 0x27, 0x01, - 0x89, 0x1d, 0x46, 0xba, 0xad, 0x28, 0x0e, 0x59, 0x88, 0xb6, 0x52, 0x4e, 0x2d, 0xcd, 0x49, 0xfc, - 0xf8, 0xa1, 0xe4, 0xd4, 0x8a, 0x4e, 0xfa, 0x2d, 0xce, 0xa9, 0x25, 0x39, 0xb5, 0x34, 0xa7, 0xb5, - 0xef, 0xce, 0x3c, 0x07, 0x37, 0x1c, 0x0e, 0xc3, 0x20, 0x2f, 0x7a, 0xed, 0x5b, 0x06, 0x83, 0x7e, - 0xd8, 0x0f, 0x37, 0x05, 0xf8, 0x78, 0xd4, 0x13, 0xff, 0xc4, 0x1f, 0xf1, 0x4b, 0x91, 0x5b, 0x27, - 0x5b, 0xb4, 0xe5, 0x85, 0x9c, 0xe5, 0xa6, 0x1b, 0xc6, 0x64, 0xf3, 0x74, 0x62, 0x35, 0x6b, 0xef, - 0xa5, 0x34, 0x43, 0xc7, 0x1d, 0x78, 0x01, 0x89, 0xc7, 0xe9, 0x3c, 0x86, 0x84, 0x39, 0xd3, 0x46, - 0x6d, 0x3e, 0x6b, 0x54, 0x3c, 0x0a, 0x98, 0x37, 0x24, 0x13, 0x03, 0x7e, 0xe7, 0x45, 0x03, 0xa8, - 0x3b, 0x20, 0x43, 0x27, 0x3f, 0xce, 0xfa, 0xa7, 0x2a, 0xac, 0x6c, 0x3f, 0xb2, 0xf7, 0x9d, 0xe1, - 0x71, 0xd7, 0x39, 0x8a, 0xbd, 0x7e, 0x9f, 0xc4, 0x68, 0x0b, 0x9a, 0xbd, 0x51, 0xe0, 0x32, 0x2f, - 0x0c, 0x1e, 0x38, 0x43, 0xb2, 0x5a, 0xba, 0x51, 0x7a, 0xab, 0xd1, 0x7e, 0xed, 0xb3, 0xb3, 0x8d, - 0x2b, 0xe7, 0x67, 0x1b, 0xcd, 0x5b, 0x06, 0x0e, 0x67, 0x28, 0x11, 0x86, 0x86, 0xe3, 0xba, 0x84, - 0xd2, 0x3d, 0x32, 0x5e, 0x2d, 0xdf, 0x28, 0xbd, 0xb5, 0x74, 0xf3, 0xb7, 0x5a, 0x72, 0x6a, 0xfc, - 0xc8, 0x5a, 0x7c, 0x97, 0x5a, 0xa7, 0xef, 0xb4, 0x6c, 0xe2, 0xc6, 0x84, 0xed, 0x91, 0xb1, 0x4d, - 0x7c, 0xe2, 0xb2, 0x30, 0x6e, 0x5f, 0x3d, 0x3f, 0xdb, 0x68, 0x6c, 0xeb, 0xb1, 0x38, 0x65, 0xc3, - 0x79, 0x52, 0x4d, 0xbe, 0x5a, 0x99, 0x9b, 0x67, 0x02, 0xc6, 0x29, 0x1b, 0xb4, 0x09, 0x8d, 0xc0, - 0x19, 0x12, 0x1a, 0x39, 0x2e, 0x59, 0xad, 0x8a, 0xe5, 0x5d, 0x53, 0xcb, 0x6b, 0x3c, 0xd0, 0x08, - 0x9c, 0xd2, 0xa0, 0xaf, 0xc1, 0x42, 0x4c, 0xfa, 0x5e, 0x18, 0xac, 0xd6, 0x04, 0xf5, 0x2b, 0x8a, - 0x7a, 0x01, 0x0b, 0x28, 0x56, 0x58, 0x34, 0x82, 0xc5, 0xc8, 0x19, 0xfb, 0xa1, 0xd3, 0x5d, 0x5d, - 0xb8, 0x51, 0x79, 0x6b, 0xe9, 0xe6, 0xbd, 0xd6, 0x45, 0xd5, 0xb9, 0xa5, 0x8e, 0xe3, 0xd0, 0x89, - 0x9d, 0x21, 0x61, 0x24, 0x6e, 0x2f, 0x2b, 0xa1, 0x8b, 0x87, 0x52, 0x04, 0xd6, 0xb2, 0xd0, 0x8f, - 0x01, 0x22, 0x4d, 0x46, 0x57, 0x17, 0x5f, 0xba, 0x64, 0xa4, 0x24, 0x43, 0x02, 0xa2, 0xd8, 0x90, - 0x68, 0x9d, 0x55, 0xe0, 0xd5, 0xed, 0xb8, 0x1f, 0x3e, 0x0a, 0xe3, 0x93, 0x9e, 0x1f, 0x3e, 0xd1, - 0x9a, 0x14, 0xc0, 0x02, 0x0d, 0x47, 0xb1, 0x2b, 0x75, 0xa8, 0xd0, 0x9c, 0xb6, 0x63, 0xe6, 0xf5, - 0x1c, 0x97, 0xed, 0x87, 0xae, 0xc3, 0xf5, 0xad, 0x0d, 0x7c, 0xfb, 0x6d, 0xc1, 0x1d, 0x2b, 0x29, - 0xe8, 0x0e, 0x34, 0xc2, 0x88, 0x2b, 0x38, 0x3f, 0xa9, 0xb2, 0x38, 0xa9, 0x6f, 0xe8, 0x73, 0x3d, - 0xd0, 0x88, 0xa7, 0x67, 0x1b, 0xd7, 0xcd, 0xc9, 0x26, 0x08, 0x9c, 0x0e, 0xce, 0xed, 0x68, 0xe5, - 0xb2, 0x77, 0x14, 0xfd, 0x65, 0x09, 0x5e, 0xeb, 0xc7, 0xe1, 0x28, 0xfa, 0x88, 0xc4, 0x94, 0xcf, - 0x8d, 0xa8, 0x8d, 0xac, 0x8a, 0x8d, 0xfc, 0xc0, 0xb0, 0x80, 0xc4, 0xe0, 0x53, 0xf1, 0xdc, 0xaf, - 0x70, 0x9b, 0xb8, 0x3d, 0x85, 0x43, 0xfb, 0x0d, 0x25, 0xfa, 0xb5, 0x69, 0x58, 0x3c, 0x55, 0xaa, - 0xf5, 0x69, 0x0d, 0x56, 0xf2, 0x27, 0x80, 0x6c, 0x28, 0xd3, 0x77, 0xd5, 0xc9, 0x7e, 0x67, 0xf6, - 0xbd, 0x91, 0xce, 0xb7, 0x65, 0xbf, 0xab, 0x19, 0xb6, 0x17, 0xce, 0xcf, 0x36, 0xca, 0xf6, 0xbb, - 0xb8, 0x4c, 0xdf, 0x45, 0x16, 0x2c, 0x78, 0x81, 0xef, 0x05, 0x44, 0x9d, 0x9f, 0x38, 0xe6, 0xbb, - 0x02, 0x82, 0x15, 0x06, 0x75, 0xa1, 0xda, 0xf3, 0x7c, 0xa2, 0xbc, 0xc1, 0xad, 0x8b, 0x1f, 0xcb, - 0x2d, 0xcf, 0x27, 0xc9, 0x2c, 0xea, 0xe7, 0x67, 0x1b, 0x55, 0x0e, 0xc1, 0x82, 0x3b, 0x7a, 0x0c, - 0x95, 0x51, 0xec, 0xab, 0x0d, 0xdf, 0xbd, 0xb8, 0x90, 0x87, 0x78, 0x3f, 0x91, 0xb1, 0x78, 0x7e, - 0xb6, 0x51, 0x79, 0x88, 0xf7, 0x31, 0x67, 0x8d, 0x7e, 0x04, 0x0d, 0x37, 0x0c, 0x7a, 0x5e, 0x7f, - 0xe8, 0x44, 0xc2, 0xb1, 0x2c, 0xdd, 0xdc, 0xbb, 0xb8, 0x9c, 0x8e, 0x66, 0x95, 0x48, 0x13, 0x0e, - 0x30, 0x01, 0xe3, 0x54, 0x18, 0x5f, 0x5b, 0xdf, 0x63, 0xab, 0x0b, 0x45, 0xd7, 0x76, 0xdb, 0x63, - 0xd9, 0xb5, 0xdd, 0xf6, 0x18, 0xe6, 0xac, 0x91, 0x0b, 0xf5, 0x58, 0xeb, 0xec, 0xa2, 0x10, 0xf3, - 0xfe, 0xdc, 0x2a, 0x92, 0xa8, 0x6c, 0xf3, 0xfc, 0x6c, 0xa3, 0x9e, 0xa8, 0x68, 0xc2, 0xd8, 0x3a, - 0x2b, 0x41, 0xa3, 0xed, 0x50, 0xcf, 0xdd, 0x1e, 0xb1, 0x01, 0x3a, 0x80, 0xfa, 0x88, 0x92, 0x38, - 0xd0, 0x31, 0x6b, 0xe6, 0x40, 0x21, 0xd8, 0x3f, 0x54, 0x43, 0x71, 0xc2, 0x84, 0x33, 0x8c, 0x1c, - 0x4a, 0x9f, 0x84, 0x71, 0x77, 0xbe, 0x68, 0x26, 0x18, 0x1e, 0xaa, 0xa1, 0x38, 0x61, 0x92, 0x8d, - 0x3b, 0x95, 0x17, 0xc7, 0x1d, 0xeb, 0xcf, 0x4a, 0x70, 0x6d, 0xe2, 0x5c, 0xd1, 0x0d, 0xa8, 0x06, - 0x69, 0x60, 0x6e, 0x2a, 0x0e, 0x55, 0x11, 0x90, 0x05, 0x26, 0x2b, 0xa8, 0x3c, 0x43, 0x80, 0x7b, - 0x13, 0x2a, 0x27, 0x2a, 0xbe, 0x36, 0xda, 0x4b, 0x8a, 0xb4, 0xc2, 0xc3, 0x26, 0x87, 0x5b, 0x3f, - 0xad, 0xc1, 0xd5, 0xce, 0x88, 0xb2, 0x70, 0xa8, 0x5d, 0xfb, 0x26, 0x0f, 0xcb, 0xf1, 0x29, 0x89, - 0x1f, 0xe2, 0x7d, 0x35, 0x91, 0x44, 0x82, 0xad, 0x11, 0x38, 0xa5, 0xe1, 0x21, 0x94, 0x12, 0x77, - 0x14, 0xcb, 0xf9, 0xd4, 0xd3, 0x10, 0x6a, 0x0b, 0x28, 0x56, 0x58, 0x9e, 0x7d, 0xb8, 0x24, 0x66, - 0xdc, 0x10, 0x0f, 0x1d, 0x36, 0x50, 0x53, 0x4a, 0xb2, 0x8f, 0x8e, 0x81, 0xc3, 0x19, 0x4a, 0x74, - 0x0f, 0x90, 0x14, 0xc7, 0x57, 0x78, 0x70, 0x4a, 0xe2, 0xd8, 0xeb, 0xea, 0xf0, 0xbe, 0xa6, 0xc6, - 0x23, 0x7b, 0x82, 0x02, 0x4f, 0x19, 0x85, 0x28, 0x54, 0x69, 0x44, 0xdc, 0xd5, 0x9a, 0xf0, 0xfc, - 0xdf, 0x2b, 0x60, 0x95, 0xe6, 0xae, 0xb5, 0xec, 0x88, 0xb8, 0xbb, 0x01, 0x8b, 0xc7, 0xe9, 0xa9, - 0x71, 0x10, 0x16, 0xc2, 0x72, 0x41, 0x67, 0xe1, 0xd2, 0x83, 0x8e, 0x91, 0xbd, 0x2c, 0x5e, 0x5e, - 0xf6, 0xb2, 0xf6, 0xbb, 0xd0, 0x48, 0xf6, 0x05, 0xad, 0x48, 0x45, 0x14, 0x1a, 0x25, 0x74, 0x0f, - 0xbd, 0x06, 0xb5, 0x53, 0xc7, 0x1f, 0x29, 0x3d, 0xc6, 0xf2, 0xcf, 0x07, 0xe5, 0xad, 0x92, 0xf5, - 0x0f, 0x25, 0x80, 0x1d, 0x87, 0x39, 0xb7, 0x3c, 0x9f, 0x91, 0x98, 0x9b, 0x45, 0xc4, 0x35, 0x26, - 0x67, 0x16, 0x42, 0x53, 0x04, 0x06, 0x7d, 0x13, 0xaa, 0x6c, 0x1c, 0x69, 0x8b, 0x58, 0xd5, 0x14, - 0x47, 0xe3, 0x88, 0x3c, 0x3d, 0xdb, 0xa8, 0xdf, 0xb3, 0x0f, 0x1e, 0xf0, 0xdf, 0x58, 0x50, 0xa1, - 0x0d, 0x2d, 0x98, 0x87, 0xff, 0x46, 0xbb, 0x71, 0x7e, 0xb6, 0x51, 0xfb, 0x88, 0x03, 0xd4, 0x1c, - 0xd0, 0x87, 0x00, 0x6e, 0x38, 0xe4, 0x1b, 0xc8, 0xc2, 0x58, 0x29, 0xda, 0x0d, 0xbd, 0xc7, 0x9d, - 0x04, 0xf3, 0x34, 0xf3, 0x0f, 0x1b, 0x63, 0x2c, 0x0f, 0x96, 0x77, 0x48, 0x44, 0x82, 0x2e, 0x09, - 0xdc, 0xb1, 0x88, 0xc7, 0x33, 0x18, 0xf7, 0x7b, 0xd0, 0xec, 0xea, 0x41, 0x1e, 0xa1, 0xab, 0x65, - 0x31, 0xbd, 0x15, 0x6e, 0x1d, 0x3b, 0x06, 0x1c, 0x67, 0xa8, 0xac, 0x4f, 0x4b, 0x50, 0xdb, 0xe5, - 0x87, 0x86, 0x86, 0xb0, 0xe8, 0x86, 0x01, 0x23, 0x3f, 0x62, 0xca, 0x4d, 0x16, 0x88, 0xa0, 0x82, - 0x63, 0x47, 0x72, 0x6b, 0x2f, 0xf1, 0xe3, 0x55, 0x7f, 0xb0, 0x96, 0x81, 0xde, 0x80, 0x6a, 0xd7, - 0x61, 0x8e, 0xd8, 0xf4, 0xa6, 0x8c, 0xb2, 0xfc, 0xd0, 0xb0, 0x80, 0x5a, 0xff, 0x59, 0x86, 0xa6, - 0xc9, 0x04, 0xad, 0x41, 0xd9, 0xeb, 0xaa, 0xd5, 0x83, 0x5a, 0x7d, 0xf9, 0xee, 0x0e, 0x2e, 0x7b, - 0x5d, 0xe1, 0x43, 0x64, 0x48, 0x29, 0x67, 0xd3, 0xf0, 0x5c, 0x1e, 0xf8, 0x6d, 0x58, 0xe2, 0x06, - 0x75, 0x2a, 0xb3, 0x18, 0xe5, 0x42, 0x5e, 0x55, 0xc4, 0x4b, 0x5c, 0xd9, 0x74, 0x82, 0x63, 0xd2, - 0xf1, 0xad, 0x17, 0xea, 0x51, 0xcd, 0x6e, 0xbd, 0xa1, 0x12, 0xdb, 0xb0, 0xcc, 0x67, 0x2d, 0xe6, - 0x1a, 0x30, 0x8e, 0x50, 0x05, 0xc1, 0x97, 0x15, 0xf1, 0xf2, 0x4e, 0x16, 0x8d, 0xf3, 0xf4, 0xe8, - 0xeb, 0xb0, 0x48, 0x47, 0xc7, 0x1f, 0x13, 0x57, 0x86, 0xdf, 0x46, 0x6a, 0x18, 0xb6, 0x04, 0x63, - 0x8d, 0x47, 0xfb, 0x50, 0xe5, 0xc5, 0x9b, 0x8a, 0x9f, 0xdf, 0x98, 0x2d, 0xe7, 0x3b, 0xf2, 0x86, - 0xc4, 0x98, 0xbb, 0xc7, 0xd5, 0x86, 0x73, 0xb1, 0x7e, 0x5a, 0x86, 0x65, 0xb1, 0xd3, 0xa9, 0xc6, - 0xcd, 0xa0, 0x6c, 0xdf, 0x86, 0xa5, 0xbe, 0xc3, 0xc8, 0x13, 0x67, 0x2c, 0x6a, 0xc1, 0x72, 0x76, - 0x2b, 0x6f, 0xa7, 0x28, 0x6c, 0xd2, 0xf1, 0xf0, 0x20, 0x54, 0x47, 0x0c, 0xca, 0x45, 0xba, 0x5d, - 0x8d, 0xc0, 0x29, 0x0d, 0x3a, 0x85, 0xc5, 0x9e, 0x30, 0x63, 0xaa, 0x32, 0xae, 0x83, 0x82, 0x4a, - 0x99, 0xae, 0x52, 0xba, 0x07, 0xa9, 0x9d, 0xf2, 0x37, 0xc5, 0x5a, 0x98, 0xf5, 0xbf, 0x65, 0xb8, - 0x3e, 0x95, 0x7e, 0x86, 0xbd, 0x39, 0x56, 0xe7, 0x23, 0x73, 0x83, 0x9d, 0x02, 0xce, 0xd2, 0x1b, - 0x12, 0x35, 0xcb, 0x7a, 0xf6, 0xd4, 0x4c, 0x63, 0xad, 0x5c, 0x82, 0xb1, 0xf6, 0x94, 0xb1, 0x56, - 0x85, 0xff, 0x2f, 0xb0, 0xa4, 0xd4, 0x2f, 0xa7, 0x5b, 0x67, 0x98, 0xfd, 0xdb, 0xd0, 0x34, 0x93, - 0xef, 0x17, 0xfb, 0x6e, 0xeb, 0xef, 0xaa, 0xb0, 0x64, 0xa4, 0x9b, 0x3c, 0x63, 0xe1, 0xe9, 0x79, - 0x29, 0x9b, 0xb1, 0x24, 0xb9, 0xf5, 0xef, 0xc1, 0x2b, 0xae, 0x1f, 0x06, 0x64, 0xc7, 0x8b, 0x45, - 0x4e, 0x36, 0x56, 0xaa, 0xfb, 0x25, 0x45, 0xf9, 0x4a, 0x27, 0x83, 0xc5, 0x39, 0x6a, 0xe4, 0x42, - 0xcd, 0x8d, 0x49, 0x97, 0xaa, 0x5d, 0x6f, 0x17, 0xca, 0x91, 0x3b, 0x9c, 0x93, 0x0c, 0x20, 0xe2, - 0x27, 0x96, 0xbc, 0xe7, 0xef, 0x43, 0xdc, 0x04, 0xa0, 0x74, 0xb0, 0x47, 0xc6, 0x22, 0x35, 0x92, - 0xae, 0x27, 0x89, 0xea, 0xb6, 0x7d, 0x47, 0x61, 0xb0, 0x41, 0x85, 0xbe, 0x09, 0xf5, 0x9e, 0x4e, - 0xa6, 0xa4, 0xc7, 0x59, 0x51, 0x23, 0xea, 0x49, 0x22, 0x95, 0x50, 0x70, 0x17, 0x7b, 0x1c, 0x3b, - 0x81, 0x3b, 0x10, 0x5e, 0xc7, 0x70, 0xb1, 0x6d, 0x01, 0xc5, 0x0a, 0xcb, 0xb7, 0x9f, 0x39, 0xfd, - 0xd5, 0x7a, 0x76, 0xfb, 0x8f, 0x9c, 0x3e, 0xe6, 0x70, 0x8e, 0x8e, 0x49, 0x6f, 0xb5, 0x91, 0x45, - 0x63, 0xd2, 0xc3, 0x1c, 0x8e, 0x86, 0xb0, 0x10, 0x93, 0x61, 0xc8, 0xc8, 0x2a, 0x88, 0xed, 0xbd, - 0x5b, 0x68, 0x7b, 0xb1, 0x60, 0x25, 0xf3, 0x64, 0x59, 0x30, 0x4a, 0x08, 0x56, 0x42, 0xac, 0xbf, - 0x2d, 0x41, 0x5d, 0x1f, 0xc3, 0xff, 0xff, 0x32, 0xc1, 0xfa, 0x1e, 0x2c, 0xe7, 0x56, 0x35, 0x83, - 0x33, 0x7a, 0x03, 0xaa, 0xa3, 0xd8, 0xd7, 0xd9, 0x80, 0x70, 0x23, 0x0f, 0xf1, 0xbe, 0x8d, 0x05, - 0xd4, 0x7a, 0x0f, 0x56, 0xee, 0x1c, 0x1d, 0x1d, 0xda, 0xa3, 0x63, 0xea, 0xc6, 0x5e, 0xc4, 0x54, - 0xb8, 0x8b, 0xc2, 0x58, 0x26, 0x01, 0x35, 0xc3, 0xe6, 0xc2, 0x98, 0x61, 0x81, 0xb1, 0x3e, 0x59, - 0x80, 0x25, 0x3e, 0x4c, 0x27, 0xfd, 0x2f, 0xb0, 0x39, 0x23, 0x7f, 0x2c, 0x5f, 0x62, 0xf7, 0xeb, - 0x0f, 0xa0, 0xc2, 0x7c, 0x6d, 0xa8, 0x9d, 0x02, 0x22, 0xf7, 0x6d, 0xa5, 0x43, 0xa2, 0x94, 0x3d, - 0xda, 0xb7, 0x31, 0x67, 0xcc, 0x4d, 0x62, 0x48, 0xd8, 0x20, 0xec, 0x2a, 0x13, 0x4d, 0x4c, 0xe2, - 0xbe, 0x80, 0x62, 0x85, 0xcd, 0xa5, 0xef, 0xb5, 0x4b, 0x4f, 0xdf, 0xbf, 0x0e, 0x8b, 0x3c, 0x64, - 0x84, 0x23, 0x99, 0x59, 0x54, 0xd2, 0x2d, 0x3b, 0x92, 0x60, 0xac, 0xf1, 0x28, 0x82, 0xc6, 0xb1, - 0xae, 0x9b, 0x55, 0x7a, 0x51, 0x60, 0xe3, 0x92, 0x12, 0x5c, 0x76, 0x1c, 0x92, 0xbf, 0x38, 0x15, - 0x82, 0xfe, 0x18, 0x16, 0x07, 0xc4, 0xe9, 0xf2, 0x9d, 0xa9, 0x8b, 0x9d, 0xc1, 0x17, 0x97, 0x67, - 0xa8, 0x64, 0xeb, 0x8e, 0x64, 0x2a, 0x8b, 0xaa, 0x64, 0xc1, 0x0a, 0x8a, 0xb5, 0xcc, 0xb5, 0x0f, - 0xa0, 0x69, 0x52, 0xce, 0x55, 0x66, 0xfc, 0x79, 0x05, 0xae, 0xed, 0x6d, 0xd9, 0xba, 0xff, 0x70, - 0x18, 0xfa, 0x9e, 0x3b, 0x46, 0x7f, 0x02, 0x0b, 0xbe, 0x73, 0x4c, 0x7c, 0xba, 0x5a, 0x12, 0xeb, - 0x79, 0x74, 0xf1, 0xf5, 0x4c, 0x30, 0x6f, 0xed, 0x0b, 0xce, 0x72, 0x51, 0x89, 0xba, 0x49, 0x20, - 0x56, 0x62, 0x91, 0x0b, 0x8b, 0xc7, 0x8e, 0x7b, 0x12, 0xf6, 0x7a, 0xca, 0xeb, 0x6c, 0xcd, 0xdd, - 0x60, 0x69, 0xcb, 0xf1, 0xe9, 0xbe, 0x29, 0x00, 0xd6, 0x9c, 0x91, 0x0d, 0xd7, 0x49, 0x1c, 0x87, - 0xf1, 0x41, 0xa0, 0x50, 0x4a, 0x95, 0x84, 0xb5, 0xd5, 0xdb, 0x6f, 0xaa, 0x81, 0xd7, 0x77, 0xa7, - 0x11, 0xe1, 0xe9, 0x63, 0xd7, 0xde, 0x87, 0x25, 0x63, 0x81, 0x73, 0x9d, 0xc5, 0x3f, 0xd7, 0xa0, - 0xb9, 0xe7, 0xf4, 0x4e, 0x9c, 0x19, 0x5d, 0xd2, 0x57, 0xa1, 0xc6, 0xc2, 0xc8, 0x73, 0x55, 0xf4, - 0xbf, 0xaa, 0x08, 0x6a, 0x47, 0x1c, 0x88, 0x25, 0x8e, 0x87, 0xe1, 0xc8, 0x89, 0x99, 0xc7, 0x74, - 0xb1, 0x50, 0x4b, 0xc3, 0xf0, 0xa1, 0x46, 0xe0, 0x94, 0x26, 0x67, 0xe9, 0xd5, 0x4b, 0xb7, 0xf4, - 0x2d, 0x68, 0xc6, 0xe4, 0x0f, 0x47, 0x5e, 0x4c, 0xba, 0xdb, 0xee, 0x09, 0x15, 0x89, 0x40, 0x2d, - 0xed, 0x91, 0x60, 0x03, 0x87, 0x33, 0x94, 0x3c, 0x19, 0xe0, 0xe5, 0x67, 0x4c, 0x28, 0x15, 0x4e, - 0xa2, 0x9e, 0x26, 0x03, 0x1d, 0x05, 0xc7, 0x09, 0x05, 0x4f, 0xa2, 0x7a, 0xfe, 0x88, 0x0e, 0x6e, - 0x71, 0x1e, 0x3c, 0x35, 0x16, 0xbe, 0xa2, 0x96, 0x26, 0x51, 0xb7, 0x32, 0x58, 0x9c, 0xa3, 0xd6, - 0x9e, 0xb9, 0xfe, 0xeb, 0xf2, 0xcc, 0x46, 0xc0, 0x69, 0x5c, 0x62, 0xc0, 0xd9, 0x86, 0xe5, 0x44, - 0x17, 0xbc, 0xa0, 0xbf, 0x47, 0xc6, 0x22, 0x8d, 0x31, 0xaa, 0xc0, 0xc3, 0x2c, 0x1a, 0xe7, 0xe9, - 0xad, 0x00, 0x56, 0x1e, 0x6c, 0x1f, 0xd9, 0x99, 0x78, 0x3c, 0x77, 0x4b, 0xcd, 0x28, 0x25, 0xcb, - 0xcf, 0x2f, 0x25, 0xad, 0x9f, 0x55, 0x60, 0x89, 0x0b, 0x9c, 0xd1, 0x6c, 0x66, 0xe7, 0x6c, 0x9e, - 0x41, 0xe5, 0x0b, 0xbb, 0xf2, 0xba, 0x7c, 0x13, 0x54, 0xaa, 0x5d, 0xfb, 0x35, 0xa9, 0xb6, 0xf5, - 0xab, 0x1a, 0xc0, 0x83, 0xb0, 0x4b, 0x6c, 0xe6, 0xb0, 0x11, 0x7d, 0x6e, 0x57, 0x44, 0xe7, 0x86, - 0xe5, 0xe7, 0x15, 0xf1, 0x5d, 0x8f, 0x46, 0xbe, 0x2a, 0xe2, 0x73, 0xfd, 0x90, 0x9d, 0x14, 0x85, - 0x4d, 0xba, 0xa4, 0x5d, 0x56, 0x9d, 0xde, 0x2e, 0xe3, 0xd3, 0x33, 0x7a, 0x23, 0x6f, 0x43, 0x2d, - 0x1a, 0x38, 0x54, 0x77, 0x44, 0x74, 0xc7, 0xb5, 0x76, 0xc8, 0x81, 0x4f, 0x79, 0x45, 0x13, 0x76, - 0x89, 0xf8, 0x83, 0x25, 0x21, 0x7a, 0x0c, 0x0d, 0xca, 0x9c, 0x98, 0x91, 0xee, 0xb6, 0xbe, 0x8b, - 0xd8, 0x9c, 0xad, 0xc9, 0x71, 0xdf, 0x73, 0xe3, 0x50, 0x74, 0x3a, 0x52, 0x0b, 0xd1, 0x9c, 0x70, - 0xca, 0x14, 0xf5, 0x60, 0x89, 0x3b, 0x33, 0x9f, 0x48, 0x19, 0x8b, 0x17, 0x93, 0x91, 0xec, 0x54, - 0x27, 0xe5, 0x85, 0x4d, 0xc6, 0xdc, 0x5e, 0x86, 0x84, 0x52, 0xa7, 0x4f, 0x54, 0x45, 0x94, 0x28, - 0xee, 0x7d, 0x09, 0xc6, 0x1a, 0x8f, 0x1e, 0x43, 0x4d, 0xe8, 0x84, 0xa8, 0x8d, 0x96, 0x6e, 0x7e, - 0xb7, 0x60, 0x39, 0x2f, 0xab, 0x4a, 0xf1, 0x13, 0x4b, 0xc6, 0x7c, 0x5b, 0x47, 0x51, 0xd7, 0x91, - 0x4b, 0x86, 0x82, 0xdb, 0xfa, 0x50, 0x73, 0xc2, 0x29, 0x53, 0xe4, 0x02, 0xc4, 0x84, 0x86, 0xfe, - 0xa9, 0x10, 0xb1, 0x74, 0x31, 0x11, 0x89, 0x85, 0xe1, 0x84, 0x15, 0x36, 0xd8, 0x5a, 0x3f, 0xa9, - 0xc2, 0xca, 0x41, 0x44, 0x82, 0x47, 0x03, 0x8f, 0x9e, 0x68, 0xbf, 0x75, 0x03, 0xaa, 0x83, 0x90, - 0xb2, 0x7c, 0x1d, 0x74, 0x27, 0xa4, 0x0c, 0x0b, 0x0c, 0x3f, 0x0a, 0xdd, 0xf7, 0xcb, 0xb9, 0x2e, - 0xdd, 0xf3, 0xd3, 0xf8, 0xb9, 0xaf, 0x63, 0xc4, 0xfb, 0x86, 0x11, 0x1b, 0x1c, 0x85, 0x27, 0x24, - 0x50, 0x6d, 0xaa, 0xb9, 0xde, 0x37, 0xe8, 0xb1, 0x38, 0x65, 0xc3, 0x4b, 0x7a, 0x27, 0x7d, 0x6b, - 0x91, 0x2b, 0xe9, 0xb7, 0xd3, 0x97, 0x16, 0x06, 0xd5, 0x6f, 0xea, 0x33, 0x83, 0x7f, 0x2c, 0xc3, - 0x82, 0x2d, 0x98, 0xa0, 0xc7, 0x50, 0xe7, 0x1a, 0x25, 0x7a, 0x55, 0xb2, 0x88, 0x7f, 0x7b, 0x36, - 0xfd, 0x3b, 0x10, 0x51, 0xeb, 0x3e, 0x61, 0x4e, 0x2a, 0x2e, 0x85, 0xe1, 0x84, 0x2b, 0xea, 0xa9, - 0x1b, 0xa0, 0xc2, 0xcd, 0x3d, 0x39, 0x63, 0x3b, 0x22, 0xee, 0xd4, 0x4b, 0x9f, 0x00, 0x16, 0xa8, - 0xf0, 0xf1, 0xc5, 0xfb, 0x7b, 0x4a, 0x92, 0xe0, 0x66, 0xf4, 0xc6, 0xc5, 0x7f, 0xac, 0xa4, 0x58, - 0xff, 0x56, 0x02, 0x90, 0x84, 0xfb, 0x1e, 0x65, 0xe8, 0x07, 0x13, 0x1b, 0xd9, 0x9a, 0x6d, 0x23, - 0xf9, 0x68, 0xb1, 0x8d, 0x49, 0x02, 0xa9, 0x21, 0xc6, 0x26, 0x12, 0xa8, 0x79, 0x8c, 0x0c, 0xa9, - 0xea, 0x07, 0x7c, 0x58, 0x74, 0x6d, 0x69, 0x02, 0x7f, 0x97, 0xb3, 0xc5, 0x92, 0xbb, 0xf5, 0xaf, - 0x25, 0x58, 0x96, 0x04, 0xba, 0x8e, 0xa2, 0xe8, 0x31, 0x40, 0x97, 0x44, 0x7e, 0x38, 0x1e, 0x72, - 0x67, 0x7b, 0x51, 0x1d, 0x79, 0x85, 0xeb, 0xc7, 0x4e, 0xc2, 0x07, 0x1b, 0x3c, 0xd1, 0x23, 0x58, - 0xe4, 0xb9, 0x98, 0xe7, 0xea, 0x0e, 0xf0, 0xfc, 0xec, 0x45, 0x13, 0xd6, 0x96, 0x4c, 0xb0, 0xe6, - 0x66, 0xfd, 0x4b, 0x43, 0x1f, 0x11, 0xd7, 0x13, 0xf4, 0x49, 0x29, 0x77, 0xe1, 0x23, 0x0b, 0xce, - 0xbb, 0x2f, 0xad, 0x41, 0x9e, 0x56, 0x0e, 0xcf, 0xbe, 0x3f, 0x42, 0x21, 0xd4, 0x99, 0x34, 0x58, - 0x7d, 0x9a, 0xdb, 0x85, 0x4d, 0x3f, 0xd5, 0x1d, 0x05, 0xa0, 0x38, 0x11, 0x82, 0x22, 0xa8, 0x33, - 0x32, 0x8c, 0x7c, 0x87, 0x91, 0xe2, 0x4d, 0xd8, 0x23, 0xc5, 0xc9, 0x90, 0xa8, 0x20, 0x38, 0x91, - 0x82, 0xfe, 0x08, 0x9a, 0xd4, 0x48, 0xc8, 0x95, 0x87, 0x2f, 0x62, 0x90, 0x06, 0x37, 0x79, 0x41, - 0x67, 0x42, 0x70, 0x46, 0x1a, 0x0f, 0x5c, 0xae, 0x17, 0xbb, 0x23, 0x8f, 0xa9, 0x28, 0x90, 0x38, - 0xe2, 0x8e, 0x04, 0x63, 0x8d, 0x47, 0x3f, 0x29, 0xc1, 0x4a, 0x37, 0x7b, 0x6f, 0xa8, 0xef, 0x8b, - 0x0b, 0x68, 0x45, 0xee, 0x26, 0x32, 0x49, 0xf8, 0x56, 0x72, 0x08, 0x8a, 0x27, 0x84, 0xa3, 0x7b, - 0x80, 0x54, 0xad, 0x7f, 0xcb, 0xf1, 0x7c, 0xd2, 0xc5, 0xe1, 0x28, 0xe8, 0x8a, 0x7c, 0xab, 0x9e, - 0xde, 0xbd, 0xef, 0x4e, 0x50, 0xe0, 0x29, 0xa3, 0xd0, 0xa7, 0x25, 0xb8, 0xaa, 0x4c, 0x41, 0xb6, - 0x09, 0x54, 0xc7, 0xe8, 0xd1, 0xcb, 0xf0, 0xc1, 0x2d, 0xdb, 0xe4, 0x2c, 0x3b, 0x2c, 0xd7, 0xd5, - 0x04, 0xaf, 0x66, 0x70, 0x38, 0x3b, 0x09, 0xf4, 0x37, 0x25, 0xf9, 0xbe, 0xc0, 0x73, 0xc9, 0x76, - 0x10, 0x84, 0x4c, 0x3c, 0x82, 0xa2, 0xaa, 0xf0, 0xfc, 0xc1, 0xcb, 0x9c, 0x9b, 0xc1, 0x5e, 0x4e, - 0x30, 0xf3, 0x7a, 0x21, 0x4b, 0x80, 0xa7, 0xcc, 0x69, 0xed, 0x43, 0x40, 0x93, 0xcb, 0x9c, 0xa7, - 0xcf, 0xb2, 0xb6, 0x0b, 0x5f, 0x7e, 0xc6, 0x64, 0xe6, 0x6a, 0xd7, 0xfc, 0x6c, 0x11, 0x9a, 0x66, - 0x54, 0x4a, 0x8b, 0x84, 0xd2, 0xac, 0x45, 0xc2, 0xef, 0x9b, 0x45, 0x42, 0x79, 0xee, 0x9b, 0xd0, - 0xe7, 0xd7, 0x07, 0x4e, 0xb6, 0x3e, 0xa8, 0xcc, 0xcd, 0x7e, 0xae, 0xd2, 0xa0, 0xfa, 0x82, 0xd2, - 0xe0, 0x14, 0x6a, 0x41, 0xd8, 0x25, 0xb4, 0xf8, 0xab, 0x13, 0x73, 0xcf, 0x5b, 0x7c, 0x4b, 0x95, - 0x22, 0x25, 0xe1, 0x53, 0xc0, 0xb0, 0x14, 0x87, 0x6e, 0xc3, 0x35, 0xe5, 0x75, 0x3b, 0x63, 0xd7, - 0x27, 0x9d, 0x70, 0x14, 0xc8, 0x7a, 0xac, 0xd6, 0x7e, 0x5d, 0x0d, 0xb8, 0x76, 0x94, 0x27, 0xc0, - 0x93, 0x63, 0xd0, 0x0f, 0x01, 0x99, 0x40, 0x29, 0x5f, 0x5d, 0x24, 0x6d, 0x6a, 0x1d, 0x3e, 0x9a, - 0xa0, 0x78, 0x9a, 0xe3, 0xcf, 0xa1, 0x04, 0x4f, 0x61, 0x85, 0xfa, 0x70, 0xd5, 0x77, 0x28, 0x13, - 0x20, 0xbe, 0xff, 0xaa, 0xb5, 0x34, 0xcf, 0x89, 0x25, 0xc6, 0xbe, 0x6f, 0x32, 0xc2, 0x59, 0xbe, - 0xe8, 0x14, 0x1a, 0xfa, 0x95, 0x19, 0x55, 0x95, 0xda, 0xdd, 0xa2, 0xc7, 0x91, 0xe4, 0x26, 0xb2, - 0x1a, 0x48, 0xfe, 0xe2, 0x54, 0xd4, 0xda, 0x8f, 0x65, 0xd5, 0xff, 0x4c, 0x53, 0xfb, 0xbe, 0x69, - 0x6a, 0x85, 0xd2, 0xd2, 0xb4, 0xb9, 0x60, 0x1a, 0xec, 0x7f, 0x97, 0xa1, 0x69, 0xfb, 0x8e, 0x9b, - 0x14, 0x5c, 0xd9, 0x9c, 0xbf, 0x74, 0xe9, 0x7d, 0x96, 0x87, 0x00, 0x54, 0xcc, 0x47, 0xd4, 0x5c, - 0x73, 0x5d, 0xaf, 0x89, 0xdc, 0xcd, 0x4e, 0x06, 0x63, 0x83, 0xd1, 0xfc, 0xa5, 0x1f, 0x8f, 0xce, - 0x03, 0x27, 0x08, 0x88, 0x9f, 0x37, 0xe3, 0x8e, 0x04, 0x63, 0x8d, 0x37, 0x2d, 0xbe, 0xf6, 0x7c, - 0x8b, 0xb7, 0x7e, 0x55, 0x05, 0x64, 0x33, 0x27, 0xe8, 0x3a, 0x71, 0x77, 0x6f, 0x2b, 0xe9, 0xce, - 0x3d, 0xf3, 0xf5, 0x6f, 0xe9, 0x8b, 0x78, 0xfd, 0x6b, 0x3c, 0xe3, 0x2e, 0x5f, 0xca, 0x33, 0xee, - 0x07, 0xe6, 0x33, 0x6e, 0x79, 0x38, 0x6f, 0x4f, 0x7b, 0xc6, 0xfd, 0x95, 0xbd, 0xd1, 0x31, 0x89, - 0x03, 0xc2, 0x08, 0xd5, 0x73, 0x9d, 0xe1, 0x31, 0xf7, 0xe5, 0xf7, 0x0a, 0x7b, 0x70, 0x35, 0x72, - 0x98, 0x3b, 0xb0, 0x59, 0xec, 0x30, 0xd2, 0x1f, 0x2b, 0xb5, 0xf8, 0x50, 0x7b, 0xa2, 0x43, 0x13, - 0xf9, 0xf4, 0x6c, 0xe3, 0xb7, 0x9f, 0xf5, 0x35, 0x07, 0x1b, 0x47, 0x84, 0xb6, 0x04, 0xb9, 0x68, - 0xbc, 0x65, 0xd9, 0xa2, 0x9b, 0x00, 0xbe, 0x77, 0x4a, 0x0e, 0xd2, 0xd7, 0x45, 0xf5, 0x74, 0x6e, - 0xfb, 0x09, 0x06, 0x1b, 0x54, 0xd6, 0x26, 0x34, 0xa5, 0x17, 0x50, 0xd7, 0x5a, 0x1b, 0x50, 0x73, - 0x7c, 0x3f, 0x7c, 0x22, 0x4c, 0xbd, 0x26, 0xbb, 0x4b, 0xdb, 0x1c, 0x80, 0x25, 0xdc, 0x3a, 0x2f, - 0x41, 0x26, 0x8b, 0x45, 0x03, 0xa8, 0x0e, 0x18, 0x8b, 0x8a, 0x3f, 0xf1, 0xcf, 0x5f, 0x50, 0xcb, - 0x4b, 0x6c, 0x0e, 0xc5, 0x42, 0x02, 0x97, 0x14, 0x38, 0x8c, 0x16, 0xd7, 0xc2, 0x7c, 0xeb, 0x5d, - 0x4a, 0xe2, 0x50, 0x2c, 0x24, 0x58, 0x7f, 0x5f, 0x82, 0x46, 0xd2, 0x99, 0xe5, 0xfb, 0xea, 0x3a, - 0x1d, 0x12, 0xb3, 0xc3, 0xf4, 0x89, 0x4a, 0xb2, 0xaf, 0x9d, 0x6d, 0x8d, 0xc1, 0x06, 0x95, 0x7c, - 0x7f, 0xe2, 0x91, 0x80, 0x25, 0xe3, 0x26, 0xde, 0x9f, 0x98, 0x58, 0x9c, 0xa3, 0x46, 0xdf, 0x81, - 0xab, 0x12, 0xa2, 0x1f, 0x7b, 0x48, 0x3b, 0x48, 0xa2, 0x57, 0xc7, 0x44, 0xe2, 0x2c, 0xad, 0xf5, - 0x17, 0x15, 0x48, 0xea, 0x1b, 0xfd, 0x2c, 0x96, 0xa7, 0x72, 0xae, 0xcb, 0xc3, 0xb4, 0xf1, 0x51, - 0xcf, 0x44, 0x62, 0x99, 0x52, 0xe0, 0x29, 0xa3, 0xd0, 0x3d, 0xf1, 0x62, 0x9d, 0x39, 0x5c, 0x25, - 0xd5, 0x31, 0xbc, 0x39, 0xcd, 0x19, 0x77, 0x34, 0x51, 0xf2, 0x06, 0x5d, 0xfe, 0xc5, 0xe9, 0x70, - 0xb4, 0x0b, 0x8b, 0xa7, 0xa1, 0x3f, 0x1a, 0x12, 0xfd, 0x7d, 0xc5, 0xda, 0x34, 0x4e, 0x1f, 0x09, - 0x12, 0xa3, 0x89, 0x27, 0x87, 0x60, 0x3d, 0x16, 0x11, 0x58, 0x16, 0x2f, 0x87, 0x3d, 0x36, 0x56, - 0xaf, 0x99, 0x54, 0xdd, 0xf6, 0xb5, 0x69, 0xec, 0x0e, 0xc3, 0xae, 0x9d, 0xa5, 0x6e, 0xbf, 0x7a, - 0x7e, 0xb6, 0xb1, 0x9c, 0x03, 0xe2, 0x3c, 0x4f, 0xf4, 0x7e, 0xf2, 0x20, 0x98, 0xf3, 0xfe, 0xca, - 0xb3, 0x78, 0x47, 0xc4, 0x95, 0xca, 0x94, 0x76, 0x78, 0x2c, 0x1b, 0x20, 0x7d, 0xe0, 0x85, 0xbe, - 0x0a, 0x35, 0x91, 0x7f, 0xaa, 0x13, 0x48, 0x32, 0x32, 0x91, 0x9f, 0x62, 0x89, 0x43, 0x37, 0xa0, - 0x4a, 0x59, 0x18, 0xe5, 0x5b, 0xfa, 0x36, 0x0b, 0x23, 0x2c, 0x30, 0xd6, 0x7f, 0x95, 0x61, 0x51, - 0x87, 0x0b, 0x6a, 0x54, 0xca, 0xa5, 0xa2, 0xb9, 0x8a, 0x62, 0x9a, 0x14, 0xcc, 0xcd, 0x67, 0x14, - 0xcb, 0x59, 0xa7, 0x5a, 0xbe, 0x74, 0xa7, 0x7a, 0x02, 0x0b, 0x91, 0x70, 0x59, 0x2a, 0x6b, 0xbf, - 0x5d, 0x5c, 0xb6, 0x60, 0x27, 0x23, 0x92, 0xfc, 0x8d, 0x95, 0x08, 0xeb, 0x7f, 0x4a, 0xb0, 0x92, - 0x9f, 0x21, 0x3a, 0x81, 0x0a, 0x8d, 0x5d, 0xb5, 0xe3, 0x87, 0x2f, 0x6f, 0xe9, 0x32, 0x1a, 0xca, - 0xfb, 0x20, 0x3b, 0x76, 0x31, 0x97, 0xc2, 0x35, 0xa2, 0x4b, 0x28, 0xcb, 0x6b, 0xc4, 0x0e, 0xa1, - 0x0c, 0x0b, 0x0c, 0xda, 0x9f, 0x8c, 0x9a, 0xad, 0x69, 0x51, 0xf3, 0xf5, 0xbc, 0xbc, 0x69, 0x31, - 0xd3, 0xfa, 0xf7, 0x32, 0x7c, 0x69, 0xfa, 0xc4, 0xb8, 0x6b, 0x4b, 0xeb, 0x7f, 0xc3, 0x99, 0x24, - 0xae, 0x6d, 0x27, 0x83, 0xc5, 0x39, 0x6a, 0xe1, 0x4e, 0xa5, 0x55, 0xe9, 0xcf, 0x04, 0x4d, 0x77, - 0x9a, 0x60, 0xb0, 0x41, 0x85, 0xb6, 0x61, 0x59, 0xfd, 0x3b, 0x32, 0x7b, 0x42, 0xc6, 0x95, 0x6b, - 0x27, 0x8b, 0xc6, 0x79, 0x7a, 0x9e, 0x96, 0x75, 0x1d, 0xe6, 0x70, 0x99, 0xb9, 0x0c, 0x6e, 0x47, - 0x82, 0xb1, 0xc6, 0xa3, 0x2d, 0x68, 0xf2, 0x9f, 0x89, 0xa8, 0x5a, 0xf6, 0x1b, 0x84, 0x1d, 0x03, - 0x87, 0x33, 0x94, 0xe9, 0x9b, 0x71, 0xf9, 0xd2, 0x6e, 0xe2, 0xcd, 0xb8, 0xf5, 0xcb, 0x12, 0x5c, - 0xcd, 0xe8, 0x1b, 0xea, 0x41, 0xe5, 0x64, 0x8b, 0x2a, 0x35, 0xda, 0x7b, 0x89, 0xaf, 0x48, 0xa4, - 0x06, 0xed, 0x6d, 0x51, 0xcc, 0x05, 0xa0, 0x8f, 0x93, 0x46, 0x73, 0xb9, 0x70, 0x5f, 0xcb, 0xc8, - 0x18, 0x54, 0x06, 0x97, 0x6d, 0x32, 0xef, 0x26, 0x8b, 0xb4, 0x9f, 0x78, 0xcc, 0x1d, 0xa0, 0xd7, - 0xa1, 0xe2, 0x04, 0x63, 0x91, 0x54, 0x34, 0xe4, 0xbc, 0xb6, 0x83, 0x31, 0xe6, 0x30, 0x81, 0xf2, - 0x7d, 0xf5, 0x6e, 0x4d, 0xa2, 0x7c, 0x1f, 0x73, 0x98, 0xf5, 0xd7, 0x0d, 0x58, 0xce, 0xf9, 0xa3, - 0x19, 0x5e, 0xc2, 0x9d, 0xc0, 0x02, 0x15, 0x52, 0xd5, 0x42, 0x8b, 0x7b, 0x06, 0xb9, 0x08, 0xb5, - 0x52, 0xf1, 0x1b, 0x2b, 0x11, 0xa8, 0x2f, 0x4f, 0x4f, 0xfa, 0xa0, 0xfd, 0x42, 0x5b, 0x9a, 0xab, - 0x02, 0x72, 0xc7, 0xf7, 0x49, 0x09, 0x9a, 0x8e, 0xf1, 0xd9, 0xa2, 0x8a, 0x72, 0xf7, 0x8b, 0xe4, - 0xe2, 0x13, 0x5f, 0x6c, 0xca, 0x26, 0xa5, 0x89, 0xc0, 0x19, 0xa1, 0xc8, 0x55, 0xc9, 0x5e, 0xad, - 0xe8, 0x97, 0x63, 0xc6, 0x1b, 0xae, 0x89, 0x3c, 0xef, 0x09, 0x34, 0x9c, 0x27, 0x54, 0x7e, 0x94, - 0xac, 0xee, 0x85, 0x8b, 0x94, 0x1c, 0xb9, 0xef, 0x9b, 0xd5, 0x5d, 0x9c, 0x86, 0xe2, 0x54, 0x16, - 0x8a, 0x61, 0xc1, 0x15, 0xdf, 0xeb, 0xa8, 0x9b, 0xe2, 0xdb, 0x2f, 0xe9, 0xbb, 0x9f, 0xf6, 0x35, - 0x91, 0xb2, 0x99, 0x20, 0xac, 0x24, 0xa1, 0x3e, 0xd4, 0x4e, 0x9c, 0xde, 0x89, 0xa3, 0x5a, 0x19, - 0x05, 0xac, 0xd2, 0x7c, 0x17, 0x25, 0x3d, 0x8f, 0x80, 0x60, 0xc9, 0x9f, 0x1f, 0x9d, 0xc8, 0x9e, - 0x1b, 0x45, 0x8f, 0xce, 0x78, 0x47, 0x92, 0x4f, 0x9c, 0xf9, 0x6a, 0x44, 0x95, 0xad, 0xee, 0x9d, - 0x8b, 0xf8, 0x18, 0xa3, 0x0b, 0x21, 0x57, 0x23, 0x20, 0x58, 0xf2, 0xe7, 0x3a, 0x12, 0xea, 0xcb, - 0x61, 0x75, 0x03, 0x5d, 0x40, 0x47, 0xf2, 0xf7, 0xcc, 0x52, 0x47, 0x12, 0x28, 0x4e, 0x65, 0x59, - 0x2e, 0x2c, 0x19, 0x5f, 0x74, 0xce, 0xf0, 0xd1, 0xd1, 0x4d, 0x80, 0x53, 0x12, 0x7b, 0xbd, 0x31, - 0xcf, 0xed, 0xd5, 0xc7, 0x6f, 0x49, 0xb8, 0xfb, 0x28, 0xc1, 0x60, 0x83, 0xaa, 0xdd, 0xfa, 0xec, - 0xf3, 0xf5, 0x2b, 0x3f, 0xff, 0x7c, 0xfd, 0xca, 0x2f, 0x3e, 0x5f, 0xbf, 0xf2, 0xa7, 0xe7, 0xeb, - 0xa5, 0xcf, 0xce, 0xd7, 0x4b, 0x3f, 0x3f, 0x5f, 0x2f, 0xfd, 0xe2, 0x7c, 0xbd, 0xf4, 0x1f, 0xe7, - 0xeb, 0xa5, 0xbf, 0xfa, 0xe5, 0xfa, 0x95, 0xef, 0xd7, 0xf5, 0xfc, 0xff, 0x2f, 0x00, 0x00, 0xff, - 0xff, 0x83, 0x03, 0x4a, 0xd5, 0x7f, 0x41, 0x00, 0x00, + 0xc3, 0x5e, 0x53, 0x01, 0x7c, 0x9b, 0x79, 0xef, 0xd5, 0x7b, 0x55, 0xaf, 0x5e, 0xbd, 0xaf, 0xaa, + 0x86, 0x3b, 0x7d, 0x8f, 0x0d, 0x46, 0xc7, 0x2d, 0x37, 0x1c, 0x6e, 0x3a, 0x71, 0x3f, 0x8c, 0xe2, + 0xf0, 0x63, 0xf1, 0xe3, 0x5b, 0xe4, 0x94, 0x04, 0x8c, 0x6e, 0x46, 0x27, 0xfd, 0x4d, 0x27, 0xf2, + 0xe8, 0x26, 0x25, 0x01, 0x0d, 0xe3, 0xcd, 0xd3, 0x77, 0x1c, 0x3f, 0x1a, 0x38, 0xef, 0x6c, 0xf6, + 0x49, 0x40, 0x62, 0x87, 0x91, 0x6e, 0x2b, 0x8a, 0x43, 0x16, 0xa2, 0xad, 0x94, 0x53, 0x4b, 0x73, + 0x12, 0x3f, 0x7e, 0x28, 0x39, 0xb5, 0xa2, 0x93, 0x7e, 0x8b, 0x73, 0x6a, 0x49, 0x4e, 0x2d, 0xcd, + 0x69, 0xed, 0xbb, 0x33, 0xcf, 0xc1, 0x0d, 0x87, 0xc3, 0x30, 0xc8, 0x8b, 0x5e, 0xfb, 0x96, 0xc1, + 0xa0, 0x1f, 0xf6, 0xc3, 0x4d, 0x01, 0x3e, 0x1e, 0xf5, 0xc4, 0x3f, 0xf1, 0x47, 0xfc, 0x52, 0xe4, + 0xd6, 0xc9, 0x16, 0x6d, 0x79, 0x21, 0x67, 0xb9, 0xe9, 0x86, 0x31, 0xd9, 0x3c, 0x9d, 0x58, 0xcd, + 0xda, 0x7b, 0x29, 0xcd, 0xd0, 0x71, 0x07, 0x5e, 0x40, 0xe2, 0x71, 0x3a, 0x8f, 0x21, 0x61, 0xce, + 0xb4, 0x51, 0x9b, 0xcf, 0x1a, 0x15, 0x8f, 0x02, 0xe6, 0x0d, 0xc9, 0xc4, 0x80, 0xdf, 0x7a, 0xd1, + 0x00, 0xea, 0x0e, 0xc8, 0xd0, 0xc9, 0x8f, 0xb3, 0xfe, 0xb1, 0x0a, 0x2b, 0xdb, 0x8f, 0xec, 0x7d, + 0x67, 0x78, 0xdc, 0x75, 0x8e, 0x62, 0xaf, 0xdf, 0x27, 0x31, 0xda, 0x82, 0x66, 0x6f, 0x14, 0xb8, + 0xcc, 0x0b, 0x83, 0x07, 0xce, 0x90, 0xac, 0x96, 0x6e, 0x94, 0xde, 0x6a, 0xb4, 0x5f, 0xfb, 0xec, + 0x6c, 0xe3, 0xca, 0xf9, 0xd9, 0x46, 0xf3, 0x96, 0x81, 0xc3, 0x19, 0x4a, 0x84, 0xa1, 0xe1, 0xb8, + 0x2e, 0xa1, 0x74, 0x8f, 0x8c, 0x57, 0xcb, 0x37, 0x4a, 0x6f, 0x2d, 0xdd, 0xfc, 0x8d, 0x96, 0x9c, + 0x1a, 0xdf, 0xb2, 0x16, 0xd7, 0x52, 0xeb, 0xf4, 0x9d, 0x96, 0x4d, 0xdc, 0x98, 0xb0, 0x3d, 0x32, + 0xb6, 0x89, 0x4f, 0x5c, 0x16, 0xc6, 0xed, 0xab, 0xe7, 0x67, 0x1b, 0x8d, 0x6d, 0x3d, 0x16, 0xa7, + 0x6c, 0x38, 0x4f, 0xaa, 0xc9, 0x57, 0x2b, 0x73, 0xf3, 0x4c, 0xc0, 0x38, 0x65, 0x83, 0x36, 0xa1, + 0x11, 0x38, 0x43, 0x42, 0x23, 0xc7, 0x25, 0xab, 0x55, 0xb1, 0xbc, 0x6b, 0x6a, 0x79, 0x8d, 0x07, + 0x1a, 0x81, 0x53, 0x1a, 0xf4, 0x35, 0x58, 0x88, 0x49, 0xdf, 0x0b, 0x83, 0xd5, 0x9a, 0xa0, 0x7e, + 0x45, 0x51, 0x2f, 0x60, 0x01, 0xc5, 0x0a, 0x8b, 0x46, 0xb0, 0x18, 0x39, 0x63, 0x3f, 0x74, 0xba, + 0xab, 0x0b, 0x37, 0x2a, 0x6f, 0x2d, 0xdd, 0xbc, 0xd7, 0xba, 0xa8, 0x39, 0xb7, 0xd4, 0x76, 0x1c, + 0x3a, 0xb1, 0x33, 0x24, 0x8c, 0xc4, 0xed, 0x65, 0x25, 0x74, 0xf1, 0x50, 0x8a, 0xc0, 0x5a, 0x16, + 0xfa, 0x31, 0x40, 0xa4, 0xc9, 0xe8, 0xea, 0xe2, 0x4b, 0x97, 0x8c, 0x94, 0x64, 0x48, 0x40, 0x14, + 0x1b, 0x12, 0xad, 0xb3, 0x0a, 0xbc, 0xba, 0x1d, 0xf7, 0xc3, 0x47, 0x61, 0x7c, 0xd2, 0xf3, 0xc3, + 0x27, 0xda, 0x92, 0x02, 0x58, 0xa0, 0xe1, 0x28, 0x76, 0xa5, 0x0d, 0x15, 0x9a, 0xd3, 0x76, 0xcc, + 0xbc, 0x9e, 0xe3, 0xb2, 0xfd, 0xd0, 0x75, 0xb8, 0xbd, 0xb5, 0x81, 0xab, 0xdf, 0x16, 0xdc, 0xb1, + 0x92, 0x82, 0xee, 0x40, 0x23, 0x8c, 0xb8, 0x81, 0xf3, 0x9d, 0x2a, 0x8b, 0x9d, 0xfa, 0x86, 0xde, + 0xd7, 0x03, 0x8d, 0x78, 0x7a, 0xb6, 0x71, 0xdd, 0x9c, 0x6c, 0x82, 0xc0, 0xe9, 0xe0, 0x9c, 0x46, + 0x2b, 0x97, 0xad, 0x51, 0xf4, 0xe7, 0x25, 0x78, 0xad, 0x1f, 0x87, 0xa3, 0xe8, 0x23, 0x12, 0x53, + 0x3e, 0x37, 0xa2, 0x14, 0x59, 0x15, 0x8a, 0xfc, 0xc0, 0x38, 0x01, 0xc9, 0x81, 0x4f, 0xc5, 0x73, + 0xbf, 0xc2, 0xcf, 0xc4, 0xed, 0x29, 0x1c, 0xda, 0x6f, 0x28, 0xd1, 0xaf, 0x4d, 0xc3, 0xe2, 0xa9, + 0x52, 0xad, 0x4f, 0x6b, 0xb0, 0x92, 0xdf, 0x01, 0x64, 0x43, 0x99, 0xbe, 0xab, 0x76, 0xf6, 0x3b, + 0xb3, 0xeb, 0x46, 0x3a, 0xdf, 0x96, 0xfd, 0xae, 0x66, 0xd8, 0x5e, 0x38, 0x3f, 0xdb, 0x28, 0xdb, + 0xef, 0xe2, 0x32, 0x7d, 0x17, 0x59, 0xb0, 0xe0, 0x05, 0xbe, 0x17, 0x10, 0xb5, 0x7f, 0x62, 0x9b, + 0xef, 0x0a, 0x08, 0x56, 0x18, 0xd4, 0x85, 0x6a, 0xcf, 0xf3, 0x89, 0xf2, 0x06, 0xb7, 0x2e, 0xbe, + 0x2d, 0xb7, 0x3c, 0x9f, 0x24, 0xb3, 0xa8, 0x9f, 0x9f, 0x6d, 0x54, 0x39, 0x04, 0x0b, 0xee, 0xe8, + 0x31, 0x54, 0x46, 0xb1, 0xaf, 0x14, 0xbe, 0x7b, 0x71, 0x21, 0x0f, 0xf1, 0x7e, 0x22, 0x63, 0xf1, + 0xfc, 0x6c, 0xa3, 0xf2, 0x10, 0xef, 0x63, 0xce, 0x1a, 0xfd, 0x08, 0x1a, 0x6e, 0x18, 0xf4, 0xbc, + 0xfe, 0xd0, 0x89, 0x84, 0x63, 0x59, 0xba, 0xb9, 0x77, 0x71, 0x39, 0x1d, 0xcd, 0x2a, 0x91, 0x26, + 0x1c, 0x60, 0x02, 0xc6, 0xa9, 0x30, 0xbe, 0xb6, 0xbe, 0xc7, 0x56, 0x17, 0x8a, 0xae, 0xed, 0xb6, + 0xc7, 0xb2, 0x6b, 0xbb, 0xed, 0x31, 0xcc, 0x59, 0x23, 0x17, 0xea, 0xb1, 0xb6, 0xd9, 0x45, 0x21, + 0xe6, 0xfd, 0xb9, 0x4d, 0x24, 0x31, 0xd9, 0xe6, 0xf9, 0xd9, 0x46, 0x3d, 0x31, 0xd1, 0x84, 0xb1, + 0x75, 0x56, 0x82, 0x46, 0xdb, 0xa1, 0x9e, 0xbb, 0x3d, 0x62, 0x03, 0x74, 0x00, 0xf5, 0x11, 0x25, + 0x71, 0xa0, 0x63, 0xd6, 0xcc, 0x81, 0x42, 0xb0, 0x7f, 0xa8, 0x86, 0xe2, 0x84, 0x09, 0x67, 0x18, + 0x39, 0x94, 0x3e, 0x09, 0xe3, 0xee, 0x7c, 0xd1, 0x4c, 0x30, 0x3c, 0x54, 0x43, 0x71, 0xc2, 0x24, + 0x1b, 0x77, 0x2a, 0x2f, 0x8e, 0x3b, 0xd6, 0x9f, 0x94, 0xe0, 0xda, 0xc4, 0xbe, 0xa2, 0x1b, 0x50, + 0x0d, 0xd2, 0xc0, 0xdc, 0x54, 0x1c, 0xaa, 0x22, 0x20, 0x0b, 0x4c, 0x56, 0x50, 0x79, 0x86, 0x00, + 0xf7, 0x26, 0x54, 0x4e, 0x54, 0x7c, 0x6d, 0xb4, 0x97, 0x14, 0x69, 0x85, 0x87, 0x4d, 0x0e, 0xb7, + 0xfe, 0xaa, 0x06, 0x57, 0x3b, 0x23, 0xca, 0xc2, 0xa1, 0x76, 0xed, 0x9b, 0x3c, 0x2c, 0xc7, 0xa7, + 0x24, 0x7e, 0x88, 0xf7, 0xd5, 0x44, 0x12, 0x09, 0xb6, 0x46, 0xe0, 0x94, 0x86, 0x87, 0x50, 0x4a, + 0xdc, 0x51, 0x2c, 0xe7, 0x53, 0x4f, 0x43, 0xa8, 0x2d, 0xa0, 0x58, 0x61, 0x79, 0xf6, 0xe1, 0x92, + 0x98, 0xf1, 0x83, 0x78, 0xe8, 0xb0, 0x81, 0x9a, 0x52, 0x92, 0x7d, 0x74, 0x0c, 0x1c, 0xce, 0x50, + 0xa2, 0x7b, 0x80, 0xa4, 0x38, 0xbe, 0xc2, 0x83, 0x53, 0x12, 0xc7, 0x5e, 0x57, 0x87, 0xf7, 0x35, + 0x35, 0x1e, 0xd9, 0x13, 0x14, 0x78, 0xca, 0x28, 0x44, 0xa1, 0x4a, 0x23, 0xe2, 0xae, 0xd6, 0x84, + 0xe7, 0xff, 0x5e, 0x81, 0x53, 0x69, 0x6a, 0xad, 0x65, 0x47, 0xc4, 0xdd, 0x0d, 0x58, 0x3c, 0x4e, + 0x77, 0x8d, 0x83, 0xb0, 0x10, 0x96, 0x0b, 0x3a, 0x0b, 0x97, 0x1e, 0x74, 0x8c, 0xec, 0x65, 0xf1, + 0xf2, 0xb2, 0x97, 0xb5, 0xdf, 0x86, 0x46, 0xa2, 0x17, 0xb4, 0x22, 0x0d, 0x51, 0x58, 0x94, 0xb0, + 0x3d, 0xf4, 0x1a, 0xd4, 0x4e, 0x1d, 0x7f, 0xa4, 0xec, 0x18, 0xcb, 0x3f, 0x1f, 0x94, 0xb7, 0x4a, + 0xd6, 0xdf, 0x97, 0x00, 0x76, 0x1c, 0xe6, 0xdc, 0xf2, 0x7c, 0x46, 0x62, 0x7e, 0x2c, 0x22, 0x6e, + 0x31, 0xb9, 0x63, 0x21, 0x2c, 0x45, 0x60, 0xd0, 0x37, 0xa1, 0xca, 0xc6, 0x91, 0x3e, 0x11, 0xab, + 0x9a, 0xe2, 0x68, 0x1c, 0x91, 0xa7, 0x67, 0x1b, 0xf5, 0x7b, 0xf6, 0xc1, 0x03, 0xfe, 0x1b, 0x0b, + 0x2a, 0xb4, 0xa1, 0x05, 0xf3, 0xf0, 0xdf, 0x68, 0x37, 0xce, 0xcf, 0x36, 0x6a, 0x1f, 0x71, 0x80, + 0x9a, 0x03, 0xfa, 0x10, 0xc0, 0x0d, 0x87, 0x5c, 0x81, 0x2c, 0x8c, 0x95, 0xa1, 0xdd, 0xd0, 0x3a, + 0xee, 0x24, 0x98, 0xa7, 0x99, 0x7f, 0xd8, 0x18, 0x63, 0x79, 0xb0, 0xbc, 0x43, 0x22, 0x12, 0x74, + 0x49, 0xe0, 0x8e, 0x45, 0x3c, 0x9e, 0xe1, 0x70, 0xbf, 0x07, 0xcd, 0xae, 0x1e, 0xe4, 0x11, 0xba, + 0x5a, 0x16, 0xd3, 0x5b, 0xe1, 0xa7, 0x63, 0xc7, 0x80, 0xe3, 0x0c, 0x95, 0xf5, 0x69, 0x09, 0x6a, + 0xbb, 0x7c, 0xd3, 0xd0, 0x10, 0x16, 0xdd, 0x30, 0x60, 0xe4, 0x47, 0x4c, 0xb9, 0xc9, 0x02, 0x11, + 0x54, 0x70, 0xec, 0x48, 0x6e, 0xed, 0x25, 0xbe, 0xbd, 0xea, 0x0f, 0xd6, 0x32, 0xd0, 0x1b, 0x50, + 0xed, 0x3a, 0xcc, 0x11, 0x4a, 0x6f, 0xca, 0x28, 0xcb, 0x37, 0x0d, 0x0b, 0xa8, 0xf5, 0x9f, 0x65, + 0x68, 0x9a, 0x4c, 0xd0, 0x1a, 0x94, 0xbd, 0xae, 0x5a, 0x3d, 0xa8, 0xd5, 0x97, 0xef, 0xee, 0xe0, + 0xb2, 0xd7, 0x15, 0x3e, 0x44, 0x86, 0x94, 0x72, 0x36, 0x0d, 0xcf, 0xe5, 0x81, 0xdf, 0x86, 0x25, + 0x7e, 0xa0, 0x4e, 0x65, 0x16, 0xa3, 0x5c, 0xc8, 0xab, 0x8a, 0x78, 0x89, 0x1b, 0x9b, 0x4e, 0x70, + 0x4c, 0x3a, 0xae, 0x7a, 0x61, 0x1e, 0xd5, 0xac, 0xea, 0x0d, 0x93, 0xd8, 0x86, 0x65, 0x3e, 0x6b, + 0x31, 0xd7, 0x80, 0x71, 0x84, 0x2a, 0x08, 0xbe, 0xac, 0x88, 0x97, 0x77, 0xb2, 0x68, 0x9c, 0xa7, + 0x47, 0x5f, 0x87, 0x45, 0x3a, 0x3a, 0xfe, 0x98, 0xb8, 0x32, 0xfc, 0x36, 0xd2, 0x83, 0x61, 0x4b, + 0x30, 0xd6, 0x78, 0xb4, 0x0f, 0x55, 0x5e, 0xbc, 0xa9, 0xf8, 0xf9, 0x8d, 0xd9, 0x72, 0xbe, 0x23, + 0x6f, 0x48, 0x8c, 0xb9, 0x7b, 0xdc, 0x6c, 0x38, 0x17, 0xeb, 0xdf, 0xcb, 0xb0, 0x2c, 0x34, 0x9d, + 0x5a, 0xdc, 0x0c, 0xc6, 0xf6, 0x6d, 0x58, 0xea, 0x3b, 0x8c, 0x3c, 0x71, 0xc6, 0xa2, 0x16, 0x2c, + 0x67, 0x55, 0x79, 0x3b, 0x45, 0x61, 0x93, 0x8e, 0x2b, 0x4a, 0x98, 0x8e, 0xdc, 0x18, 0x31, 0xb4, + 0x92, 0x55, 0xd4, 0x6e, 0x16, 0x8d, 0xf3, 0xf4, 0x3c, 0xc2, 0x08, 0x90, 0x18, 0x9c, 0x2b, 0xd2, + 0x76, 0x35, 0x02, 0xa7, 0x34, 0xe8, 0x14, 0x16, 0x7b, 0xc2, 0x13, 0x50, 0x95, 0x4c, 0x1d, 0x14, + 0xb4, 0xeb, 0x54, 0x51, 0xd2, 0xc3, 0x48, 0x03, 0x97, 0xbf, 0x29, 0xd6, 0xc2, 0xac, 0xff, 0x2d, + 0xc3, 0xf5, 0xa9, 0xf4, 0x33, 0xa8, 0xf7, 0x58, 0x6d, 0xb1, 0x4c, 0x2f, 0x76, 0x0a, 0xf8, 0x5b, + 0x6f, 0x48, 0xd4, 0x2c, 0xeb, 0xd9, 0x8d, 0x37, 0xcf, 0x7b, 0xe5, 0x12, 0xce, 0x7b, 0x4f, 0x9d, + 0xf7, 0xaa, 0x08, 0x21, 0x05, 0x96, 0x94, 0xba, 0xf6, 0x54, 0x75, 0x86, 0xe7, 0x78, 0x1b, 0x9a, + 0x66, 0xfe, 0xfe, 0x62, 0xf7, 0x6f, 0xfd, 0x6d, 0x15, 0x96, 0x8c, 0x8c, 0x95, 0x27, 0x3d, 0x3c, + 0xc3, 0x2f, 0x65, 0x93, 0x9e, 0x24, 0x3d, 0xff, 0x1d, 0x78, 0xc5, 0xf5, 0xc3, 0x80, 0xec, 0x78, + 0xb1, 0x48, 0xeb, 0xc6, 0xca, 0xfa, 0xbf, 0xa4, 0x28, 0x5f, 0xe9, 0x64, 0xb0, 0x38, 0x47, 0x8d, + 0x5c, 0xa8, 0xb9, 0x31, 0xe9, 0x52, 0xa5, 0xf5, 0x76, 0xa1, 0x34, 0xbb, 0xc3, 0x39, 0xc9, 0x18, + 0x24, 0x7e, 0x62, 0xc9, 0x7b, 0xfe, 0x56, 0xc6, 0x4d, 0x00, 0x4a, 0x07, 0x7b, 0x64, 0x2c, 0xb2, + 0x2b, 0xe9, 0xbd, 0x92, 0xc4, 0xc0, 0xb6, 0xef, 0x28, 0x0c, 0x36, 0xa8, 0xd0, 0x37, 0xa1, 0xde, + 0xd3, 0xf9, 0x98, 0x74, 0x5a, 0x2b, 0x6a, 0x44, 0x3d, 0xc9, 0xc5, 0x12, 0x0a, 0xee, 0xa5, 0x8f, + 0x63, 0x27, 0x70, 0x07, 0xc2, 0x71, 0x19, 0x5e, 0xba, 0x2d, 0xa0, 0x58, 0x61, 0xb9, 0xfa, 0x99, + 0xd3, 0x5f, 0xad, 0x67, 0xd5, 0x7f, 0xe4, 0xf4, 0x31, 0x87, 0x73, 0x74, 0x4c, 0x7a, 0xab, 0x8d, + 0x2c, 0x1a, 0x93, 0x1e, 0xe6, 0x70, 0x34, 0x84, 0x85, 0x98, 0x0c, 0x43, 0x46, 0x56, 0x41, 0xa8, + 0xf7, 0x6e, 0x21, 0xf5, 0x62, 0xc1, 0x4a, 0xa6, 0xda, 0xb2, 0xe6, 0x94, 0x10, 0xac, 0x84, 0x58, + 0x7f, 0x53, 0x82, 0xba, 0xde, 0x86, 0xff, 0xff, 0x95, 0x86, 0xf5, 0x3d, 0x58, 0xce, 0xad, 0x6a, + 0x06, 0x67, 0xf4, 0x06, 0x54, 0x47, 0xb1, 0xaf, 0x13, 0x0a, 0xe1, 0x46, 0x1e, 0xe2, 0x7d, 0x1b, + 0x0b, 0xa8, 0xf5, 0x1e, 0xac, 0xdc, 0x39, 0x3a, 0x3a, 0xb4, 0x47, 0xc7, 0xd4, 0x8d, 0xbd, 0x88, + 0xa9, 0x88, 0x19, 0x85, 0xb1, 0xcc, 0x23, 0x6a, 0xc6, 0x99, 0x0b, 0x63, 0x86, 0x05, 0xc6, 0xfa, + 0x64, 0x01, 0x96, 0xf8, 0x30, 0x5d, 0x37, 0xbc, 0xe0, 0xcc, 0x19, 0x29, 0x68, 0xf9, 0x12, 0x1b, + 0x68, 0xbf, 0x07, 0x15, 0xe6, 0xeb, 0x83, 0xda, 0x29, 0x20, 0x72, 0xdf, 0x56, 0x36, 0x24, 0xaa, + 0xe1, 0xa3, 0x7d, 0x1b, 0x73, 0xc6, 0xfc, 0x48, 0x0c, 0x09, 0x1b, 0x84, 0x5d, 0x75, 0x44, 0x93, + 0x23, 0x71, 0x5f, 0x40, 0xb1, 0xc2, 0xe6, 0x2a, 0x80, 0xda, 0xa5, 0x57, 0x00, 0x5f, 0x87, 0x45, + 0x1e, 0x32, 0xc2, 0x91, 0x4c, 0x4e, 0x2a, 0xa9, 0xca, 0x8e, 0x24, 0x18, 0x6b, 0x3c, 0x8a, 0xa0, + 0x71, 0xac, 0x4b, 0x6f, 0x95, 0xa1, 0x14, 0x50, 0x5c, 0x52, 0xc5, 0xcb, 0xa6, 0x45, 0xf2, 0x17, + 0xa7, 0x42, 0xd0, 0x1f, 0xc2, 0xe2, 0x80, 0x38, 0x5d, 0xae, 0x99, 0xba, 0xd0, 0x0c, 0xbe, 0xb8, + 0x3c, 0xc3, 0x24, 0x5b, 0x77, 0x24, 0x53, 0x59, 0x97, 0x25, 0x0b, 0x56, 0x50, 0xac, 0x65, 0xae, + 0x7d, 0x00, 0x4d, 0x93, 0x72, 0xae, 0x4a, 0xe5, 0x4f, 0x2b, 0x70, 0x6d, 0x6f, 0xcb, 0xd6, 0x2d, + 0x8c, 0xc3, 0xd0, 0xf7, 0xdc, 0x31, 0xfa, 0x23, 0x58, 0xf0, 0x9d, 0x63, 0xe2, 0xd3, 0xd5, 0x92, + 0x58, 0xcf, 0xa3, 0x8b, 0xaf, 0x67, 0x82, 0x79, 0x6b, 0x5f, 0x70, 0x96, 0x8b, 0x4a, 0xcc, 0x4d, + 0x02, 0xb1, 0x12, 0x8b, 0x5c, 0x58, 0x3c, 0x76, 0xdc, 0x93, 0xb0, 0xd7, 0x53, 0x5e, 0x67, 0x6b, + 0xee, 0x1e, 0x4d, 0x5b, 0x8e, 0x4f, 0xf5, 0xa6, 0x00, 0x58, 0x73, 0x46, 0x36, 0x5c, 0x27, 0x71, + 0x1c, 0xc6, 0x07, 0x81, 0x42, 0x29, 0x53, 0x12, 0xa7, 0xad, 0xde, 0x7e, 0x53, 0x0d, 0xbc, 0xbe, + 0x3b, 0x8d, 0x08, 0x4f, 0x1f, 0xbb, 0xf6, 0x3e, 0x2c, 0x19, 0x0b, 0x9c, 0x6b, 0x2f, 0xfe, 0xa9, + 0x06, 0xcd, 0x3d, 0xa7, 0x77, 0xe2, 0xcc, 0xe8, 0x92, 0xbe, 0x0a, 0x35, 0x16, 0x46, 0x9e, 0xab, + 0xa2, 0xff, 0x55, 0x45, 0x50, 0x3b, 0xe2, 0x40, 0x2c, 0x71, 0x3c, 0x0c, 0x47, 0x4e, 0xcc, 0x3c, + 0xa6, 0xeb, 0x8d, 0x5a, 0x1a, 0x86, 0x0f, 0x35, 0x02, 0xa7, 0x34, 0xb9, 0x93, 0x5e, 0xbd, 0xf4, + 0x93, 0xbe, 0x05, 0xcd, 0x98, 0xfc, 0xfe, 0xc8, 0x8b, 0x49, 0x77, 0xdb, 0x3d, 0x91, 0x19, 0x73, + 0x2d, 0x6d, 0xb3, 0x60, 0x03, 0x87, 0x33, 0x94, 0x3c, 0x19, 0xe0, 0x15, 0x6c, 0x4c, 0x28, 0x15, + 0x4e, 0xa2, 0x9e, 0x26, 0x03, 0x1d, 0x05, 0xc7, 0x09, 0x05, 0x4f, 0xa2, 0x7a, 0xfe, 0x88, 0x0e, + 0x6e, 0x71, 0x1e, 0x3c, 0x35, 0x16, 0xbe, 0xa2, 0x96, 0x26, 0x51, 0xb7, 0x32, 0x58, 0x9c, 0xa3, + 0xd6, 0x9e, 0xb9, 0xfe, 0xab, 0xf2, 0xcc, 0x46, 0xc0, 0x69, 0x5c, 0x62, 0xc0, 0xd9, 0x86, 0xe5, + 0xc4, 0x16, 0xbc, 0xa0, 0xbf, 0x47, 0xc6, 0x22, 0x8d, 0x31, 0xea, 0xa3, 0xc3, 0x2c, 0x1a, 0xe7, + 0xe9, 0xad, 0x00, 0x56, 0x1e, 0x6c, 0x1f, 0xd9, 0x99, 0x78, 0x3c, 0x77, 0x57, 0xce, 0xa8, 0x46, + 0xcb, 0xcf, 0xaf, 0x46, 0xad, 0x9f, 0x56, 0x60, 0x89, 0x0b, 0x9c, 0xf1, 0xd8, 0xcc, 0xce, 0xd9, + 0xdc, 0x83, 0xca, 0x17, 0x76, 0x6b, 0x76, 0xf9, 0x47, 0x50, 0x99, 0x76, 0xed, 0x57, 0x64, 0xda, + 0xd6, 0x2f, 0x6b, 0x00, 0x0f, 0xc2, 0x2e, 0xb1, 0x99, 0xc3, 0x46, 0xf4, 0xb9, 0x8d, 0x15, 0x9d, + 0x1b, 0x96, 0x9f, 0xd7, 0x07, 0xe8, 0x7a, 0x34, 0xf2, 0x55, 0x1f, 0x20, 0xd7, 0x52, 0xd9, 0x49, + 0x51, 0xd8, 0xa4, 0x4b, 0x3a, 0x6e, 0xd5, 0xe9, 0x1d, 0x37, 0x3e, 0x3d, 0xa3, 0xbd, 0xf2, 0x36, + 0xd4, 0xa2, 0x81, 0x43, 0x75, 0x53, 0x45, 0x37, 0x6d, 0x6b, 0x87, 0x1c, 0xf8, 0x94, 0x57, 0x34, + 0x61, 0x97, 0x88, 0x3f, 0x58, 0x12, 0xa2, 0xc7, 0xd0, 0xa0, 0xcc, 0x89, 0x19, 0xe9, 0x6e, 0xeb, + 0xeb, 0x8c, 0xcd, 0xd9, 0xfa, 0x24, 0xf7, 0x3d, 0x37, 0x0e, 0x45, 0xb3, 0x24, 0x3d, 0x21, 0x9a, + 0x13, 0x4e, 0x99, 0xa2, 0x1e, 0x2c, 0x71, 0x67, 0xe6, 0x13, 0x29, 0x63, 0xf1, 0x62, 0x32, 0x12, + 0x4d, 0x75, 0x52, 0x5e, 0xd8, 0x64, 0xcc, 0xcf, 0xcb, 0x90, 0x50, 0xea, 0xf4, 0x89, 0xaa, 0x88, + 0x12, 0xc3, 0xbd, 0x2f, 0xc1, 0x58, 0xe3, 0xd1, 0x63, 0xa8, 0x09, 0x9b, 0x10, 0xb5, 0xd1, 0xd2, + 0xcd, 0xef, 0x16, 0x2c, 0xe7, 0x65, 0x55, 0x29, 0x7e, 0x62, 0xc9, 0x98, 0xab, 0x75, 0x14, 0x75, + 0x1d, 0xb9, 0x64, 0x28, 0xa8, 0xd6, 0x87, 0x9a, 0x13, 0x4e, 0x99, 0x22, 0x17, 0x20, 0x26, 0x34, + 0xf4, 0x4f, 0x85, 0x88, 0xa5, 0x8b, 0x89, 0x48, 0x4e, 0x18, 0x4e, 0x58, 0x61, 0x83, 0xad, 0xf5, + 0x93, 0x2a, 0xac, 0x1c, 0x44, 0x24, 0x78, 0x34, 0xf0, 0xe8, 0x89, 0xf6, 0x5b, 0x37, 0xa0, 0x3a, + 0x08, 0x29, 0xcb, 0xd7, 0x41, 0x77, 0x42, 0xca, 0xb0, 0xc0, 0xf0, 0xad, 0xd0, 0xad, 0xc3, 0x9c, + 0xeb, 0xd2, 0x6d, 0x43, 0x8d, 0x9f, 0xfb, 0x46, 0x47, 0x3c, 0x91, 0x18, 0xb1, 0xc1, 0x51, 0x78, + 0x42, 0x02, 0x75, 0xb7, 0x38, 0xd7, 0x13, 0x09, 0x3d, 0x16, 0xa7, 0x6c, 0x78, 0x49, 0xef, 0xa4, + 0xcf, 0x35, 0x72, 0x25, 0xfd, 0x76, 0xfa, 0x58, 0xc3, 0xa0, 0xfa, 0x75, 0x7d, 0xa9, 0xf0, 0x0f, + 0x65, 0x58, 0xb0, 0x05, 0x13, 0xf4, 0x18, 0xea, 0xdc, 0xa2, 0x44, 0xaf, 0x4a, 0x16, 0xf1, 0x6f, + 0xcf, 0x66, 0x7f, 0x07, 0x22, 0x6a, 0xdd, 0x27, 0xcc, 0x49, 0xc5, 0xa5, 0x30, 0x9c, 0x70, 0x45, + 0x3d, 0x75, 0x89, 0x54, 0xb8, 0xb9, 0x27, 0x67, 0x6c, 0x47, 0xc4, 0x9d, 0x7a, 0x6f, 0x14, 0xc0, + 0x02, 0x15, 0x3e, 0xbe, 0x78, 0x7f, 0x4f, 0x49, 0x12, 0xdc, 0x8c, 0xf6, 0xba, 0xf8, 0x8f, 0x95, + 0x14, 0xeb, 0x5f, 0x4b, 0x00, 0x92, 0x70, 0xdf, 0xa3, 0x0c, 0xfd, 0x60, 0x42, 0x91, 0xad, 0xd9, + 0x14, 0xc9, 0x47, 0x0b, 0x35, 0x26, 0x09, 0xa4, 0x86, 0x18, 0x4a, 0x24, 0x50, 0xf3, 0x18, 0x19, + 0x52, 0xd5, 0x0f, 0xf8, 0xb0, 0xe8, 0xda, 0xd2, 0x04, 0xfe, 0x2e, 0x67, 0x8b, 0x25, 0x77, 0xeb, + 0x5f, 0x4a, 0xb0, 0x2c, 0x09, 0x74, 0x1d, 0x45, 0xd1, 0x63, 0x80, 0x2e, 0x89, 0xfc, 0x70, 0x3c, + 0xe4, 0xce, 0xf6, 0xa2, 0x36, 0xf2, 0x0a, 0xb7, 0x8f, 0x9d, 0x84, 0x0f, 0x36, 0x78, 0xa2, 0x47, + 0xb0, 0xc8, 0x73, 0x31, 0xcf, 0xd5, 0x1d, 0xe0, 0xf9, 0xd9, 0x8b, 0x26, 0xac, 0x2d, 0x99, 0x60, + 0xcd, 0xcd, 0xfa, 0xe7, 0x86, 0xde, 0x22, 0x6e, 0x27, 0xe8, 0x93, 0x52, 0xee, 0xce, 0x48, 0x16, + 0x9c, 0x77, 0x5f, 0x5a, 0x83, 0x3c, 0xad, 0x1c, 0x9e, 0x7d, 0x05, 0x85, 0x42, 0xa8, 0x33, 0x79, + 0x60, 0xf5, 0x6e, 0x6e, 0x17, 0x3e, 0xfa, 0xa9, 0xed, 0x28, 0x00, 0xc5, 0x89, 0x10, 0x14, 0x41, + 0x9d, 0x91, 0x61, 0xe4, 0x3b, 0x8c, 0x14, 0x6f, 0xc2, 0x1e, 0x29, 0x4e, 0x86, 0x44, 0x05, 0xc1, + 0x89, 0x14, 0xf4, 0x07, 0xd0, 0xa4, 0x46, 0x42, 0xae, 0x3c, 0x7c, 0x91, 0x03, 0x69, 0x70, 0x93, + 0x77, 0x7c, 0x26, 0x04, 0x67, 0xa4, 0xf1, 0xc0, 0xe5, 0x7a, 0xb1, 0x3b, 0xf2, 0x98, 0x8a, 0x02, + 0x89, 0x23, 0xee, 0x48, 0x30, 0xd6, 0x78, 0xf4, 0x93, 0x12, 0xac, 0x74, 0xb3, 0x57, 0x8f, 0xfa, + 0xca, 0xb9, 0x80, 0x55, 0xe4, 0x2e, 0x33, 0x93, 0x84, 0x6f, 0x25, 0x87, 0xa0, 0x78, 0x42, 0x38, + 0xba, 0x07, 0x48, 0xd5, 0xfa, 0xb7, 0x1c, 0xcf, 0x27, 0x5d, 0x1c, 0x8e, 0x82, 0xae, 0xc8, 0xb7, + 0xea, 0xe9, 0xf5, 0xfd, 0xee, 0x04, 0x05, 0x9e, 0x32, 0x0a, 0x7d, 0x5a, 0x82, 0xab, 0xea, 0x28, + 0xc8, 0x36, 0x81, 0xea, 0x18, 0x3d, 0x7a, 0x19, 0x3e, 0xb8, 0x65, 0x9b, 0x9c, 0x65, 0x87, 0xe5, + 0xba, 0x9a, 0xe0, 0xd5, 0x0c, 0x0e, 0x67, 0x27, 0x81, 0xfe, 0xba, 0x24, 0x9f, 0x28, 0x78, 0x2e, + 0xd9, 0x0e, 0x82, 0x90, 0x89, 0x77, 0x54, 0x54, 0x15, 0x9e, 0x3f, 0x78, 0x99, 0x73, 0x33, 0xd8, + 0xcb, 0x09, 0x66, 0x1e, 0x40, 0x64, 0x09, 0xf0, 0x94, 0x39, 0xad, 0x7d, 0x08, 0x68, 0x72, 0x99, + 0xf3, 0xf4, 0x59, 0xd6, 0x76, 0xe1, 0xcb, 0xcf, 0x98, 0xcc, 0x5c, 0xed, 0x9a, 0x9f, 0x2e, 0x42, + 0xd3, 0x8c, 0x4a, 0x69, 0x91, 0x50, 0x9a, 0xb5, 0x48, 0xf8, 0x5d, 0xb3, 0x48, 0x28, 0xcf, 0x7d, + 0x99, 0xfa, 0xfc, 0xfa, 0xc0, 0xc9, 0xd6, 0x07, 0x95, 0xb9, 0xd9, 0xcf, 0x55, 0x1a, 0x54, 0x5f, + 0x50, 0x1a, 0x9c, 0x42, 0x2d, 0x08, 0xbb, 0x84, 0x16, 0x7f, 0xb8, 0x62, 0xea, 0xbc, 0xc5, 0x55, + 0xaa, 0x0c, 0x29, 0x09, 0x9f, 0x02, 0x86, 0xa5, 0x38, 0x74, 0x1b, 0xae, 0x29, 0xaf, 0xdb, 0x19, + 0xbb, 0x3e, 0xe9, 0x84, 0xa3, 0x40, 0xd6, 0x63, 0xb5, 0xf6, 0xeb, 0x6a, 0xc0, 0xb5, 0xa3, 0x3c, + 0x01, 0x9e, 0x1c, 0x83, 0x7e, 0x08, 0xc8, 0x04, 0x4a, 0xf9, 0xea, 0x22, 0x69, 0x53, 0xdb, 0xf0, + 0xd1, 0x04, 0xc5, 0xd3, 0x1c, 0x7f, 0x0e, 0x25, 0x78, 0x0a, 0x2b, 0xd4, 0x87, 0xab, 0xbe, 0x43, + 0x99, 0x00, 0x71, 0xfd, 0xab, 0xd6, 0xd2, 0x3c, 0x3b, 0x96, 0x1c, 0xf6, 0x7d, 0x93, 0x11, 0xce, + 0xf2, 0x45, 0xa7, 0xd0, 0xd0, 0x0f, 0xd5, 0xa8, 0xaa, 0xd4, 0xee, 0x16, 0xdd, 0x8e, 0x24, 0x37, + 0x91, 0xd5, 0x40, 0xf2, 0x17, 0xa7, 0xa2, 0xd6, 0x7e, 0x2c, 0xab, 0xfe, 0x67, 0x1e, 0xb5, 0xef, + 0x9b, 0x47, 0xad, 0x50, 0x5a, 0x9a, 0x36, 0x17, 0xcc, 0x03, 0xfb, 0xdf, 0x65, 0x68, 0xda, 0xbe, + 0xe3, 0x26, 0x05, 0x57, 0x36, 0xe7, 0x2f, 0x5d, 0x7a, 0x9f, 0xe5, 0x21, 0x00, 0x15, 0xf3, 0x11, + 0x35, 0xd7, 0x5c, 0xd7, 0x6b, 0x22, 0x77, 0xb3, 0x93, 0xc1, 0xd8, 0x60, 0x34, 0x7f, 0xe9, 0xc7, + 0xa3, 0xf3, 0xc0, 0x09, 0x02, 0xe2, 0xe7, 0x8f, 0x71, 0x47, 0x82, 0xb1, 0xc6, 0x9b, 0x27, 0xbe, + 0xf6, 0xfc, 0x13, 0x6f, 0xfd, 0xb2, 0x0a, 0xc8, 0x66, 0x4e, 0xd0, 0x75, 0xe2, 0xee, 0xde, 0x56, + 0xd2, 0x9d, 0x7b, 0xe6, 0x03, 0xe2, 0xd2, 0x17, 0xf1, 0x80, 0xd8, 0x78, 0x09, 0x5e, 0xbe, 0x94, + 0x97, 0xe0, 0x0f, 0xcc, 0x97, 0xe0, 0x72, 0x73, 0xde, 0x9e, 0xf6, 0x12, 0xfc, 0x2b, 0x7b, 0xa3, + 0x63, 0x12, 0x07, 0x84, 0x11, 0xaa, 0xe7, 0x3a, 0xc3, 0x7b, 0xf0, 0xcb, 0xef, 0x15, 0xf6, 0xe0, + 0x6a, 0xe4, 0x30, 0x77, 0x60, 0xb3, 0xd8, 0x61, 0xa4, 0x3f, 0x56, 0x66, 0xf1, 0xa1, 0xf6, 0x44, + 0x87, 0x26, 0xf2, 0xe9, 0xd9, 0xc6, 0x6f, 0x3e, 0xeb, 0x83, 0x10, 0x36, 0x8e, 0x08, 0x6d, 0x09, + 0x72, 0xd1, 0x78, 0xcb, 0xb2, 0x45, 0x37, 0x01, 0x7c, 0xef, 0x94, 0x1c, 0xa4, 0x0f, 0x94, 0xea, + 0xe9, 0xdc, 0xf6, 0x13, 0x0c, 0x36, 0xa8, 0xac, 0x4d, 0x68, 0x4a, 0x2f, 0xa0, 0xae, 0xb5, 0x36, + 0xa0, 0xe6, 0xf8, 0x7e, 0xf8, 0x44, 0x1c, 0xf5, 0x9a, 0xec, 0x2e, 0x6d, 0x73, 0x00, 0x96, 0x70, + 0xeb, 0xbc, 0x04, 0x99, 0x2c, 0x16, 0x0d, 0xa0, 0x3a, 0x60, 0x2c, 0x2a, 0xfe, 0x95, 0x40, 0xfe, + 0x82, 0x5a, 0x5e, 0x62, 0x73, 0x28, 0x16, 0x12, 0xb8, 0xa4, 0xc0, 0x61, 0xb4, 0xb8, 0x15, 0xe6, + 0x5b, 0xef, 0x52, 0x12, 0x87, 0x62, 0x21, 0xc1, 0xfa, 0xbb, 0x12, 0x34, 0x92, 0xce, 0x2c, 0xd7, + 0xab, 0xeb, 0x74, 0x48, 0xcc, 0x0e, 0xd3, 0x27, 0x2a, 0x89, 0x5e, 0x3b, 0xdb, 0x1a, 0x83, 0x0d, + 0x2a, 0xf9, 0xfe, 0xc4, 0x23, 0x01, 0x4b, 0xc6, 0x4d, 0xbc, 0x3f, 0x31, 0xb1, 0x38, 0x47, 0x8d, + 0xbe, 0x03, 0x57, 0x25, 0x44, 0x3f, 0xf6, 0x90, 0xe7, 0x20, 0x89, 0x5e, 0x1d, 0x13, 0x89, 0xb3, + 0xb4, 0xd6, 0x9f, 0x55, 0x20, 0xa9, 0x6f, 0xf4, 0xcb, 0x5a, 0x9e, 0xca, 0xb9, 0x2e, 0x0f, 0xd3, + 0xc6, 0x77, 0x41, 0x13, 0x89, 0x65, 0x4a, 0x81, 0xa7, 0x8c, 0x42, 0xf7, 0xc4, 0xa3, 0x77, 0xe6, + 0x70, 0x93, 0x54, 0xdb, 0xf0, 0xe6, 0x34, 0x67, 0xdc, 0xd1, 0x44, 0xc9, 0x33, 0x76, 0xf9, 0x17, + 0xa7, 0xc3, 0xd1, 0x2e, 0x2c, 0x9e, 0x86, 0xfe, 0x68, 0x48, 0xf4, 0x27, 0x1a, 0x6b, 0xd3, 0x38, + 0x7d, 0x24, 0x48, 0x8c, 0x26, 0x9e, 0x1c, 0x82, 0xf5, 0x58, 0x44, 0x60, 0x59, 0x3c, 0x3e, 0xf6, + 0xd8, 0x58, 0xbd, 0x66, 0x52, 0x75, 0xdb, 0xd7, 0xa6, 0xb1, 0x3b, 0x0c, 0xbb, 0x76, 0x96, 0xba, + 0xfd, 0xea, 0xf9, 0xd9, 0xc6, 0x72, 0x0e, 0x88, 0xf3, 0x3c, 0xd1, 0xfb, 0xc9, 0x9b, 0x62, 0xce, + 0xfb, 0x2b, 0xcf, 0xe2, 0x1d, 0x11, 0x57, 0x1a, 0x53, 0xda, 0xe1, 0xb1, 0x6c, 0x80, 0xf4, 0x81, + 0x17, 0xfa, 0x2a, 0xd4, 0x44, 0xfe, 0xa9, 0x76, 0x20, 0xc9, 0xc8, 0x44, 0x7e, 0x8a, 0x25, 0x0e, + 0xdd, 0x80, 0x2a, 0x65, 0x61, 0x94, 0x6f, 0xe9, 0xdb, 0x2c, 0x8c, 0xb0, 0xc0, 0x58, 0xff, 0x55, + 0x86, 0x45, 0x1d, 0x2e, 0xa8, 0x51, 0x29, 0x97, 0x8a, 0xe6, 0x2a, 0x8a, 0x69, 0x52, 0x30, 0x37, + 0x9f, 0x51, 0x2c, 0x67, 0x9d, 0x6a, 0xf9, 0xd2, 0x9d, 0xea, 0x09, 0x2c, 0x44, 0xc2, 0x65, 0xa9, + 0xac, 0xfd, 0x76, 0x71, 0xd9, 0x82, 0x9d, 0x8c, 0x48, 0xf2, 0x37, 0x56, 0x22, 0xac, 0xff, 0x29, + 0xc1, 0x4a, 0x7e, 0x86, 0xe8, 0x04, 0x2a, 0x34, 0x76, 0x95, 0xc6, 0x0f, 0x5f, 0xde, 0xd2, 0x65, + 0x34, 0x94, 0xf7, 0x41, 0x76, 0xec, 0x62, 0x2e, 0x85, 0x5b, 0x44, 0x97, 0x50, 0x96, 0xb7, 0x88, + 0x1d, 0x42, 0x19, 0x16, 0x18, 0xb4, 0x3f, 0x19, 0x35, 0x5b, 0xd3, 0xa2, 0xe6, 0xeb, 0x79, 0x79, + 0xd3, 0x62, 0xa6, 0xf5, 0x6f, 0x65, 0xf8, 0xd2, 0xf4, 0x89, 0x71, 0xd7, 0x96, 0xd6, 0xff, 0x86, + 0x33, 0x49, 0x5c, 0xdb, 0x4e, 0x06, 0x8b, 0x73, 0xd4, 0xc2, 0x9d, 0xca, 0x53, 0xa5, 0xbf, 0x34, + 0x34, 0xdd, 0x69, 0x82, 0xc1, 0x06, 0x15, 0xda, 0x86, 0x65, 0xf5, 0xef, 0xc8, 0xec, 0x09, 0x19, + 0x57, 0xae, 0x9d, 0x2c, 0x1a, 0xe7, 0xe9, 0x79, 0x5a, 0xd6, 0x75, 0x98, 0xc3, 0x65, 0xe6, 0x32, + 0xb8, 0x1d, 0x09, 0xc6, 0x1a, 0x8f, 0xb6, 0xa0, 0xc9, 0x7f, 0x26, 0xa2, 0x6a, 0xd9, 0xcf, 0x18, + 0x76, 0x0c, 0x1c, 0xce, 0x50, 0xa6, 0xcf, 0xce, 0xe5, 0x4b, 0xbb, 0x89, 0x67, 0xe7, 0xd6, 0x2f, + 0x4a, 0x70, 0x35, 0x63, 0x6f, 0xa8, 0x07, 0x95, 0x93, 0x2d, 0xaa, 0xcc, 0x68, 0xef, 0x25, 0xbe, + 0x22, 0x91, 0x16, 0xb4, 0xb7, 0x45, 0x31, 0x17, 0x80, 0x3e, 0x4e, 0x1a, 0xcd, 0xe5, 0xc2, 0x7d, + 0x2d, 0x23, 0x63, 0x50, 0x19, 0x5c, 0xb6, 0xc9, 0xbc, 0x9b, 0x2c, 0xd2, 0x7e, 0xe2, 0x31, 0x77, + 0x80, 0x5e, 0x87, 0x8a, 0x13, 0x8c, 0x45, 0x52, 0xd1, 0x90, 0xf3, 0xda, 0x0e, 0xc6, 0x98, 0xc3, + 0x04, 0xca, 0xf7, 0xd5, 0xbb, 0x35, 0x89, 0xf2, 0x7d, 0xcc, 0x61, 0xd6, 0x5f, 0x36, 0x60, 0x39, + 0xe7, 0x8f, 0x66, 0x78, 0x09, 0x77, 0x02, 0x0b, 0x54, 0x48, 0x55, 0x0b, 0x2d, 0xee, 0x19, 0xe4, + 0x22, 0xd4, 0x4a, 0xc5, 0x6f, 0xac, 0x44, 0xa0, 0xbe, 0xdc, 0x3d, 0xe9, 0x83, 0xf6, 0x0b, 0xa9, + 0x34, 0x57, 0x05, 0xe4, 0xb6, 0xef, 0x93, 0x12, 0x34, 0x1d, 0xe3, 0xcb, 0x47, 0x15, 0xe5, 0xee, + 0x17, 0xc9, 0xc5, 0x27, 0x3e, 0xfa, 0x94, 0x4d, 0x4a, 0x13, 0x81, 0x33, 0x42, 0x91, 0xab, 0x92, + 0xbd, 0x5a, 0xd1, 0x8f, 0xcf, 0x8c, 0x37, 0x5c, 0x13, 0x79, 0xde, 0x13, 0x68, 0x38, 0x4f, 0xa8, + 0xfc, 0xae, 0x59, 0xdd, 0x0b, 0x17, 0x29, 0x39, 0x72, 0x9f, 0x48, 0xab, 0xbb, 0x38, 0x0d, 0xc5, + 0xa9, 0x2c, 0x14, 0xc3, 0x82, 0x2b, 0x3e, 0xf9, 0x51, 0x37, 0xc5, 0xb7, 0x5f, 0xd2, 0xa7, 0x43, + 0xed, 0x6b, 0x22, 0x65, 0x33, 0x41, 0x58, 0x49, 0x42, 0x7d, 0xa8, 0x9d, 0x38, 0xbd, 0x13, 0x47, + 0xb5, 0x32, 0x0a, 0x9c, 0x4a, 0xf3, 0x5d, 0x94, 0xf4, 0x3c, 0x02, 0x82, 0x25, 0x7f, 0xbe, 0x75, + 0x22, 0x7b, 0x6e, 0x14, 0xdd, 0x3a, 0xe3, 0x1d, 0x49, 0x3e, 0x71, 0xe6, 0xab, 0x11, 0x55, 0xb6, + 0xba, 0x77, 0x2e, 0xe2, 0x63, 0x8c, 0x2e, 0x84, 0x5c, 0x8d, 0x80, 0x60, 0xc9, 0x9f, 0xdb, 0x48, + 0xa8, 0x2f, 0x87, 0xd5, 0x0d, 0x74, 0x01, 0x1b, 0xc9, 0xdf, 0x33, 0x4b, 0x1b, 0x49, 0xa0, 0x38, + 0x95, 0x65, 0xb9, 0xb0, 0x64, 0x7c, 0x14, 0x3a, 0xc3, 0x77, 0x4b, 0x37, 0x01, 0x4e, 0x49, 0xec, + 0xf5, 0xc6, 0x3c, 0xb7, 0x57, 0xdf, 0xcf, 0x25, 0xe1, 0xee, 0xa3, 0x04, 0x83, 0x0d, 0xaa, 0x76, + 0xeb, 0xb3, 0xcf, 0xd7, 0xaf, 0xfc, 0xec, 0xf3, 0xf5, 0x2b, 0x3f, 0xff, 0x7c, 0xfd, 0xca, 0x1f, + 0x9f, 0xaf, 0x97, 0x3e, 0x3b, 0x5f, 0x2f, 0xfd, 0xec, 0x7c, 0xbd, 0xf4, 0xf3, 0xf3, 0xf5, 0xd2, + 0x7f, 0x9c, 0xaf, 0x97, 0xfe, 0xe2, 0x17, 0xeb, 0x57, 0xbe, 0x5f, 0xd7, 0xf3, 0xff, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x3d, 0x7f, 0xaf, 0x25, 0xc2, 0x41, 0x00, 0x00, } func (m *AWSLambdaTrigger) Marshal() (dAtA []byte, err error) { @@ -2227,12 +2228,17 @@ func (m *EventDependency) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } i -= len(m.EventName) copy(dAtA[i:], m.EventName) i = encodeVarintGenerated(dAtA, i, uint64(len(m.EventName))) i-- + dAtA[i] = 0x22 + i -= len(m.EventSourceName) + copy(dAtA[i:], m.EventSourceName) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.EventSourceName))) + i-- dAtA[i] = 0x1a i -= len(m.GatewayName) copy(dAtA[i:], m.GatewayName) @@ -4575,6 +4581,8 @@ func (m *EventDependency) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.GatewayName) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.EventSourceName) + n += 1 + l + sovGenerated(uint64(l)) l = len(m.EventName) n += 1 + l + sovGenerated(uint64(l)) if m.Filters != nil { @@ -5525,6 +5533,7 @@ func (this *EventDependency) String() string { s := strings.Join([]string{`&EventDependency{`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `GatewayName:` + fmt.Sprintf("%v", this.GatewayName) + `,`, + `EventSourceName:` + fmt.Sprintf("%v", this.EventSourceName) + `,`, `EventName:` + fmt.Sprintf("%v", this.EventName) + `,`, `Filters:` + strings.Replace(this.Filters.String(), "EventDependencyFilter", "EventDependencyFilter", 1) + `,`, `}`, @@ -8348,6 +8357,38 @@ func (m *EventDependency) Unmarshal(dAtA []byte) error { m.GatewayName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EventSourceName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EventSourceName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EventName", wireType) } @@ -8379,7 +8420,7 @@ func (m *EventDependency) Unmarshal(dAtA []byte) error { } m.EventName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Filters", wireType) } diff --git a/pkg/apis/sensor/v1alpha1/generated.proto b/pkg/apis/sensor/v1alpha1/generated.proto index a548f12a5b..e1ca736758 100644 --- a/pkg/apis/sensor/v1alpha1/generated.proto +++ b/pkg/apis/sensor/v1alpha1/generated.proto @@ -214,13 +214,17 @@ message EventDependency { optional string name = 1; // GatewayName is the name of the gateway from whom the event is received + // DEPRECATED: Use EventSourceName instead. optional string gatewayName = 2; + // EventSourceName is the name of EventSource that Sensor depends on + optional string eventSourceName = 3; + // EventName is the name of the event - optional string eventName = 3; + optional string eventName = 4; // Filters and rules governing toleration of success and constraints on the context and data of an event - optional EventDependencyFilter filters = 4; + optional EventDependencyFilter filters = 5; } // EventDependencyFilter defines filters and constraints for a event. diff --git a/pkg/apis/sensor/v1alpha1/openapi_generated.go b/pkg/apis/sensor/v1alpha1/openapi_generated.go index 26b5de3904..df899a378a 100644 --- a/pkg/apis/sensor/v1alpha1/openapi_generated.go +++ b/pkg/apis/sensor/v1alpha1/openapi_generated.go @@ -608,7 +608,14 @@ func schema_pkg_apis_sensor_v1alpha1_EventDependency(ref common.ReferenceCallbac }, "gatewayName": { SchemaProps: spec.SchemaProps{ - Description: "GatewayName is the name of the gateway from whom the event is received", + Description: "GatewayName is the name of the gateway from whom the event is received DEPRECATED: Use EventSourceName instead.", + Type: []string{"string"}, + Format: "", + }, + }, + "eventSourceName": { + SchemaProps: spec.SchemaProps{ + Description: "EventSourceName is the name of EventSource that Sensor depends on", Type: []string{"string"}, Format: "", }, @@ -627,7 +634,7 @@ func schema_pkg_apis_sensor_v1alpha1_EventDependency(ref common.ReferenceCallbac }, }, }, - Required: []string{"name", "gatewayName", "eventName"}, + Required: []string{"name", "gatewayName", "eventSourceName", "eventName"}, }, }, Dependencies: []string{ diff --git a/pkg/apis/sensor/v1alpha1/types.go b/pkg/apis/sensor/v1alpha1/types.go index d5595daea2..9e383931b0 100644 --- a/pkg/apis/sensor/v1alpha1/types.go +++ b/pkg/apis/sensor/v1alpha1/types.go @@ -207,11 +207,14 @@ type EventDependency struct { // Name is a unique name of this dependency Name string `json:"name" protobuf:"bytes,1,opt,name=name"` // GatewayName is the name of the gateway from whom the event is received - GatewayName string `json:"gatewayName" protobuf:"bytes,2,opt,name=gatewayName"` + // DEPRECATED: Use EventSourceName instead. + GatewayName string `json:"gatewayName" protobuf:"bytes,2,name=gatewayName"` + // EventSourceName is the name of EventSource that Sensor depends on + EventSourceName string `json:"eventSourceName" protobuf:"bytes,3,name=eventSourceName"` // EventName is the name of the event - EventName string `json:"eventName" protobuf:"bytes,3,opt,name=eventName"` + EventName string `json:"eventName" protobuf:"bytes,4,name=eventName"` // Filters and rules governing toleration of success and constraints on the context and data of an event - Filters *EventDependencyFilter `json:"filters,omitempty" protobuf:"bytes,4,opt,name=filters"` + Filters *EventDependencyFilter `json:"filters,omitempty" protobuf:"bytes,5,opt,name=filters"` } // DependencyGroup is the group of dependencies diff --git a/sensors/dependencies/resolution.go b/sensors/dependencies/resolution.go index ff7856108e..e54c2081bd 100644 --- a/sensors/dependencies/resolution.go +++ b/sensors/dependencies/resolution.go @@ -18,24 +18,42 @@ package dependencies import ( "github.com/gobwas/glob" + "github.com/sirupsen/logrus" "github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1" ) // ResolveDependency resolves a dependency based on Event and gateway name -func ResolveDependency(dependencies []v1alpha1.EventDependency, events *v1alpha1.Event) *v1alpha1.EventDependency { +func ResolveDependency(dependencies []v1alpha1.EventDependency, event *v1alpha1.Event, logger *logrus.Logger) *v1alpha1.EventDependency { for _, dependency := range dependencies { - gatewayNameGlob, err := glob.Compile(dependency.GatewayName) + eventNameGlob, err := glob.Compile(dependency.EventName) if err != nil { continue } - eventNameGlob, err := glob.Compile(dependency.EventName) + if !eventNameGlob.Match(event.Context.Subject) { + continue + } + var sourceGlob glob.Glob + switch { + case len(dependency.EventSourceName) > 0: + sourceGlob, err = glob.Compile(dependency.EventSourceName) + case len(dependency.GatewayName) > 0: + // DEPRECATED: + logger.WithFields(logrus.Fields{ + "source": event.Context.Source, + "subject": event.Context.Subject, + }).Warn("spec.dependencies.gatewayName is DEPRECATED, it will be unsupported soon, please use spec.dependencies.eventSourceName") + sourceGlob, err = glob.Compile(dependency.GatewayName) + default: + continue + } if err != nil { continue } - if gatewayNameGlob.Match(events.Context.Source) && eventNameGlob.Match(events.Context.Subject) { - return &dependency + if !sourceGlob.Match(event.Context.Source) { + continue } + return &dependency } return nil } diff --git a/sensors/dependencies/resolution_test.go b/sensors/dependencies/resolution_test.go index 096abb427e..e1a09814a0 100644 --- a/sensors/dependencies/resolution_test.go +++ b/sensors/dependencies/resolution_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" + "github.com/argoproj/argo-events/common" "github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1" ) @@ -35,7 +36,7 @@ func TestResolveDependency(t *testing.T) { { name: "unknown dependency", updateFunc: func() { - obj.Spec.Dependencies[0].GatewayName = "fake-gateway" + obj.Spec.Dependencies[0].GatewayName = "fake-source" obj.Spec.Dependencies[0].EventName = "example" }, testFunc: func(dep *v1alpha1.EventDependency) { @@ -45,7 +46,7 @@ func TestResolveDependency(t *testing.T) { { name: "known dependency", updateFunc: func() { - obj.Spec.Dependencies[0].GatewayName = "fake-gateway" + obj.Spec.Dependencies[0].GatewayName = "fake-source" obj.Spec.Dependencies[0].EventName = "example-1" }, testFunc: func(dep *v1alpha1.EventDependency) { @@ -66,7 +67,7 @@ func TestResolveDependency(t *testing.T) { event := &v1alpha1.Event{ Context: &v1alpha1.EventContext{ - Source: "fake-gateway", + Source: "fake-source", Subject: "example-1", }, Data: nil, @@ -75,7 +76,7 @@ func TestResolveDependency(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { test.updateFunc() - dependency := ResolveDependency(obj.Spec.Dependencies, event) + dependency := ResolveDependency(obj.Spec.Dependencies, event, common.NewArgoEventsLogger()) test.testFunc(dependency) }) } diff --git a/sensors/listener.go b/sensors/listener.go index f52c5a5b74..b035b04cb3 100644 --- a/sensors/listener.go +++ b/sensors/listener.go @@ -172,7 +172,7 @@ func (sensorCtx *SensorContext) handleEvent(eventBody []byte) error { // Resolve Dependency // validate whether the event is from gateway that this sensor is watching - if eventDependency := dependencies.ResolveDependency(sensorCtx.Sensor.Spec.Dependencies, internalEvent); eventDependency != nil { + if eventDependency := dependencies.ResolveDependency(sensorCtx.Sensor.Spec.Dependencies, internalEvent, sensorCtx.Logger); eventDependency != nil { sensorCtx.NotificationQueue <- &types.Notification{ Event: internalEvent, EventDependency: eventDependency,