Merge ~ack/maas:snap-init-no-user-authconfig-params into maas:master

[Alberto Donato]

LP: #1871356 - snap: hide maas init parameters for creating admin and configuring auth

[Björn Tillenius (bjornt)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b snap-init-no-user-authconfig-params lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7556/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b snap-init-no-user-authconfig-params lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7557/console
COMMIT: 21b3a30125dea930623ad47e00dd6cadbd4aa4ae

review: Needs Fixing

diff --git a/src/maascli/init.py b/src/maascli/init.py
index 789dfca..ac36e6c 100644
--- a/src/maascli/init.py
+++ b/src/maascli/init.py
@@ -55,68 +55,94 @@ def deprecated_for(new_option):
     return DeprecatedAction
 
 
-def add_candid_options(parser):
+def add_candid_options(parser, suppress_help=False):
     parser.add_argument(
         "--candid-agent-file",
-        help="Agent file containing Candid authentication information",
+        help=(
+            argparse.SUPPRESS
+            if suppress_help
+            else "Agent file containing Candid authentication information"
+        ),
     )
     parser.add_argument(
         "--candid-domain",
         default=None,
         help=(
-            "The authentication domain to look up users in for the external "
+            argparse.SUPPRESS
+            if suppress_help
+            else "The authentication domain to look up users in for the external "
             "Candid server."
         ),
     )
     parser.add_argument(
         "--candid-admin-group",
         default=None,
-        help="Group of users whose members are made admins in MAAS",
+        help=(
+            argparse.SUPPRESS
+            if suppress_help
+            else "Group of users whose members are made admins in MAAS"
+        ),
     )
 
 
-def add_rbac_options(parser):
+def add_rbac_options(parser, suppress_help=False):
     parser.add_argument(
         "--rbac-url",
         default=None,
-        help="The URL for the Canonical RBAC service to use.",
+        help=(
+            argparse.SUPPRESS
+            if suppress_help
+            else "The URL for the Canonical RBAC service to use."
+        ),
     )
     parser.add_argument(
         "--rbac-service-name",
         default=None,
         help=(
-            "Optionally, the name of the RBAC service to register this MAAS "
+            argparse.SUPPRESS
+            if suppress_help
+            else "Optionally, the name of the RBAC service to register this MAAS "
             "as.  If not provided, a list with services that the user can "
             "register will be displayed, to choose from."
         ),
     )
 
 
-def add_create_admin_options(parser):
+def add_create_admin_options(parser, suppress_help=False):
     parser.add_argument(
         "--admin-username",
         default=None,
         metavar="USERNAME",
-        help="Username for the admin account.",
+        help=argparse.SUPPRESS
+        if suppress_help
+        else "Username for the admin account.",
     )
     parser.add_argument(
         "--admin-password",
         default=None,
         metavar="PASSWORD",
-        help="Force a given admin password instead of prompting.",
+        help=(
+            argparse.SUPPRESS
+            if suppress_help
+            else "Force a given admin password instead of prompting."
+        ),
     )
     parser.add_argument(
         "--admin-email",
         default=None,
         metavar="EMAIL",
-        help="Email address for the admin.",
+        help=argparse.SUPPRESS
+        if suppress_help
+        else "Email address for the admin.",
     )
     parser.add_argument(
         "--admin-ssh-import",
         default=None,
         metavar="LP_GH_USERNAME",
         help=(
-            "Import SSH keys from Launchpad (lp:user-id) or "
+            argparse.SUPPRESS
+            if suppress_help
+            else "Import SSH keys from Launchpad (lp:user-id) or "
             "Github (gh:user-id) for the admin."
         ),
     )
diff --git a/src/maascli/snappy.py b/src/maascli/snappy.py
index a3ba92c..1507d52 100644
--- a/src/maascli/snappy.py
+++ b/src/maascli/snappy.py
@@ -23,6 +23,7 @@ import signal
 import string
 import subprocess
 import sys
+from textwrap import dedent
 import threading
 import time
 
@@ -623,6 +624,7 @@ def perform_work(msg, cmd, *args, **kwargs):
     finally:
         evnt.set()
         t.join()
+    clear_line()
     return ret
 
 
@@ -879,22 +881,17 @@ class cmd_init(SnappyCommand):
             "--enable-candid",
             default=False,
             action="store_true",
-            help=(
-                "Enable configuring the use of an external Candid server. "
-                "This feature is currently experimental. "
-                "If this isn't enabled, all --candid-* arguments "
-                "will be ignored."
-            ),
+            help=argparse.SUPPRESS,
         )
         for for_mode in ["region+rack", "region"]:
-            add_candid_options(subparsers_map[for_mode])
-            add_rbac_options(subparsers_map[for_mode])
+            add_candid_options(subparsers_map[for_mode], suppress_help=True)
+            add_rbac_options(subparsers_map[for_mode], suppress_help=True)
             subparsers_map[for_mode].add_argument(
-                "--skip-admin",
-                action="store_true",
-                help="Skip the admin creation.",
+                "--skip-admin", action="store_true", help=argparse.SUPPRESS
+            )
+            add_create_admin_options(
+                subparsers_map[for_mode], suppress_help=True
             )
-            add_create_admin_options(subparsers_map[for_mode])
 
     def handle(self, options):
         if os.getuid() != 0:
@@ -1021,7 +1018,6 @@ class cmd_init(SnappyCommand):
                 migrate_db,
                 capture=sys.stdout.isatty(),
             )
-            clear_line()
             init_maas(options)
         elif mode in ["region", "region+rack"]:
             # When in 'region' or 'region+rack' the migrations for the database
@@ -1031,8 +1027,22 @@ class cmd_init(SnappyCommand):
                 migrate_db,
                 capture=sys.stdout.isatty(),
             )
-        else:
-            clear_line()
+            print_msg(
+                dedent(
+                    """\
+                    MAAS has been set up.
+
+                    If you want to configure external authentication or use
+                    MAAS with Canonical RBAC, please run
+
+                      sudo maas configauth
+
+                    To create admins when not using external authentication, run
+
+                      sudo maas createadmin
+                    """
+                )
+            )
 
 
 class cmd_config(SnappyCommand):
@@ -1315,7 +1325,6 @@ class cmd_config(SnappyCommand):
                     else "Stopping services",
                     sighup_supervisord,
                 )
-                clear_line()
 
             # Perform migrations when switching to all.
             if changed_to_all:
@@ -1325,7 +1334,6 @@ class cmd_config(SnappyCommand):
                     migrate_db,
                     capture=sys.stdout.isatty(),
                 )
-                clear_line()
 
 
 class cmd_status(SnappyCommand):