From 0f6e712487142b055b4b23651ad8988c5e50dff8 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Fri, 25 Feb 2022 15:13:14 +0100 Subject: [PATCH] Append custom args when executing corredor scripts via Compose REST handlers --- compose/rest/automation.go | 3 ++- compose/rest/module.go | 2 +- compose/rest/namespace.go | 2 +- compose/rest/page.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compose/rest/automation.go b/compose/rest/automation.go index efe8be664..22350fdc4 100644 --- a/compose/rest/automation.go +++ b/compose/rest/automation.go @@ -2,6 +2,7 @@ package rest import ( "context" + "github.com/cortezaproject/corteza-server/pkg/api" "github.com/cortezaproject/corteza-server/compose/rest/request" @@ -47,5 +48,5 @@ func (ctrl *Automation) Bundle(ctx context.Context, r *request.AutomationBundle) } func (ctrl *Automation) TriggerScript(ctx context.Context, r *request.AutomationTriggerScript) (interface{}, error) { - return api.OK(), corredor.Service().Exec(ctx, r.Script, event.ComposeOnManual()) + return api.OK(), corredor.Service().Exec(ctx, r.Script, corredor.ExtendScriptArgs(event.ComposeOnManual(), r.Args)) } diff --git a/compose/rest/module.go b/compose/rest/module.go index 0499762c1..7592c9d8b 100644 --- a/compose/rest/module.go +++ b/compose/rest/module.go @@ -162,7 +162,7 @@ func (ctrl *Module) TriggerScript(ctx context.Context, r *request.ModuleTriggerS } // @todo implement same behaviour as we have on record - module+oldModule - err = corredor.Service().Exec(ctx, r.Script, event.ModuleOnManual(module, module, namespace)) + err = corredor.Service().Exec(ctx, r.Script, corredor.ExtendScriptArgs(event.ModuleOnManual(module, module, namespace), r.Args)) return ctrl.makePayload(ctx, module, err) } diff --git a/compose/rest/namespace.go b/compose/rest/namespace.go index bc902b7a5..59f87342e 100644 --- a/compose/rest/namespace.go +++ b/compose/rest/namespace.go @@ -318,7 +318,7 @@ func (ctrl *Namespace) TriggerScript(ctx context.Context, r *request.NamespaceTr return } - err = corredor.Service().Exec(ctx, r.Script, event.NamespaceOnManual(namespace, nil)) + err = corredor.Service().Exec(ctx, r.Script, corredor.ExtendScriptArgs(event.NamespaceOnManual(namespace, nil), r.Args)) return ctrl.makePayload(ctx, namespace, err) } diff --git a/compose/rest/page.go b/compose/rest/page.go index 891f7c3f7..b39235641 100644 --- a/compose/rest/page.go +++ b/compose/rest/page.go @@ -234,7 +234,7 @@ func (ctrl *Page) TriggerScript(ctx context.Context, r *request.PageTriggerScrip } // @todo implement same behaviour as we have on record - page+oldPage - err = corredor.Service().Exec(ctx, r.Script, event.PageOnManual(page, page, namespace, nil)) + err = corredor.Service().Exec(ctx, r.Script, corredor.ExtendScriptArgs(event.PageOnManual(page, page, namespace, nil), r.Args)) return ctrl.makePayload(ctx, page, err) }