From ff6cadc075fab228df7e83772d9b8a47d3ea7909 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Wed, 5 Jan 2022 14:23:33 +0100 Subject: [PATCH] Reload RBAC & workflows after namespace import --- compose/service/namespace.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/compose/service/namespace.go b/compose/service/namespace.go index 61125f289..c96914813 100644 --- a/compose/service/namespace.go +++ b/compose/service/namespace.go @@ -12,6 +12,7 @@ import ( "strconv" "time" + automationService "github.com/cortezaproject/corteza-server/automation/service" automationTypes "github.com/cortezaproject/corteza-server/automation/types" "github.com/cortezaproject/corteza-server/compose/service/event" "github.com/cortezaproject/corteza-server/compose/types" @@ -534,9 +535,9 @@ func (svc namespace) ImportRun(ctx context.Context, sessionID uint64, dup *types aProps = &namespaceActionProps{namespace: dup} ) - err = func() error { + err = func() (err error) { // access control - if err := svc.canImport(ctx); err != nil { + if err = svc.canImport(ctx); err != nil { return err } @@ -594,6 +595,15 @@ func (svc namespace) ImportRun(ctx context.Context, sessionID uint64, dup *types return err } + // Reload RBAC rules (in case import brought in something new) + rbac.Global().Reload(ctx) + + // Reload workflow-triggers (in case import brought in something new) + if err = automationService.DefaultWorkflow.Load(ctx); err != nil { + // should not be a fatal error + err = nil + } + aProps.setNamespace(dup) return nil }()