From fb6602f431f5595b97ea3726467ec782fa50ceb8 Mon Sep 17 00:00:00 2001
From: Alex W <embezzle.dev@proton.me>
Date: Mon, 27 May 2024 21:47:24 +0100
Subject: [PATCH 1/2] reverse-proxy: T6409: Remove unused backend parameters

---
 .../version/reverseproxy-version.xml.i        |  3 ++
 .../load-balancing_reverse-proxy.xml.in       | 13 -----
 .../xml-component-version.xml.in              |  1 +
 src/migration-scripts/reverse-proxy/0-to-1    | 48 +++++++++++++++++++
 4 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 interface-definitions/include/version/reverseproxy-version.xml.i
 create mode 100755 src/migration-scripts/reverse-proxy/0-to-1

diff --git a/interface-definitions/include/version/reverseproxy-version.xml.i b/interface-definitions/include/version/reverseproxy-version.xml.i
new file mode 100644
index 0000000000..907ea1e5ee
--- /dev/null
+++ b/interface-definitions/include/version/reverseproxy-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/reverseproxy-version.xml.i -->
+<syntaxVersion component='reverse-proxy' version='1'></syntaxVersion>
+<!-- include end -->
diff --git a/interface-definitions/load-balancing_reverse-proxy.xml.in b/interface-definitions/load-balancing_reverse-proxy.xml.in
index 011e1b53c6..e50e6e579c 100644
--- a/interface-definitions/load-balancing_reverse-proxy.xml.in
+++ b/interface-definitions/load-balancing_reverse-proxy.xml.in
@@ -92,19 +92,6 @@
               #include <include/generic-description.xml.i>
               #include <include/haproxy/mode.xml.i>
               #include <include/haproxy/http-response-headers.xml.i>
-              <node name="parameters">
-                <properties>
-                  <help>Backend parameters</help>
-                </properties>
-                <children>
-                  <leafNode name="http-check">
-                    <properties>
-                      <help>HTTP health check</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
               <node name="http-check">
                 <properties>
                   <help>HTTP check configuration</help>
diff --git a/interface-definitions/xml-component-version.xml.in b/interface-definitions/xml-component-version.xml.in
index 10a1be242c..67d86a1d02 100644
--- a/interface-definitions/xml-component-version.xml.in
+++ b/interface-definitions/xml-component-version.xml.in
@@ -48,4 +48,5 @@
   #include <include/version/vyos-accel-ppp-version.xml.i>
   #include <include/version/wanloadbalance-version.xml.i>
   #include <include/version/webproxy-version.xml.i>
+  #include <include/version/reverseproxy-version.xml.i>
 </interfaceDefinition>
diff --git a/src/migration-scripts/reverse-proxy/0-to-1 b/src/migration-scripts/reverse-proxy/0-to-1
new file mode 100755
index 0000000000..62be52ea6c
--- /dev/null
+++ b/src/migration-scripts/reverse-proxy/0-to-1
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2024 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# T6409: Remove unused 'backend bk-example parameters' node
+
+from sys import argv, exit
+from vyos.configtree import ConfigTree
+
+if len(argv) < 2:
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+config = ConfigTree(config_file)
+base = ['load-balancing', 'reverse-proxy', 'backend']
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+else:
+    # we need to run this for every configured network
+    for backend in config.list_nodes(base):
+        param_node = base + [backend, 'parameters']
+        if config.exists(param_node):
+            config.delete(param_node)
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        exit(1)

From dd2516904527c74e01e0ced5166afe72a479ee00 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 30 May 2024 17:25:27 +0200
Subject: [PATCH 2/2] reverse-proxy: T6409: unindent migration script code path

---
 src/migration-scripts/reverse-proxy/0-to-1 | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/migration-scripts/reverse-proxy/0-to-1 b/src/migration-scripts/reverse-proxy/0-to-1
index 62be52ea6c..d614938156 100755
--- a/src/migration-scripts/reverse-proxy/0-to-1
+++ b/src/migration-scripts/reverse-proxy/0-to-1
@@ -33,16 +33,16 @@ base = ['load-balancing', 'reverse-proxy', 'backend']
 if not config.exists(base):
     # Nothing to do
     exit(0)
-else:
-    # we need to run this for every configured network
-    for backend in config.list_nodes(base):
-        param_node = base + [backend, 'parameters']
-        if config.exists(param_node):
-            config.delete(param_node)
-
-    try:
-        with open(file_name, 'w') as f:
-            f.write(config.to_string())
-    except OSError as e:
-        print("Failed to save the modified config: {}".format(e))
-        exit(1)
+
+# we need to run this for every configured network
+for backend in config.list_nodes(base):
+    param_node = base + [backend, 'parameters']
+    if config.exists(param_node):
+        config.delete(param_node)
+
+try:
+    with open(file_name, 'w') as f:
+        f.write(config.to_string())
+except OSError as e:
+    print("Failed to save the modified config: {}".format(e))
+    exit(1)