From 949a4babb3daf1c585125fa71942fc7fa7832cdf Mon Sep 17 00:00:00 2001
From: Yun Zheng Hu <hu@fox-it.com>
Date: Sat, 18 Nov 2023 21:34:15 +0100
Subject: T2405: add Git support to commit-archive

(cherry picked from commit a89243cfbfc90854a8cddd53c0ffc987f75abcee)
---
 interface-definitions/system-config-mgmt.xml.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'interface-definitions')

diff --git a/interface-definitions/system-config-mgmt.xml.in b/interface-definitions/system-config-mgmt.xml.in
index de5a8cc16..794f9f1a0 100644
--- a/interface-definitions/system-config-mgmt.xml.in
+++ b/interface-definitions/system-config-mgmt.xml.in
@@ -22,6 +22,7 @@
                   </valueHelp>
                   <constraint>
                     <validator name="url --file-transport"/>
+                    <regex>(ssh|git|git\+(\w+)):\/\/.*</regex>
                   </constraint>
                   <multi/>
                 </properties>
-- 
cgit v1.2.3


From e6c1f1ed512e969ff3d4b11692e35b4d0293c3eb Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 18 Nov 2023 21:53:35 +0100
Subject: config-mgmt: T4957: T2405: add proper valueHelp strings for remote
 URL

vyos@vyos# set system config-management commit-archive location
Possible completions:
   uri                  Uniform Resource Identifier

Unfortunately URI is a bit "less" specific - add proper help strings:

vyos@vyos# set system config-management commit-archive location
Possible completions:
   http://<user>:<passwd>@<host>/<path>
   https://<user>:<passwd>@<host>/<path>
   ftp://<user>:<passwd>@<host>/<path>
   sftp://<user>:<passwd>@<host>/<path>
   scp://<user>:<passwd>@<host>/<path>
   tftp://<user>:<passwd>@<host>/<path>
   git+https://<user>:<passwd>@<host>/<path>

(cherry picked from commit dcb277ba0aed4a02f48572d10d3ba242942b8639)
---
 interface-definitions/system-config-mgmt.xml.in | 28 +++++++++++++++++++++++--
 scripts/build-command-templates                 |  2 ++
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/system-config-mgmt.xml.in b/interface-definitions/system-config-mgmt.xml.in
index 794f9f1a0..b01b44bf9 100644
--- a/interface-definitions/system-config-mgmt.xml.in
+++ b/interface-definitions/system-config-mgmt.xml.in
@@ -17,8 +17,32 @@
                 <properties>
                   <help>Commit archive location</help>
                   <valueHelp>
-                    <format>uri</format>
-                    <description>Uniform Resource Identifier</description>
+                    <format>http://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>https://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>ftp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>sftp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>scp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>tftp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>git+https://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <description/>
                   </valueHelp>
                   <constraint>
                     <validator name="url --file-transport"/>
diff --git a/scripts/build-command-templates b/scripts/build-command-templates
index c8ae83d9d..2e7f8b994 100755
--- a/scripts/build-command-templates
+++ b/scripts/build-command-templates
@@ -145,6 +145,8 @@ def get_properties(p, default=None):
             description = v.find("description").text
             if default != None and default.text == format:
                 description += f' (default)'
+            # Is no description was specified, keep it empty
+            if not description: description = ''
             vh.append( (format, description) )
         props["val_help"] = vh
     except:
-- 
cgit v1.2.3


From d87dfa557c962b9ac1bb7483a3b419095ae5fccf Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 19 Nov 2023 22:20:07 +0100
Subject: config-mgmt: T4957: remove TFTP user/pass from completion helper

(cherry picked from commit e92667504e0c503b7c0d125d89d8795d6b6d5876)
---
 interface-definitions/system-config-mgmt.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/system-config-mgmt.xml.in b/interface-definitions/system-config-mgmt.xml.in
index b01b44bf9..61089ce34 100644
--- a/interface-definitions/system-config-mgmt.xml.in
+++ b/interface-definitions/system-config-mgmt.xml.in
@@ -37,7 +37,7 @@
                     <description/>
                   </valueHelp>
                   <valueHelp>
-                    <format>tftp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
+                    <format>tftp://&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
-- 
cgit v1.2.3