feat(api): add scheduler config update events

api/api_suite_test.go

@@ -109,13 +109,13 @@ var _ = BeforeEach(func() {
 	lockKey = config.GetString("watcher.lockKey")
 
 	mockRedisClient.EXPECT().Ping().Return(redis.NewStatusResult("PONG", nil)).AnyTimes()
-	app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+	app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 
 	Expect(err).NotTo(HaveOccurred())
 
 	mockLogin = loginMocks.NewMockLogin(mockCtrl)
 	app.Login = mockLogin
-	
+
 	mockSchedulerEventStorage = storageMock.NewMockSchedulerEventStorage(mockCtrl)
 	app.SchedulerEventStorage = mockSchedulerEventStorage
 })

api/app.go

@@ -95,6 +95,7 @@ func NewApp(
 	redisTraceWrapperOrNil redisinterfaces.TraceWrapper,
 	kubernetesClientOrNil kubernetes.Interface,
 	metricsClientsetOrNil metricsClient.Interface,
+	schedulerEventStorageOrNil storage.SchedulerEventStorage,
 ) (*App, error) {
 	a := &App{
 		Config:         config,
@@ -117,6 +118,7 @@ func NewApp(
 		redisClientOrNil, redisTraceWrapperOrNil,
 		kubernetesClientOrNil,
 		metricsClientsetOrNil,
+		schedulerEventStorageOrNil,
 	)
 	if err != nil {
 		return nil, err
@@ -433,6 +435,7 @@ func (a *App) configureApp(
 	redisTraceWrapperOrNil redisinterfaces.TraceWrapper,
 	kubernetesClientOrNil kubernetes.Interface,
 	metricsClientsetOrNil metricsClient.Interface,
+	schedulerEventStorageOrNil storage.SchedulerEventStorage,
 ) error {
 	a.loadConfigurationDefaults()
 	a.configureLogger()
@@ -456,7 +459,7 @@ func (a *App) configureApp(
 	a.configureWilliam()
 	a.configureServer()
 	a.configureEnvironment()
-	a.configureEventStorage()
+	a.configureEventStorage(schedulerEventStorageOrNil)
 	return nil
 }
 
@@ -507,7 +510,12 @@ func (a *App) configureCache() {
 	a.SchedulerCache = models.NewSchedulerCache(expirationTime, cleanupInterval, a.Logger)
 }
 
-func (a *App) configureEventStorage() {
+func (a *App) configureEventStorage(schedulerEventStorageOrNil storage.SchedulerEventStorage) {
+	if schedulerEventStorageOrNil != nil {
+		a.SchedulerEventStorage = schedulerEventStorageOrNil
+		return
+	}
+
 	a.SchedulerEventStorage = storageredis.NewRedisSchedulerEventStorage(a.RedisClient.Client)
 }
 

api/app_test.go

@@ -18,7 +18,7 @@ import (
 var _ = Describe("App", func() {
 	Describe("NewApp", func() {
 		It("should return new app", func() {
-			application, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+			application, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(application).NotTo(BeNil())
 			Expect(application.Address).NotTo(Equal(""))
@@ -36,22 +36,22 @@ var _ = Describe("App", func() {
 
 			// should use development environment
 			config.Set(api.EnvironmentConfig, api.DevEnvironment)
-			application, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+			application, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(application.RoomAddrGetter).To(BeAssignableToTypeOf(&models.RoomAddressesFromNodePort{}))
 		})
 
 		It("should fail if some error occurred", func() {
 			config.Set("newrelic.key", 12345)
-			application, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+			application, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("license length is not 40"))
 			Expect(application).To(BeNil())
 		})
 
 		It("should not fail if no newrelic key is provided", func() {
 			config.Set("newrelic.key", "")
-			application, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+			application, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(application).NotTo(BeNil())
 		})

api/auth_middleware_test.go

@@ -41,7 +41,7 @@ var _ = Describe("AuthMiddleware", func() {
 		config.Set("william.checkTimeout", "1s")
 
 		var err error
-		app, err = NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+		app, err = NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 		Expect(err).NotTo(HaveOccurred())
 
 		authMiddleware = NewAuthMiddleware(app, auth.ActionResolver("SomePermission"))

api/room_handler_test.go

@@ -272,7 +272,7 @@ forwarders:
 				createNamespace(namespace, clientset)
 				pod, err = createPod(roomName, namespace, clientset)
 				Expect(err).NotTo(HaveOccurred())
-				app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+				app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 				Expect(err).NotTo(HaveOccurred())
 				app.Forwarders = []*eventforwarder.Info{
 					&eventforwarder.Info{
@@ -572,7 +572,7 @@ forwarders:
 					createNamespace(namespace, clientset)
 					pod, err = createPod(roomName, namespace, clientset)
 					Expect(err).NotTo(HaveOccurred())
-					app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+					app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 					Expect(err).NotTo(HaveOccurred())
 					app.Forwarders = []*eventforwarder.Info{
 						&eventforwarder.Info{
@@ -754,7 +754,7 @@ forwarders:
 		var app *api.App
 		BeforeEach(func() {
 			var err error
-			app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+			app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 			Expect(err).NotTo(HaveOccurred())
 			app.Forwarders = []*eventforwarder.Info{
 				&eventforwarder.Info{
@@ -895,7 +895,7 @@ forwarders:
 			createNamespace(namespace, clientset)
 			pod, err = createPod("roomName", namespace, clientset)
 			Expect(err).NotTo(HaveOccurred())
-			app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+			app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 			Expect(err).NotTo(HaveOccurred())
 			app.Forwarders = []*eventforwarder.Info{
 				&eventforwarder.Info{

api/scheduler_handler.go

@@ -11,11 +11,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/topfreegames/maestro/api/auth"
 	"net/http"
 	"strings"
 	"time"
 
+	"github.com/topfreegames/maestro/api/auth"
+
 	"github.com/topfreegames/go-extensions-k8s-client-go/kubernetes"
 	maestroErrors "github.com/topfreegames/maestro/errors"
 	"github.com/topfreegames/maestro/reporters"
@@ -282,6 +283,7 @@ func updateSchedulerConfigCommon(
 		nil,
 		app.Config,
 		operationManager,
+		app.SchedulerEventStorage,
 	)
 	logger.WithField("time", time.Now()).Info("finished update")
 
@@ -644,7 +646,7 @@ func (g *SchedulerImageHandler) update(
 
 	db := g.App.DBClient.WithContext(r.Context())
 	err = controller.UpdateSchedulerImage(r.Context(), logger, g.App.RoomManager, mr, db, g.App.RedisClient, g.App.KubernetesClient,
-		schedulerName, imageParams, maxSurge, &clock.Clock{}, g.App.Config, operationManager)
+		schedulerName, imageParams, maxSurge, &clock.Clock{}, g.App.Config, operationManager, g.App.SchedulerEventStorage)
 	if err != nil {
 		status = http.StatusInternalServerError
 		if strings.Contains(err.Error(), "not found") {
@@ -749,7 +751,7 @@ func (g *SchedulerUpdateMinHandler) update(
 	logger.Info("starting controllers update min")
 	db := g.App.DBClient.WithContext(r.Context())
 	err = controller.UpdateSchedulerMin(r.Context(), logger, g.App.RoomManager, mr, db, g.App.RedisClient, schedulerName,
-		schedulerMin, &clock.Clock{}, g.App.Config, operationManager)
+		schedulerMin, &clock.Clock{}, g.App.Config, operationManager, g.App.SchedulerEventStorage)
 	if err != nil {
 		status = http.StatusInternalServerError
 		if strings.Contains(err.Error(), "not found") {

api/scheduler_handler_test.go

@@ -759,6 +759,8 @@ autoscaling:
 
 					calls.Finish()
 
+					MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 					recorder = httptest.NewRecorder()
 					app.Router.ServeHTTP(recorder, request)
 					Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
@@ -811,6 +813,8 @@ autoscaling:
 					)
 					Expect(err).NotTo(HaveOccurred())
 
+					MockUpdateSchedulerEvents(mockSchedulerEventStorage, "scheduler-name", "v1.1", "")
+
 					app.Router.ServeHTTP(recorder, request)
 					Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
 					Expect(recorder.Code).To(Equal(http.StatusCreated))
@@ -1109,6 +1113,8 @@ autoscaling:
 
 					calls.Finish()
 
+					MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 					recorder = httptest.NewRecorder()
 					app.Router.ServeHTTP(recorder, request)
 					var response map[string]interface{}
@@ -1525,7 +1531,7 @@ game: game-name
 				err = yaml.Unmarshal([]byte(yamlString), &configYaml1)
 				Expect(err).NotTo(HaveOccurred())
 				config.Set("basicauth.tryOauthIfUnset", true)
-				app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+				app, err = api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 				Expect(err).NotTo(HaveOccurred())
 				app.Login = mockLogin
 			})
@@ -2163,6 +2169,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
@@ -2257,6 +2265,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
@@ -2545,7 +2555,7 @@ game: game-name
 				Expect(err).NotTo(HaveOccurred())
 				config.Set("basicauth.tryOauthIfUnset", true)
 
-				app, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+				app, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 				Expect(err).NotTo(HaveOccurred())
 				app.Login = mockLogin
 				newImageName := "new-image"
@@ -2626,6 +2636,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
@@ -2662,7 +2674,7 @@ game: game-name
 				Expect(err).NotTo(HaveOccurred())
 				scheduler1 = models.NewScheduler(configYaml1.Name, configYaml1.Game, jsonString)
 
-				app, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+				app, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 				Expect(err).NotTo(HaveOccurred())
 				app.Login = mockLogin
 
@@ -2748,6 +2760,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
@@ -2866,6 +2880,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				var response map[string]interface{}
@@ -3030,6 +3046,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 
 				app.Router.ServeHTTP(recorder, request)
@@ -3172,6 +3190,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				Expect(recorder.Code).To(Equal(http.StatusOK))
@@ -3241,7 +3261,7 @@ game: game-name
 
 				config, err := GetDefaultConfig()
 				config.Set("basicauth.tryOauthIfUnset", true)
-				app, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+				app, err := api.NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 				Expect(err).NotTo(HaveOccurred())
 				app.Login = mockLogin
 
@@ -3289,6 +3309,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 				app.Router.ServeHTTP(recorder, request)
 				Expect(recorder.Code).To(Equal(http.StatusOK))
@@ -3367,6 +3389,8 @@ game: game-name
 
 				calls.Finish()
 
+				MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, scheduler1.Version, "")
+
 				recorder = httptest.NewRecorder()
 
 				app.Router.ServeHTTP(recorder, request)

api/scheduler_rollback_handler_test.go

@@ -112,6 +112,8 @@ autoscaling:
 
 			calls.Finish()
 
+			MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, "v1.1", "")
+
 			app.Router.ServeHTTP(recorder, request)
 			Expect(recorder.Code).To(Equal(http.StatusOK))
 			Expect(recorder.Body.String()).To(Equal(`{"success": true}`))
@@ -240,6 +242,8 @@ autoscaling:
 
 			MockUpdateVersionsTable(mockDb, nil)
 
+			MockUpdateSchedulerEvents(mockSchedulerEventStorage, scheduler1.Name, "v1.1", "")
+
 			app.Router.ServeHTTP(recorder, request)
 			Expect(recorder.Code).To(Equal(http.StatusOK))
 

api/william_handler_test.go

@@ -31,7 +31,7 @@ var _ = Describe("WilliamHandler", func() {
 		config.Set("william.enabled", true)
 
 		var err error
-		app, err = NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset)
+		app, err = NewApp("0.0.0.0", 9998, config, logger, false, "", mockDb, mockCtxWrapper, mockRedisClient, mockRedisTraceWrapper, clientset, metricsClientset, mockSchedulerEventStorage)
 		Expect(err).NotTo(HaveOccurred())
 
 		request, _ = http.NewRequest("GET", "/am", nil)

cmd/start.go

@@ -54,7 +54,7 @@ var startCmd = &cobra.Command{
 
 		cmdL.Info("starting maestro")
 
-		app, err := api.NewApp(bind, port, config, log, incluster, kubeconfig, nil, nil, nil, nil, nil, nil)
+		app, err := api.NewApp(bind, port, config, log, incluster, kubeconfig, nil, nil, nil, nil, nil, nil, nil)
 		if err != nil {
 			cmdL.Fatal(err)
 		}