From 4f7c78436e62bfd21745c5289117e03ed896bc66 Mon Sep 17 00:00:00 2001
From: PyHedgehog <pyhedgehog@users.noreply.github.com>
Date: Sat, 11 Mar 2023 13:10:42 +0300
Subject: fix(cli): add ability to escape at-prefixed parameter (#2513)

* fix(cli): Add ability to escape at-prefixed parameter (#2511)

---------

Co-authored-by: Nejc Habjan <hab.nejc@gmail.com>
---
 docs/cli-usage.rst                  | 11 +++++++++++
 gitlab/cli.py                       |  2 ++
 tests/functional/cli/test_cli_v4.py | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/docs/cli-usage.rst b/docs/cli-usage.rst
index c728221..4b525fc 100644
--- a/docs/cli-usage.rst
+++ b/docs/cli-usage.rst
@@ -305,6 +305,17 @@ command line. This is handy for values containing new lines for instance:
    EOF
    $ gitlab project create --name SuperProject --description @/tmp/description
 
+It you want to explicitly pass an argument starting with ``@``,  you can escape it using ``@@``:
+
+.. code-block:: console
+  
+   $ gitlab project-tag list --project-id somenamespace/myproject
+   ...
+   name: @at-started-tag
+   ...
+   $ gitlab project-tag delete --project-id somenamespace/myproject --name '@@at-started-tag'
+
+
 Enabling shell autocompletion
 =============================
 
diff --git a/gitlab/cli.py b/gitlab/cli.py
index c124e74..4efb3b2 100644
--- a/gitlab/cli.py
+++ b/gitlab/cli.py
@@ -272,6 +272,8 @@ def _get_parser() -> argparse.ArgumentParser:
 
 
 def _parse_value(v: Any) -> Any:
+    if isinstance(v, str) and v.startswith("@@"):
+        return v[1:]
     if isinstance(v, str) and v.startswith("@"):
         # If the user-provided value starts with @, we try to read the file
         # path provided after @ as the real value. Exit on any error.
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
index 921aa78..684293f 100644
--- a/tests/functional/cli/test_cli_v4.py
+++ b/tests/functional/cli/test_cli_v4.py
@@ -562,6 +562,26 @@ def test_create_project_with_values_from_file(gitlab_cli, tmpdir):
     assert description in ret.stdout
 
 
+def test_create_project_with_values_at_prefixed(gitlab_cli, tmpdir):
+    name = "gitlab-project-at-prefixed"
+    description = "@at-prefixed"
+    at_prefixed = f"@{description}"
+
+    cmd = [
+        "-v",
+        "project",
+        "create",
+        "--name",
+        name,
+        "--description",
+        at_prefixed,
+    ]
+    ret = gitlab_cli(cmd)
+
+    assert ret.success
+    assert description in ret.stdout
+
+
 def test_create_project_deploy_token(gitlab_cli, project):
     name = "project-token"
     username = "root"
-- 
cgit v1.2.1