MINOR: remove log_message in tcp_check and use only check_comment

haproxytech · Jun 13, 2024 · cb22d63 · cb22d63
1 parent 58cdaf9
commit cb22d63
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 28 deletions.
diff --git a/configuration/tcp_check.go b/configuration/tcp_check.go
@@ -285,8 +285,8 @@ func ParseTCPCheck(f types.Action) (check *models.TCPCheck, err error) {
 	switch v := f.(type) {
 	case *tcp_actions.CheckComment:
 		check = &models.TCPCheck{
-			Action:     models.TCPCheckActionComment,
-			LogMessage: v.LogMessage,
+			Action:       models.TCPCheckActionComment,
+			CheckComment: v.LogMessage,
 		}
 	case *actions.CheckConnect:
 		check = &models.TCPCheck{
@@ -373,7 +373,7 @@ func SerializeTCPCheck(f models.TCPCheck) (action types.Action, err error) { //n
 	switch f.Action {
 	case models.TCPCheckActionComment:
 		return &tcp_actions.CheckComment{
-			LogMessage: f.LogMessage,
+			LogMessage: f.CheckComment,
 		}, nil
 	case models.TCPCheckActionConnect:
 		return &actions.CheckConnect{

diff --git a/models/tcp_check.go b/models/tcp_check.go
diff --git a/models/tcp_check_compare.go b/models/tcp_check_compare.go
diff --git a/models/tcp_check_compare_test.go b/models/tcp_check_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -6442,12 +6442,6 @@ definitions:
               x-dependency:
                   action:
                       value: connect
-          log_message:
-              type: string
-              x-dependency:
-                  action:
-                      required: true
-                      value: comment
           match:
               enum:
                   - string

diff --git a/specification/models/configuration/tcp/check.yaml b/specification/models/configuration/tcp/check.yaml
@@ -19,12 +19,6 @@ tcp_check:
         - set-var-fmt
         - unset-var
       x-nullable: false
-    log_message:
-      type: string
-      x-dependency:
-        action:
-          value: comment
-          required: true
     check_comment:
       type: string
       x-nullable: false