MINOR: structured: add tables to structured peers

haproxytech · Oct 16, 2024 · 56e4556 · 56e4556
1 parent d4c73a1
commit 56e4556
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 2 deletions.
diff --git a/configuration/structured_peers.go b/configuration/structured_peers.go
@@ -200,6 +200,17 @@ func parsePeerSection(name string, p parser.Parser) (*models.PeerSection, error)
 		return nil, errsa
 	}
 	ps.Servers = serversa
+
+	// tables
+	tables, err := ParseTables(name, p)
+	if err != nil {
+		return nil, err
+	}
+	tablesa, errsa := namedResourceArrayToMap(tables)
+	if errsa != nil {
+		return nil, errsa
+	}
+	ps.Tables = tablesa
 	return ps, nil
 }
 
@@ -233,5 +244,10 @@ func serializePeerSection(a StructuredToParserArgs, ps *models.PeerSection) erro
 			return a.HandleError(strconv.FormatInt(int64(i), 10), PeersParentName, ps.Name, a.TID, a.TID == "", err)
 		}
 	}
+	for _, table := range ps.Tables {
+		if err = p.Insert(parser.Peers, ps.Name, "table", SerializeTable(table), -1); err != nil {
+			return a.HandleError(table.Name, PeersParentName, ps.Name, a.TID, a.TID == "", err)
+		}
+	}
 	return nil
 }
diff --git a/models/peer_section.go b/models/peer_section.go
diff --git a/models/peer_section_compare.go b/models/peer_section_compare.go
diff --git a/models/peer_section_compare_test.go b/models/peer_section_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -4054,6 +4054,9 @@ definitions:
           servers:
             additionalProperties:
               $ref: '#/definitions/server'
+          tables:
+            additionalProperties:
+              $ref: '#/definitions/table'
         type: object
     description: Peer Section with all it's children resources
     type: object

diff --git a/specification/models/configuration/peers.yaml b/specification/models/configuration/peers.yaml
@@ -19,6 +19,9 @@ peer_section:
         servers:
           additionalProperties:
             $ref: "#/definitions/server"
+        tables:
+          additionalProperties:
+            $ref: "#/definitions/table"
 peer_section_base:
   title: Peer Section Base
   description: HAProxy peer_section configuration

diff --git a/test/expected/structured.json b/test/expected/structured.json
@@ -3106,6 +3106,36 @@
                     "port": 1023,
                     "shard": 1
                 }
+            },
+            "tables": {
+                "t1": {
+                    "expire": "5m",
+                    "name":    "t1",
+                    "no_purge": true,
+                    "size":    "200k",
+                    "store":   "gpc0,conn_rate(30s)",
+                    "type":    "string",
+                    "type_len": 1000
+                },
+                "t2": {
+                    "expire": "5m",
+                    "name":    "t2",
+                    "no_purge": true,
+                    "size":    "200k",
+                    "store":   "gpc0,gpc1,conn_rate(30s)",
+                    "type":    "string",
+                    "type_len": 1000
+                },
+                "t9": {
+                    "expire": "5m",
+                    "name":    "t9",
+                    "no_purge": true,
+                    "size":    "200k",
+                    "store":   "gpc0,conn_rate(30s)",
+                    "type":    "string",
+                    "type_len": 1000,
+                    "write_to": "t2"
+                }
             }
         }
     },