Use a separate orchestrator for each namespace

cmd/firefly.go

@@ -31,7 +31,7 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/log"
 	"github.com/hyperledger/firefly/internal/apiserver"
 	"github.com/hyperledger/firefly/internal/coreconfig"
-	"github.com/hyperledger/firefly/internal/orchestrator"
+	"github.com/hyperledger/firefly/internal/namespace"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -58,7 +58,7 @@ var showConfigCommand = &cobra.Command{
 	Short:   "List out the configuration options",
 	Run: func(cmd *cobra.Command, args []string) {
 		// Initialize config of all plugins
-		getOrchestrator()
+		getRootManager()
 		_ = config.ReadConfig(configSuffix, cfgFile)
 
 		// Print it all out
@@ -72,18 +72,18 @@ var showConfigCommand = &cobra.Command{
 
 var cfgFile string
 
-var _utOrchestrator orchestrator.Orchestrator
+var _utManager namespace.Manager
 
 func init() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "f", "", "config file")
 	rootCmd.AddCommand(showConfigCommand)
 }
 
-func getOrchestrator() orchestrator.Orchestrator {
-	if _utOrchestrator != nil {
-		return _utOrchestrator
+func getRootManager() namespace.Manager {
+	if _utManager != nil {
+		return _utManager
 	}
-	return orchestrator.NewOrchestrator(true)
+	return namespace.NewNamespaceManager(true)
 }
 
 // Execute is called by the main method of the package
@@ -118,19 +118,19 @@ func run() error {
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 
 	for {
-		orchestratorCtx, cancelOrchestratorCtx := context.WithCancel(ctx)
-		o := getOrchestrator()
+		rootCtx, rootCancelCtx := context.WithCancel(ctx)
+		mgr := getRootManager()
 		as := apiserver.NewAPIServer()
-		go startFirefly(orchestratorCtx, cancelOrchestratorCtx, o, as, errChan)
+		go startFirefly(rootCtx, rootCancelCtx, mgr, as, errChan)
 		select {
 		case sig := <-sigs:
 			log.L(ctx).Infof("Shutting down due to %s", sig.String())
 			cancelCtx()
-			o.WaitStop()
+			mgr.WaitStop()
 			return nil
-		case <-orchestratorCtx.Done():
+		case <-rootCtx.Done():
 			log.L(ctx).Infof("Restarting due to configuration change")
-			o.WaitStop()
+			mgr.WaitStop()
 			// Re-read the configuration
 			coreconfig.Reset()
 			if err := config.ReadConfig(configSuffix, cfgFile); err != nil {
@@ -144,7 +144,7 @@ func run() error {
 	}
 }
 
-func startFirefly(ctx context.Context, cancelCtx context.CancelFunc, o orchestrator.Orchestrator, as apiserver.Server, errChan chan error) {
+func startFirefly(ctx context.Context, cancelCtx context.CancelFunc, mgr namespace.Manager, as apiserver.Server, errChan chan error) {
 	var err error
 	// Start debug listener
 	debugPort := config.GetInt(coreconfig.DebugPort)
@@ -161,18 +161,18 @@ func startFirefly(ctx context.Context, cancelCtx context.CancelFunc, o orchestra
 		log.L(ctx).Debugf("Debug HTTP endpoint listening on localhost:%d", debugPort)
 	}
 
-	if err = o.Init(ctx, cancelCtx); err != nil {
+	if err = mgr.Init(ctx, cancelCtx); err != nil {
 		errChan <- err
 		return
 	}
-	if err = o.Start(); err != nil {
+	if err = mgr.Start(); err != nil {
 		errChan <- err
 		return
 	}
 
 	// Run the API Server
 
-	if err = as.Serve(ctx, o); err != nil {
+	if err = as.Serve(ctx, mgr); err != nil {
 		errChan <- err
 	}
 }

cmd/firefly_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger/firefly/mocks/apiservermocks"
-	"github.com/hyperledger/firefly/mocks/orchestratormocks"
+	"github.com/hyperledger/firefly/mocks/namespacemocks"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -33,20 +33,20 @@ import (
 const configDir = "../test/data/config"
 
 func TestGetEngine(t *testing.T) {
-	assert.NotNil(t, getOrchestrator())
+	assert.NotNil(t, getRootManager())
 }
 
 func TestExecMissingConfig(t *testing.T) {
-	_utOrchestrator = &orchestratormocks.Orchestrator{}
-	defer func() { _utOrchestrator = nil }()
+	_utManager = &namespacemocks.Manager{}
+	defer func() { _utManager = nil }()
 	viper.Reset()
 	err := Execute()
 	assert.Regexp(t, "Not Found", err)
 }
 
 func TestShowConfig(t *testing.T) {
-	_utOrchestrator = &orchestratormocks.Orchestrator{}
-	defer func() { _utOrchestrator = nil }()
+	_utManager = &namespacemocks.Manager{}
+	defer func() { _utManager = nil }()
 	viper.Reset()
 	rootCmd.SetArgs([]string{"showconf"})
 	defer rootCmd.SetArgs([]string{})
@@ -55,33 +55,33 @@ func TestShowConfig(t *testing.T) {
 }
 
 func TestExecEngineInitFail(t *testing.T) {
-	o := &orchestratormocks.Orchestrator{}
+	o := &namespacemocks.Manager{}
 	o.On("Init", mock.Anything, mock.Anything).Return(fmt.Errorf("splutter"))
-	_utOrchestrator = o
-	defer func() { _utOrchestrator = nil }()
+	_utManager = o
+	defer func() { _utManager = nil }()
 	os.Chdir(configDir)
 	err := Execute()
 	assert.Regexp(t, "splutter", err)
 }
 
 func TestExecEngineStartFail(t *testing.T) {
-	o := &orchestratormocks.Orchestrator{}
+	o := &namespacemocks.Manager{}
 	o.On("Init", mock.Anything, mock.Anything).Return(nil)
 	o.On("Start").Return(fmt.Errorf("bang"))
-	_utOrchestrator = o
-	defer func() { _utOrchestrator = nil }()
+	_utManager = o
+	defer func() { _utManager = nil }()
 	os.Chdir(configDir)
 	err := Execute()
 	assert.Regexp(t, "bang", err)
 }
 
 func TestExecOkExitSIGINT(t *testing.T) {
-	o := &orchestratormocks.Orchestrator{}
+	o := &namespacemocks.Manager{}
 	o.On("Init", mock.Anything, mock.Anything).Return(nil)
 	o.On("Start").Return(nil)
 	o.On("WaitStop").Return()
-	_utOrchestrator = o
-	defer func() { _utOrchestrator = nil }()
+	_utManager = o
+	defer func() { _utManager = nil }()
 
 	os.Chdir(configDir)
 	go func() {
@@ -92,7 +92,7 @@ func TestExecOkExitSIGINT(t *testing.T) {
 }
 
 func TestExecOkRestartThenExit(t *testing.T) {
-	o := &orchestratormocks.Orchestrator{}
+	o := &namespacemocks.Manager{}
 	var orContext context.Context
 	initCount := 0
 	init := o.On("Init", mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -110,16 +110,16 @@ func TestExecOkRestartThenExit(t *testing.T) {
 	ws.RunFn = func(a mock.Arguments) {
 		<-orContext.Done()
 	}
-	_utOrchestrator = o
-	defer func() { _utOrchestrator = nil }()
+	_utManager = o
+	defer func() { _utManager = nil }()
 
 	os.Chdir(configDir)
 	err := Execute()
 	assert.EqualError(t, err, "second run")
 }
 
 func TestExecOkRestartConfigProblem(t *testing.T) {
-	o := &orchestratormocks.Orchestrator{}
+	o := &namespacemocks.Manager{}
 	tmpDir, err := os.MkdirTemp(os.TempDir(), "ut")
 	assert.NoError(t, err)
 	defer os.RemoveAll(tmpDir)
@@ -135,16 +135,16 @@ func TestExecOkRestartConfigProblem(t *testing.T) {
 		<-orContext.Done()
 		os.Chdir(tmpDir) // this will mean we fail to read the config
 	})
-	_utOrchestrator = o
-	defer func() { _utOrchestrator = nil }()
+	_utManager = o
+	defer func() { _utManager = nil }()
 
 	os.Chdir(configDir)
 	err = Execute()
 	assert.Regexp(t, "Config File.*Not Found", err)
 }
 
 func TestAPIServerError(t *testing.T) {
-	o := &orchestratormocks.Orchestrator{}
+	o := &namespacemocks.Manager{}
 	o.On("Init", mock.Anything, mock.Anything).Return(nil)
 	o.On("Start").Return(nil)
 	as := &apiservermocks.Server{}

docs/config_docs_generate_test.go

@@ -27,13 +27,13 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/config"
 	"github.com/hyperledger/firefly/internal/apiserver"
-	"github.com/hyperledger/firefly/internal/orchestrator"
+	"github.com/hyperledger/firefly/internal/namespace"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestGenerateConfigDocs(t *testing.T) {
 	// Initialize config of all plugins
-	orchestrator.NewOrchestrator(false)
+	namespace.NewNamespaceManager(false)
 	apiserver.InitConfig()
 	f, err := os.Create(filepath.Join("reference", "config.md"))
 	assert.NoError(t, err)

docs/config_docs_test.go

@@ -28,13 +28,13 @@ import (
 
 	"github.com/hyperledger/firefly-common/pkg/config"
 	"github.com/hyperledger/firefly/internal/apiserver"
-	"github.com/hyperledger/firefly/internal/orchestrator"
+	"github.com/hyperledger/firefly/internal/namespace"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestConfigDocsUpToDate(t *testing.T) {
 	// Initialize config of all plugins
-	orchestrator.NewOrchestrator(false)
+	namespace.NewNamespaceManager(false)
 	apiserver.InitConfig()
 	generatedConfig, err := config.GenerateConfigMarkdown(context.Background(), config.GetKnownKeys())
 	assert.NoError(t, err)