Added force option for config udpate

Author: akclace

cmd/openrun/server_cmds.go

@@ -9,8 +9,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net/url"
 	"os"
 	"os/signal"
+	"strconv"
 
 	"github.com/openrundev/openrun/internal/system"
 	"github.com/openrundev/openrun/internal/types"
@@ -57,7 +59,7 @@ func getServerCommands(serverConfig *types.ServerConfig, clientConfig *types.Cli
 				{
 					Name:   "update-config",
 					Usage:  "Update the server dynamic config",
-					Flags:  flags,
+					Flags:  []cli.Flag{newBoolFlag("force", "f", "Force update even if the config version id is different", false)},
 					Before: altsrc.InitInputSourceWithContext(flags, altsrc.NewTomlSourceFromFlagFunc(configFileFlagName)),
 					Action: func(cCtx *cli.Context) error {
 						return updateConfig(cCtx, clientConfig)
@@ -179,8 +181,12 @@ func updateConfig(cCtx *cli.Context, clientConfig *types.ClientConfig) error {
 	if err != nil {
 		return err
 	}
+
+	values := url.Values{}
+	values.Add("force", strconv.FormatBool(cCtx.Bool("force")))
+
 	var response types.ConfigResponse
-	err = client.Post("/_openrun/config", nil, &inputConfig, &response)
+	err = client.Post("/_openrun/config", values, &inputConfig, &response)
 	if err != nil {
 		return err
 	}

internal/server/router.go

@@ -1084,11 +1084,15 @@ func (h *Handler) configGet(r *http.Request) (any, error) {
 
 func (h *Handler) configUpdate(r *http.Request) (any, error) {
 	var dynamicConfig types.DynamicConfig
-	err := json.NewDecoder(r.Body).Decode(&dynamicConfig)
+	force, err := parseBoolArg(r.URL.Query().Get("force"), false)
+	if err != nil {
+		return nil, err
+	}
+	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)
+	newConfig, err := h.server.UpdateDynamicConfig(r.Context(), &dynamicConfig, force)
 	if err != nil {
 		return nil, types.CreateRequestError(err.Error(), http.StatusBadRequest)
 	}

internal/server/server.go

@@ -289,12 +289,12 @@ func (s *Server) updateDynamicConfigCache(ctx context.Context, newConfig *types.
 	return nil
 }
 
-func (s *Server) UpdateDynamicConfig(ctx context.Context, newConfig *types.DynamicConfig) (*types.DynamicConfig, error) {
+func (s *Server) UpdateDynamicConfig(ctx context.Context, newConfig *types.DynamicConfig, force bool) (*types.DynamicConfig, error) {
 	s.configMu.Lock()
 	defer s.configMu.Unlock()
 
 	currentVersionId := s.dynamicConfig.VersionId
-	if currentVersionId != newConfig.VersionId {
+	if currentVersionId != newConfig.VersionId && !force {
 		// stale update
 		return nil, fmt.Errorf("config version id mismatch, expected %s, got %s", currentVersionId, newConfig.VersionId)
 	}

tests/commander/test_config.yaml

@@ -20,3 +20,6 @@ tests:
     command: ../openrun server update-config config1.json
     stderr: "version id mismatch"
     exit-code: 1
+  config0006: # force stale update
+    command: ../openrun server update-config --force config1.json
+    exit-code: 0