From 2bcd429bee1e3ad778a122ce4ea4b0f72844c355 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 15 Aug 2023 20:37:30 +0200
Subject: [PATCH] CLI pipe changes: added arg to tail, exit on error.

---
 CHANGELOG.md            |  5 +++++
 apps/cli/cli_generate.c |  4 ++--
 apps/cli/cli_pipe.c     | 35 +++++++++++++++++++++++++++++++----
 test/test_cli_pipe.sh   |  9 ++++++---
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e27e691..d71c0c94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,11 @@
 ## 6.4.0
 Expected: October 2023
 
+### C/CLI-API changes on existing features
+Developers may need to change their code
+
+* CLI pipe function: added arg to `pipe_tail_fn()`
+
 ### Minor features
 
 * Removed sending restconf config inline using -R when CLICON_BACKEND_RESTCONF_PROCESS=true
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 0691d03a..8dd6ffa2 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -1145,8 +1145,8 @@ yang2cli_uses(clicon_handle h,
     if (ys_grouping_resolve(ys, prefix, id, &ygrouping) < 0)
         goto done;
     if (ygrouping == NULL){
-        fprintf(stderr, "%s grouping %s not found\n", __FUNCTION__, id);
-        goto ok;
+        clicon_err(OE_YANG, 0, "grouping %s not found in \n", yang_argument_get(ys));
+        goto done;
     }
     if ((cbtree = cbuf_new()) == NULL){
         clicon_err(OE_XML, errno, "cbuf_new");
diff --git a/apps/cli/cli_pipe.c b/apps/cli/cli_pipe.c
index 334d12c4..4089daab 100644
--- a/apps/cli/cli_pipe.c
+++ b/apps/cli/cli_pipe.c
@@ -176,7 +176,7 @@ pipe_wc_fn(clicon_handle h,
     char   *option = NULL;
     
     if (cvec_len(argv) != 1){
-        clicon_err(OE_PLUGIN, EINVAL, "Received %d arguments. Expected: <option>", cvec_len(argv));
+        clicon_err(OE_PLUGIN, EINVAL, "Received %d arguments. Expected: <NUM>", cvec_len(argv));
         goto done;
     }
     if ((cv = cvec_i(argv, 0)) != NULL &&
@@ -196,10 +196,37 @@ pipe_wc_fn(clicon_handle h,
  */
 int
 pipe_tail_fn(clicon_handle h,
-           cvec         *cvv,
-           cvec         *argv)
+             cvec         *cvv,
+             cvec         *argv)
 {
-    return pipe_arg_fn(h, TAIL_BIN, "-5", NULL);
+    int     retval = -1;
+    char   *value = NULL;
+    cg_var *cv;
+    char   *str;
+    char   *option = NULL;
+    char   *argname = NULL;
+
+    if (cvec_len(argv) != 2){
+        clicon_err(OE_PLUGIN, EINVAL, "Received %d arguments. Expected: <option> <argname>", cvec_len(argv));
+        goto done;
+    }
+    if ((cv = cvec_i(argv, 0)) != NULL &&
+        (str = cv_string_get(cv)) != NULL &&
+        strlen(str))
+        option = str;
+    if ((cv = cvec_i(argv, 1)) != NULL &&
+        (str = cv_string_get(cv)) != NULL &&
+        strlen(str))
+        argname = str;
+    if (argname && strlen(argname)){
+        if ((cv = cvec_find_var(cvv, argname)) != NULL &&
+            (str = cv_string_get(cv)) != NULL &&
+            strlen(str))
+            value = str;
+    }
+    return pipe_arg_fn(h, TAIL_BIN, option, value);
+ done:
+    return retval;
 }
 
 /*! Output pipe translate from xml to other format: json,text,
diff --git a/test/test_cli_pipe.sh b/test/test_cli_pipe.sh
index afacd7b4..c9e51ec1 100755
--- a/test/test_cli_pipe.sh
+++ b/test/test_cli_pipe.sh
@@ -128,7 +128,7 @@ CLICON_MODE="|mypipe"; # Must start with |
 \| { 
    grep <arg:string>, pipe_grep_fn("-e", "arg");
    except <arg:string>, pipe_grep_fn("-v", "arg");
-   tail, pipe_tail_fn();
+   tail <arg:string>, pipe_tail_fn("-n", "arg");
    count, pipe_wc_fn("-l");
    show {
      json, pipe_showas_fn("json");
@@ -175,8 +175,11 @@ expectpart "$($clixon_cli -1 -m $mode -f $cfg show implicit config \| grep par 2
 new "$mode show explicit | grep par"
 expectpart "$($clixon_cli -1 -m $mode -f $cfg show explicit config \| grep par)" 0 "<parameter>" "</parameter>" --not-- "table" "value"
 
-new "$mode show explicit | tail"
-expectpart "$($clixon_cli -1 -m $mode -f $cfg show explicit config \| tail)" 0 "<name>y</name>" --not-- "<name>x</name>"
+new "$mode show explicit | grep table|name"
+expectpart "$($clixon_cli -1 -m $mode -f $cfg show explicit config \| grep 'table\\\|name')" 0 "<table xmlns=\"urn:example:clixon\">" "<name>x</name>" "<name>y</name>" "</table>" --not-- "parameter" "value"
+
+new "$mode show explicit | tail 5"
+expectpart "$($clixon_cli -1 -m $mode -f $cfg show explicit config \| tail 5)" 0 "<name>y</name>" --not-- "<name>x</name>"
 
 new "$mode show explicit | count"
 expectpart "$($clixon_cli -1 -m $mode -f $cfg show explicit config \| count)" 0 10