Update help/docs and actually make it possible to add more than one argument

Reviewed-on: micke/knotctl#7

README.md

@@ -3,11 +3,15 @@
 This is a commandline tool for knotapi: https://gitlab.nic.cz/knot/knot-dns-rest
 
 ## Build and install
-To install using pip, run the following command:
+
+To install using pip, run the following command in a virtual envrionment.
+
 ```
-pip3 install git+https://code.smolnet.org/micke/knotctl
+python -m pip install "knotctl @ git+https://code.smolnet.org/micke/knotctl
 ```
+
 To build and install as a deb-package
+
 ```
 sudo apt install python3-stdeb
 git clone https://code.smolnet.org/micke/knotctl
@@ -18,28 +22,39 @@ sudo dpkg -i deb_dist/knotctl_*_all.deb
 A prebuilt deb-package is also available from the release page: https://code.smolnet.org/micke/knotctl/releases/
 
 ## Shell completion
+
 For bash: add this to .bashrc
+
 ```
 source <(knotctl completion)
 ```
+
 For fish, run:
+
 ```
 knotctl completion --shell fish > ~/.config/fish/completions/knotctl.fish
 ```
+
 For tcsh: add this to .cshrc
+
 ```
 complete "knotctl" 'p@*@`python-argcomplete-tcsh "knotctl"`@' ;
 ```
+
 For zsh: add this to .zshrc
+
 ```
 autoload -U bashcompinit
 bashcompinit
 source <(knotctl completion)
 ```
 ## Usage
+
 ```
-usage: knotctl [-h] [--json | --no-json]
+usage: knotctl [-h] [--json | --no-json] {add,completion,config,delete,list,update} ...
-               {add,completion,config,delete,list,update} ...
+
+Manage DNS records with knot dns rest api:
+        * https://gitlab.nic.cz/knot/knot-dns-rest
 
 positional arguments:
   {add,completion,config,delete,list,update}
@@ -47,11 +62,57 @@ positional arguments:
 options:
   -h, --help            show this help message and exit
   --json, --no-json
+
+    The Domain Name System specifies a database of information
+    elements for network resources. The types of information
+    elements are categorized and organized with a list of DNS
+    record types, the resource records (RRs). Each record has a
+    name, a type, an expiration time (time to live), and
+    type-specific data.
+
+    The following is a list of terms used in this program:
+    ----------------------------------------------------------------
+    | Vocabulary | Description                                     |
+    ----------------------------------------------------------------
+    | zone       | A DNS zone is a specific portion of the DNS     |
+    |            | namespace in the Domain Name System (DNS),      |
+    |            | which a specific organization or administrator  |
+    |            | manages.                                        |
+    ----------------------------------------------------------------
+    | name       | In the Internet, a domain name is a string that |
+    |            | identifies a realm of administrative autonomy,  |
+    |            | authority or control. Domain names are often    |
+    |            | used to identify services provided through the  |
+    |            | Internet, such as websites, email services and  |
+    |            | more.                                           |
+    ----------------------------------------------------------------
+    | rtype      | A record type indicates the format of the data  |
+    |            | and it gives a hint of its intended use. For    |
+    |            | example, the A record is used to translate from |
+    |            | a domain name to an IPv4 address, the NS record |
+    |            | lists which name servers can answer lookups on  |
+    |            | a DNS zone, and the MX record specifies the     |
+    |            | mail server used to handle mail for a domain    |
+    |            | specified in an e-mail address.                 |
+    ----------------------------------------------------------------
+    | data       | A records data is of type-specific relevance,   |
+    |            | such as the IP address for address records, or  |
+    |            | the priority and hostname for MX records.       |
+    ----------------------------------------------------------------
+
+    This information was compiled from Wikipedia:
+       * https://en.wikipedia.org/wiki/DNS_zone
+       * https://en.wikipedia.org/wiki/Domain_Name_System
+       * https://en.wikipedia.org/wiki/Zone_file
 ```
+
 ### ADD
+
 ```
 usage: knotctl add [-h] -d DATA -n NAME -r RTYPE [-t TTL] -z ZONE
 
+Add a new record to the zone.
+
 options:
   -h, --help            show this help message and exit
   -d DATA, --data DATA
@@ -60,38 +121,40 @@ options:
   -t TTL, --ttl TTL
   -z ZONE, --zone ZONE
 ```
+
 ### COMPLETION
+
 ```
 usage: knotctl completion [-h] [-s SHELL]
 
+Generate shell completion script.
+
 options:
   -h, --help            show this help message and exit
   -s SHELL, --shell SHELL
 ```
+
 ### CONFIG
+
 ```
-usage: knotctl config [-h] [-b BASEURL] [-p PASSWORD] [-u USERNAME]
+usage: knotctl config [-h] [-b BASEURL] [-c CONTEXT] [-p PASSWORD] [-u USERNAME]
+
+Configure access to knot-dns-rest-api.
 
 options:
   -h, --help            show this help message and exit
   -b BASEURL, --baseurl BASEURL
+  -c CONTEXT, --context CONTEXT
   -p PASSWORD, --password PASSWORD
   -u USERNAME, --username USERNAME
 ```
+
 ### DELETE
+
 ```
 usage: knotctl delete [-h] [-d DATA] [-n NAME] [-r RTYPE] -z ZONE
 
-options:
+Delete a record from the zone.
-  -h, --help            show this help message and exit
-  -d DATA, --data DATA
-  -n NAME, --name NAME
-  -r RTYPE, --rtype RTYPE
-  -z ZONE, --zone ZONE
-```
-### LIST
-```
-usage: knotctl list [-h] [-d DATA] [-n NAME] [-r RTYPE] [-z ZONE]
 
 options:
   -h, --help            show this help message and exit
@@ -100,19 +163,47 @@ options:
   -r RTYPE, --rtype RTYPE
   -z ZONE, --zone ZONE
 ```
+
+### LIST
+
+```
+usage: knotctl list [-h] [-d DATA] [-n NAME] [-r RTYPE] -z ZONE
+
+List records in the zone.
+
+options:
+  -h, --help            show this help message and exit
+  -d DATA, --data DATA
+  -n NAME, --name NAME
+  -r RTYPE, --rtype RTYPE
+  -z ZONE, --zone ZONE
+```
+
 ### UPDATE
+
 ```
 usage: knotctl update [-h] -a [ARGUMENT ...] -d DATA -n NAME -r RTYPE [-t TTL]
                       -z ZONE
+Update a record in the zone. The record must exist in the zone.
+In this case --data, --name, --rtype and --ttl switches are used
+for searching for the appropriate record, while the --argument
+switches are used for updating the record.
 
 options:
   -h, --help            show this help message and exit
-  -a [ARGUMENT ...], --argument [ARGUMENT ...]
+  -a [KEY=VALUE ...], --argument [KEY=VALUE ...]
                         Specify key - value pairs to be updated:
-                        name=dns1.example.com.
+                        name=dns1.example.com. or data=127.0.0.1 for example.
+                        --argument can be repeated
   -d DATA, --data DATA
   -n NAME, --name NAME
   -r RTYPE, --rtype RTYPE
   -t TTL, --ttl TTL
   -z ZONE, --zone ZONE
