From 01bc6762aac99d7fcd85439ba69863f6a6ce0cd0 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 1 Sep 2021 16:36:38 +0200
Subject: [PATCH] registrars: remove unimplemented or unecessary stuff

---
 data/actionsmap/yunohost.yml | 24 ++++++------------------
 src/yunohost/dns.py          | 16 ++++------------
 src/yunohost/domain.py       | 14 +++++++-------
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index 686502b2c..50b93342b 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -572,6 +572,12 @@ domain:
         registrar:
             subcategory_help: Manage domains registrars
             actions:
+                ### domain_registrar_catalog()
+                catalog:
+                    action_help: List supported registrars API
+                    api: GET /domains/registrars/catalog
+
+
                 ### domain_registrar_set()
                 set:
                     action_help: Set domain registrar
@@ -597,24 +603,6 @@ domain:
                             extra:
                                 pattern: *pattern_domain
 
-                ### domain_registrar_list()
-                list:
-                    action_help: List registrars configured by DNS zone
-                    api: GET /domains/registrars
-
-                ### domain_registrar_catalog()
-                catalog:
-                    action_help: List supported registrars API
-                    api: GET /domains/registrars/catalog
-                    arguments:
-                        -r:
-                            full: --registrar-name
-                            help: Display given registrar info to create form
-                        -f:
-                            full: --full
-                            help: Display all details, including info to create forms
-                            action: store_true
-
                 ### domain_registrar_push()
                 push:
                     action_help: Push DNS records to registrar
diff --git a/src/yunohost/dns.py b/src/yunohost/dns.py
index e3131bcdd..4e68203be 100644
--- a/src/yunohost/dns.py
+++ b/src/yunohost/dns.py
@@ -419,16 +419,8 @@ def domain_registrar_info(domain):
     return registrar_info
 
 
-def domain_registrar_catalog(registrar_name, full):
-    registrars = read_yaml(REGISTRAR_LIST_PATH)
-
-    if registrar_name:
-        if registrar_name not in registrars.keys():
-            raise YunohostValidationError("domain_registrar_unknown", registrar=registrar_name)
-        else:
-            return registrars[registrar_name]
-    else:
-        return registrars
+def domain_registrar_catalog():
+    return read_yaml(REGISTRAR_LIST_PATH)
 
 
 def domain_registrar_set(domain, registrar, args):
@@ -539,8 +531,8 @@ def domain_registrar_push(operation_logger, domain):
 
         # Finally, push the new record or update the existing one
         record_to_push = {
-            "action": "update" if already_exists else "create"
-            "type": record["type"]
+            "action": "update" if already_exists else "create",
+            "type": record["type"],
             "name": record["name"],
             "content": record["value"],
             # FIXME Removed TTL, because it doesn't work with Gandi.
diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py
index e1b247d7d..bc2e6d7af 100644
--- a/src/yunohost/domain.py
+++ b/src/yunohost/domain.py
@@ -536,14 +536,9 @@ def domain_dns_conf(domain):
     return yunohost.dns.domain_dns_conf(domain)
 
 
-def domain_registrar_info(domain):
+def domain_registrar_catalog():
     import yunohost.dns
-    return yunohost.dns.domain_registrar_info(domain)
-
-
-def domain_registrar_catalog(registrar_name, full):
-    import yunohost.dns
-    return yunohost.dns.domain_registrar_catalog(registrar_name, full)
+    return yunohost.dns.domain_registrar_catalog()
 
 
 def domain_registrar_set(domain, registrar, args):
@@ -551,6 +546,11 @@ def domain_registrar_set(domain, registrar, args):
     return yunohost.dns.domain_registrar_set(domain, registrar, args)
 
 
+def domain_registrar_info(domain):
+    import yunohost.dns
+    return yunohost.dns.domain_registrar_info(domain)
+
+
 def domain_registrar_push(domain):
     import yunohost.dns
     return yunohost.dns.domain_registrar_push(domain)