MINOR: remove load-server-state-from-file from Global

haproxytech · Jan 8, 2024 · 128a31d · 128a31d
1 parent 7e0743b
commit 128a31d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 73 deletions.
diff --git a/configuration/configuration_test.go b/configuration/configuration_test.go
@@ -210,6 +210,8 @@ global
   set-var proc.threshold int(200),sub(proc.prio)
   set-var-fmt proc.bootid "%pid|%t"
   set-var-fmt proc.current_state "primary"
+  server-state-base /path
+  server-state-file serverstatefile
   presetenv first order
   setenv third sister
   resetenv first second

diff --git a/configuration/global_test.go b/configuration/global_test.go
@@ -171,6 +171,12 @@ func TestGetGlobal(t *testing.T) {
 	if global.SpreadChecks != 10 {
 		t.Errorf("SpreadChecks is %v, expected 10", global.SpreadChecks)
 	}
+	if global.ServerStateBase != "/path" {
+		t.Errorf("ServerStateBase is %v, expected /path", global.ServerStateBase)
+	}
+	if global.ServerStateFile != "serverstatefile" {
+		t.Errorf("ServerStateFile is %v, expected serverstatefile", global.ServerStateFile)
+	}
 	if global.WurflOptions.DataFile != "path" {
 		t.Errorf("WurflDataFile is %v, expected path", global.WurflOptions.DataFile)
 	}

diff --git a/models/global.go b/models/global.go
diff --git a/models/global_compare.go b/models/global_compare.go
diff --git a/models/global_compare_test.go b/models/global_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -1212,12 +1212,6 @@ definitions:
               type: string
           limited_quic:
               type: boolean
-          load_server_state_from_file:
-              enum:
-                  - global
-                  - local
-                  - none
-              type: string
           localpeer:
               pattern: ^[^\s]+$
               type: string

diff --git a/specification/models/configuration/global.yaml b/specification/models/configuration/global.yaml
@@ -837,9 +837,6 @@ global:
     unsetenv:
       type: string
       x-display-name: Removes environment variables specified in arguments
-    load_server_state_from_file:
-      type: string
-      enum: [global, local, none]
     default_path:
       type: object
       required: