Added dynamic config update apis

Author: akclace

cmd/openrun/server_cmds.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -44,6 +45,24 @@ func getServerCommands(serverConfig *types.ServerConfig, clientConfig *types.Cli
 						return stopServer(cCtx, clientConfig)
 					},
 				},
+				{
+					Name:   "show-config",
+					Usage:  "Show the server dynamic config",
+					Flags:  flags,
+					Before: altsrc.InitInputSourceWithContext(flags, altsrc.NewTomlSourceFromFlagFunc(configFileFlagName)),
+					Action: func(cCtx *cli.Context) error {
+						return showConfig(cCtx, clientConfig)
+					},
+				},
+				{
+					Name:   "update-config",
+					Usage:  "Update the server dynamic config",
+					Flags:  flags,
+					Before: altsrc.InitInputSourceWithContext(flags, altsrc.NewTomlSourceFromFlagFunc(configFileFlagName)),
+					Action: func(cCtx *cli.Context) error {
+						return updateConfig(cCtx, clientConfig)
+					},
+				},
 			},
 		},
 	}, nil
@@ -127,3 +146,49 @@ func stopServer(_ *cli.Context, clientConfig *types.ClientConfig) error {
 	}
 	return nil
 }
+
+func showConfig(_ *cli.Context, clientConfig *types.ClientConfig) error {
+	client := system.NewHttpClient(clientConfig.ServerUri, clientConfig.AdminUser, clientConfig.Client.AdminPassword, clientConfig.Client.SkipCertCheck)
+
+	var response types.ConfigResponse
+	err := client.Get("/_openrun/config", nil, &response)
+	if err != nil {
+		return err
+	}
+	json, err := json.MarshalIndent(response.DynamicConfig, "", "  ")
+	if err != nil {
+		return err
+	}
+	fmt.Printf("%s\n", string(json))
+	return nil
+}
+
+func updateConfig(cCtx *cli.Context, clientConfig *types.ClientConfig) error {
+	client := system.NewHttpClient(clientConfig.ServerUri, clientConfig.AdminUser, clientConfig.Client.AdminPassword, clientConfig.Client.SkipCertCheck)
+
+	if cCtx.NArg() != 1 {
+		return fmt.Errorf("expected one argument: <configFilePath>")
+	}
+	configFilePath := cCtx.Args().Get(0)
+	configFile, err := os.ReadFile(configFilePath)
+	if err != nil {
+		return err
+	}
+	var inputConfig types.DynamicConfig
+	err = json.Unmarshal(configFile, &inputConfig)
+	if err != nil {
+		return err
+	}
+	var response types.ConfigResponse
+	err = client.Post("/_openrun/config", nil, &inputConfig, &response)
+	if err != nil {
+		return err
+	}
+
+	json, err := json.MarshalIndent(response.DynamicConfig, "", "  ")
+	if err != nil {
+		return err
+	}
+	fmt.Printf("%s\n", string(json))
+	return nil
+}

internal/server/router.go

@@ -1078,9 +1078,21 @@ func (h *Handler) listSyncEntries(r *http.Request) (any, error) {
 	return results, nil
 }
 
+func (h *Handler) configGet(r *http.Request) (any, error) {
+	return types.ConfigResponse{DynamicConfig: h.server.GetDynamicConfig()}, nil
+}
+
 func (h *Handler) configUpdate(r *http.Request) (any, error) {
-	// TODO
-	return nil, nil
+	var dynamicConfig types.DynamicConfig
+	err := json.NewDecoder(r.Body).Decode(&dynamicConfig)
+	if err != nil {
+		return nil, types.CreateRequestError(err.Error(), http.StatusBadRequest)
+	}
+	newConfig, err := h.server.UpdateDynamicConfig(r.Context(), &dynamicConfig)
+	if err != nil {
+		return nil, types.CreateRequestError(err.Error(), http.StatusBadRequest)
+	}
+	return types.ConfigResponse{DynamicConfig: *newConfig}, nil
 }
 
 // serveInternal returns a handler for the internal APIs for app admin and management
@@ -1208,7 +1220,12 @@ func (h *Handler) serveInternal(enableBasicAuth bool) http.Handler {
 		h.apiHandler(w, r, enableBasicAuth, "list_sync", h.listSyncEntries)
 	}))
 
-	// API to run sync
+	// API to get config
+	r.Get("/config", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		h.apiHandler(w, r, enableBasicAuth, "config_get", h.configGet)
+	}))
+
+	// API to update config
 	r.Post("/config", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		h.apiHandler(w, r, enableBasicAuth, "config_update", h.configUpdate)
 	}))