+
+Available arguments are:
+    data: New record data.
+    name: New record domain name.
+    rtype: New record type.
+    ttl: New record time to live (TTL).
 ```

knotctl/__init__.py

@@ -14,9 +14,12 @@ from urllib.parse import urlparse
 import argcomplete
 import requests
 import yaml
-from requests.exceptions import JSONDecodeError as RequestsJSONDecodeError
 from requests.models import HTTPBasicAuth
 from simplejson.errors import JSONDecodeError as SimplejsonJSONDecodeError
+try:
+    from requests.exceptions import JSONDecodeError as RequestsJSONDecodeError
+except ImportError:
+    from requests.exceptions import InvalidJSONError as RequestsJSONDecodeError
 
 
 # Helper functions
@@ -42,9 +45,8 @@ def nested_out(input, tabs="") -> str:
         string += "{}\n".format(input)
     elif isinstance(input, dict):
         for key, value in input.items():
-            string += "{}{}: {}".format(
+            string += "{}{}: {}".format(tabs, key,
-                tabs, key, nested_out(value, tabs + " ")
+                                        nested_out(value, tabs + " "))
-            )
     elif isinstance(input, list):
         for entry in input:
             string += "{}\n{}".format(tabs, nested_out(entry, tabs + " "))
@@ -68,11 +70,9 @@ def run_add(url: str, jsonout: bool, headers: dict):
     out = response.json()
     if isinstance(out, list):
         for record in out:
-            if (
+            if (record["data"] == parsed["data"]
-                record["data"] == parsed["data"]
+                    and record["name"] == parsed["name"]
-                and record["name"] == parsed["name"]
+                    and record["rtype"] == parsed["rtype"]):
-                and record["rtype"] == parsed["rtype"]
-            ):
                 output(record, jsonout)
                 break
     else:
@@ -90,12 +90,24 @@ def run_complete(shell: Union[None, str]):
 
 def run_config(
     config_filename: str,
+    context: Union[None, str] = None,
     baseurl: Union[None, str] = None,
     username: Union[None, str] = None,
     password: Union[None, str] = None,
 ):
     config = {"baseurl": baseurl, "username": username, "password": password}
     needed = []
+    if context:
+        symlink = f'{config_filename}-{context}'
+        found = os.path.isfile(symlink)
+        if os.path.islink(config_filename):
+            os.remove(config_filename)
+        elif os.path.isfile(config_filename):
+            os.rename(config_filename, symlink)
+        os.symlink(symlink, config_filename)
+        config_filename = symlink
+        if found:
+            return
     if not baseurl:
         needed.append("baseurl")
     if not username:
@@ -106,8 +118,7 @@ def run_config(
                 error(
                     "Can not configure without {}".format(need),
                     "No {}".format(need),
-                )
+                ))
-            )
             sys.exit(1)
         config[need] = input("Enter {}: ".format(need))
 
@@ -131,9 +142,10 @@ def run_delete(url: str, jsonout: bool, headers: dict):
     output(reply, jsonout)
 
 
-def run_list(
+def run_list(url: str,
-    url: str, jsonout: bool, headers: dict, ret=False
+             jsonout: bool,
-) -> Union[None, str]:
+             headers: dict,
+             ret=False) -> Union[None, str]:
     response = requests.get(url, headers=headers)
     string = response.json()
     if ret:
@@ -163,6 +175,8 @@ def setup_url(
             zone += "."
         url += "/{}".format(zone)
     if name and zone:
+        if name.endswith(zone.rstrip(".")):
+            name += '.'
         url += "/records/{}".format(name)
     if zone and name and rtype:
         url += "/{}".format(rtype)
@@ -183,16 +197,14 @@ def setup_url(
             error(
                 "ttl only makes sense with rtype, name and zone",
                 "Missing parameter",
-            )
+            ))
-        )
         sys.exit(1)
     if rtype and (not name or not zone):
         output(
             error(
                 "rtype only makes sense with name and zone",
                 "Missing parameter",
-            )
+            ))
-        )
         sys.exit(1)
     if name and not zone:
         output(error("name only makes sense with a zone", "Missing parameter"))
@@ -234,43 +246,108 @@ def split_url(url: str) -> dict:
 
 # Entry point to program
 def main() -> int:
+    description = """Manage DNS records with knot dns rest api:
+        * https://gitlab.nic.cz/knot/knot-dns-rest"""
+
+    epilog = """
+    The Domain Name System specifies a database of information
+    elements for network resources. The types of information
+    elements are categorized and organized with a list of DNS
+    record types, the resource records (RRs). Each record has a
+    name, a type, an expiration time (time to live), and
+    type-specific data.
+
+    The following is a list of terms used in this program:
+    ----------------------------------------------------------------
+    | Vocabulary | Description                                     |
+    ----------------------------------------------------------------
+    | zone       | A DNS zone is a specific portion of the DNS     |
+    |            | namespace in the Domain Name System (DNS),      |
+    |            | which a specific organization or administrator  |
+    |            | manages.                                        |
+    ----------------------------------------------------------------
+    | name       | In the Internet, a domain name is a string that |
+    |            | identifies a realm of administrative autonomy,  |
+    |            | authority or control. Domain names are often    |
+    |            | used to identify services provided through the  |
+    |            | Internet, such as websites, email services and  |
+    |            | more.                                           |
+    ----------------------------------------------------------------
+    | rtype      | A record type indicates the format of the data  |
+    |            | and it gives a hint of its intended use. For    |
+    |            | example, the A record is used to translate from |
+    |            | a domain name to an IPv4 address, the NS record |
+    |            | lists which name servers can answer lookups on  |
+    |            | a DNS zone, and the MX record specifies the     |
+    |            | mail server used to handle mail for a domain    |
+    |            | specified in an e-mail address.                 |
+    ----------------------------------------------------------------
+    | data       | A records data is of type-specific relevance,   |
+    |            | such as the IP address for address records, or  |
+    |            | the priority and hostname for MX records.       |
+    ----------------------------------------------------------------
+
+    This information was compiled from Wikipedia:
+       * https://en.wikipedia.org/wiki/DNS_zone
+       * https://en.wikipedia.org/wiki/Domain_Name_System
+       * https://en.wikipedia.org/wiki/Zone_file
+    """
     # Grab user input
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(description=description, epilog=epilog, formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument("--json", action=argparse.BooleanOptionalAction)
     subparsers = parser.add_subparsers(dest="command")
-    addcmd = subparsers.add_parser("add")
+
+    add_description = "Add a new record to the zone."
+    addcmd = subparsers.add_parser("add", description=add_description)
     addcmd.add_argument("-d", "--data", required=True)
     addcmd.add_argument("-n", "--name", required=True)
     addcmd.add_argument("-r", "--rtype", required=True)
     addcmd.add_argument("-t", "--ttl")
     addcmd.add_argument("-z", "--zone", required=True)
 
-    completecmd = subparsers.add_parser("completion")
+    complete_description = "Generate shell completion script."
+    completecmd = subparsers.add_parser("completion", description=complete_description)
     completecmd.add_argument("-s", "--shell")
 
-    configcmd = subparsers.add_parser("config")
+    config_description = "Configure access to knot-dns-rest-api."
+    configcmd = subparsers.add_parser("config", description=config_description)
     configcmd.add_argument("-b", "--baseurl")
+    configcmd.add_argument("-c", "--context")
     configcmd.add_argument("-p", "--password")
     configcmd.add_argument("-u", "--username")
 
-    deletecmd = subparsers.add_parser("delete")
+    delete_description = "Delete a record from the zone."
+    deletecmd = subparsers.add_parser("delete", description=delete_description)
     deletecmd.add_argument("-d", "--data")
     deletecmd.add_argument("-n", "--name")
     deletecmd.add_argument("-r", "--rtype")
     deletecmd.add_argument("-z", "--zone", required=True)
 
-    listcmd = subparsers.add_parser("list")
+    list_description = "List records in the zone."
+    listcmd = subparsers.add_parser("list", description=list_description)
     listcmd.add_argument("-d", "--data")
     listcmd.add_argument("-n", "--name")
     listcmd.add_argument("-r", "--rtype")
-    listcmd.add_argument("-z", "--zone")
+    listcmd.add_argument("-z", "--zone", required=True)
 
-    updatecmd = subparsers.add_parser("update")
+    update_description = "Update a record in the zone. The record must exist in the zone.\n"
+    update_description += "In this case --data, --name, --rtype and --ttl switches are used\n"
+    update_description += "for searching for the appropriate record, while the --argument\n"
+    update_description += "switches are used for updating the record."
+    update_epilog = """Available arguments are:
+    data: New record data.
+    name: New record domain name.
+    rtype: New record type.
+    ttl: New record time to live (TTL)."""
+    updatecmd = subparsers.add_parser("update", description=update_description, epilog=update_epilog, formatter_class=argparse.RawDescriptionHelpFormatter )
     updatecmd.add_argument(
         "-a",
         "--argument",
         nargs="*",
-        help="Specify key - value pairs to be updated: name=dns1.example.com.",
+        action="append",
+        metavar="KEY=VALUE",
+        help=
+        "Specify key - value pairs to be updated: name=dns1.example.com. or data=127.0.0.1 for example. --argument can be repeated",
         required=True,
     )
     updatecmd.add_argument("-d", "--data", required=True)
@@ -293,7 +370,8 @@ def main() -> int:
         mkdir(config_basepath)
 
     if args.command == "config":
-        run_config(config_filename, args.baseurl, args.username, args.password)
+        run_config(config_filename, args.context, args.baseurl, args.username,
+                   args.password)
         return 0
 
     if not isfile(config_filename):
@@ -313,7 +391,7 @@ def main() -> int:
     except KeyError:
         output(response.json())
         return 1
-    except json.JSONDecodeError:
+    except requests.exceptions.JSONDecodeError:
         output(
             error("Could not decode api response as JSON", "Could not decode"))
         return 1
@@ -359,8 +437,7 @@ def main() -> int:
             run_update(url, args.json, headers)
     except (RequestsJSONDecodeError, SimplejsonJSONDecodeError):
         output(
-            error("Could not decode api response as JSON", "Could not decode")
+            error("Could not decode api response as JSON", "Could not decode"))
-        )
     return 0
 
 

pyproject.toml

@@ -0,0 +1,37 @@
+[build-system]
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name="knotctl"
+description="A CLI for knotapi."
+authors = [
+  {name = "Micke Nordin", email = "hej@mic.ke"},
+]
+license= { file="LICENSE" }
+readme= "README.md"
+classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Operating System :: OS Independent",
+        ]
+requires-python= ">=3.9"
+version = "0.0.7"
+
+dependencies = [
+  "argcomplete==2.0.0",
+  "pyyaml==6.0.1",
+  "requests==2.27.1",
+  "simplejson==3.17.6",
+]
+
+[project.urls]
+Source="https://code.smolnet.org/micke/knotctl"
+Documentation = "https://code.smolnet.org/micke/knotctl"
+
+[project.scripts]
+knotctl="knotctl:main"
+
+
+[tool.flit.sdist]
+include = ["LICENSE",]

requirements.txt

@@ -1,4 +1,4 @@
 argcomplete==2.0.0
-pyyaml==5.4.1
+pyyaml==6.0.1
 requests==2.27.1
 simplejson==3.17.6

setup.py

@@ -1,26 +0,0 @@
-import setuptools
-
-with open("README.md", "r", encoding="utf-8") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name="knotctl",
-    version="0.0.6",
-    packages=setuptools.find_packages(),
-    author="Micke Nordin",
-    author_email="hej@mic.ke",
-    description="A cli for knotapi.",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://code.smolnet.org/micke/knotctl",
-    project_urls={
-        "Bug Tracker": "https://code.smolnet.org/micke/knotctl/issues",
-    },
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: GPL-3.0",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.9",
-    scripts=["scripts/knotctl"],
-)