internal/server/server.go

@@ -10,6 +10,7 @@ import (
 	"crypto/x509"
 	"database/sql"
 	"embed"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -230,16 +231,58 @@ func NewServer(config *types.ServerConfig) (*Server, error) {
 		// TODO : notify other instances about new dynamic config
 	}
 
+	err = server.SaveDynamicConfig(context.Background())
+	if err != nil {
+		return nil, fmt.Errorf("error saving dynamic config: %w", err)
+	}
+
 	// Start the idle shutdown check
 	server.syncTimer = time.NewTicker(time.Minute) // run sync every minute
 	go server.syncRunner()
 	return server, nil
 }
 
-func (s *Server) GetRBACConfig() types.RBACConfig {
+func (s *Server) GetDynamicConfig() types.DynamicConfig {
 	s.configMu.RLock()
 	defer s.configMu.RUnlock()
-	return s.dynamicConfig.RBAC
+	return *s.dynamicConfig // return a copy of the dynamic config
+}
+
+func (s *Server) SaveDynamicConfig(ctx context.Context) error {
+	targetPath := os.ExpandEnv("$OPENRUN_HOME/config/dynamic_config.json")
+	configJson, err := json.MarshalIndent(s.dynamicConfig, "", "  ")
+	if err != nil {
+		return fmt.Errorf("error marshalling dynamic config: %w", err)
+	}
+	err = os.WriteFile(targetPath, configJson, 0600)
+	if err != nil {
+		return fmt.Errorf("error writing dynamic config: %w", err)
+	}
+	return nil
+}
+
+func (s *Server) UpdateDynamicConfig(ctx context.Context, newConfig *types.DynamicConfig) (*types.DynamicConfig, error) {
+	s.configMu.Lock()
+	defer s.configMu.Unlock()
+
+	currentVersionId := s.dynamicConfig.VersionId
+	if currentVersionId != newConfig.VersionId {
+		// stale update
+		return nil, fmt.Errorf("config version id mismatch, expected %s, got %s", currentVersionId, newConfig.VersionId)
+	}
+
+	newConfig.VersionId = "ver_" + ksuid.New().String()
+	err := s.db.UpdateConfig(ctx, system.GetContextUserId(ctx), currentVersionId, newConfig)
+	if err != nil {
+		return nil, fmt.Errorf("error updating dynamic config: %w", err)
+	}
+	s.dynamicConfig = newConfig
+	err = s.SaveDynamicConfig(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error saving dynamic config: %w", err)
+	}
+	//TODO: notify other instances about new dynamic config
+	return newConfig, nil
 }
 
 func (s *Server) appNotifyFunction(updatePayload types.AppUpdatePayload) {

internal/types/api.go

@@ -253,6 +253,10 @@ type SyncListResponse struct {
 	Entries []*SyncEntry `json:"entries"`
 }
 
+type ConfigResponse struct {
+	DynamicConfig DynamicConfig `json:"dynamic_config"`
+}
+
 type AppReloadOption string
 
 const (

tests/commander/test_config.yaml

@@ -0,0 +1,22 @@
+config:
+  env:
+    CL_CONFIG_FILE: openrun.toml
+    GOCOVERDIR: ${GOCOVERDIR}/../client
+    PATH: ${PATH}
+tests:
+  config0001:
+    command: ../openrun server show-config > config1.json
+  config0002:
+    command: diff -b config/dynamic_config.json config1.json
+    exit-code: 0 # no diff
+  config0003:
+    command: ../openrun server update-config config1.json > config2.json
+  config0004: # version id gets updated after update
+    command: diff -b config/dynamic_config.json config1.json
+    stdout:
+      line-count: 4
+    exit-code: 1
+  config0005: # stale update
+    command: ../openrun server update-config config1.json
+    stderr: "version id mismatch"
+    exit-code: 1

tests/commander/test_load_app.yaml

@@ -82,7 +82,7 @@ tests:
     stdout: "Disallow: /"
     exit-code: 0
   load0070: # Update app code
-    command: perl -pi -e 's/Disk Usage/DiskTest Usage/g' ./disk_usage/app.star && sleep 4
+    command: perl -pi -e 's/Disk Usage/DiskTest Usage/g' ./disk_usage/app.star && sleep 5
   load0080: # with --dev, changes are picked up immediately
     command: curl -su "admin:qwerty" localhost:25222/disk_usage_dev
     stderr: