Merge ~ack/maas:createadmin-ext-auth-messages into maas:master

[Alberto Donato]

LP: #1810803 - better messages for "maas configauth" with external authentication (both rbac and candid)

[MAAS Lander (maas-lander)]

UNIT TESTS
-b createadmin-ext-auth-messages lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 01369b67a2c198899bbcc8d895ce7dd62abf604a

review: Approve

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maascli/init.py b/src/maascli/init.py
index 5f860c6..bcd40a6 100644
--- a/src/maascli/init.py
+++ b/src/maascli/init.py
@@ -130,6 +130,7 @@ def create_admin_account(options):
 def create_account_external_auth(auth_config, maas_config,
                                  bakery_client=None):
     """Make the user login via external auth to create the first admin."""
+    print_msg('Please login with MAAS to ensure authentication is set up')
     if bakery_client is None:
         bakery_client = httpbakery.Client()
 
@@ -153,18 +154,23 @@ def create_account_external_auth(auth_config, maas_config,
 
     result = resp.json()
     username = result['username']
-    if result['is_superuser']:
-        print_msg("Administrator user '{}' created".format(username))
+    if auth_config['rbac_url']:
+        message = 'Authentication is working.'
+        if result['is_superuser']:
+            message += " User '{}' is an Administrator".format(username)
     else:
-        admin_group = auth_config['external_auth_admin_group']
-        message = dedent(
-            """\
-            A user with username '{username}' has been created, but it's not
-            a superuser. Please log in to MAAS with a user that belongs to
-            the '{admin_group}' group to create an administrator user.
-            """)
-        print_msg(
-            message.format(username=username, admin_group=admin_group))
+        if result['is_superuser']:
+            message = "Administrator user '{}' created".format(username)
+        else:
+            admin_group = auth_config['external_auth_admin_group']
+            message = dedent(
+                """\
+                A user with username '{username}' has been created, but it's
+                not a superuser. Please log in to MAAS with a user that
+                belongs to the '{admin_group}' group to create an
+                administrator user.
+                """).format(username=username, admin_group=admin_group)
+    print_msg(message)
 
 
 def configure_authentication(options):
diff --git a/src/maascli/tests/test_init.py b/src/maascli/tests/test_init.py
index 61888dd..a2e6532 100644
--- a/src/maascli/tests/test_init.py
+++ b/src/maascli/tests/test_init.py
@@ -296,7 +296,9 @@ class TestCreateAccountExternalAuth(MAASTestCase):
     def setUp(self):
         super().setUp()
         self.mock_print_msg = self.patch(init, 'print_msg')
-        self.auth_config = {'external_auth_admin_group': 'admins'}
+        self.auth_config = {
+            'rbac_url': '',
+            'external_auth_admin_group': 'admins'}
         self.maas_config = {'maas_url': 'http://example.com/MAAS'}
 
     def mock_bakery_client(self, status_code=200, user_is_admin=True):
@@ -310,32 +312,48 @@ class TestCreateAccountExternalAuth(MAASTestCase):
         mock_client.request.return_value = mock_response
         return mock_client
 
-    def assert_message_printed(self, message):
-        [call] = self.mock_print_msg.mock_calls
-        self.assertIn(message, call[1][0])
+    def test_create_admin_no_rbac(self):
+        mock_client = self.mock_bakery_client()
+        init.create_account_external_auth(
+            self.auth_config, self.maas_config, bakery_client=mock_client)
+        mock_client.request.assert_called()
+        self.mock_print_msg.assert_called_with(
+            "Administrator user 'user' created")
 
-    def test_create_admin(self):
+    def test_create_no_rbac_not_admin(self):
+        mock_client = self.mock_bakery_client(user_is_admin=False)
+        init.create_account_external_auth(
+            self.auth_config, self.maas_config, bakery_client=mock_client)
+        mock_client.request.assert_called()
+        self.mock_print_msg.assert_called_with(
+            "A user with username 'user' has been created, but it's\n"
+            "not a superuser. Please log in to MAAS with a user that\n"
+            "belongs to the 'admins' group to create an\nadministrator "
+            "user.\n")
+
+    def test_create_admin_rbac(self):
+        self.auth_config['rbac_url'] = 'http://rbac'
         mock_client = self.mock_bakery_client()
         init.create_account_external_auth(
             self.auth_config, self.maas_config, bakery_client=mock_client)
         mock_client.request.assert_called()
-        self.assert_message_printed("Administrator user 'user' created")
+        self.mock_print_msg.assert_called_with(
+            "Authentication is working. User 'user' is an Administrator")
 
-    def test_create_not_admin(self):
+    def test_create_rbac_not_admin(self):
+        self.auth_config['rbac_url'] = 'http://rbac'
         mock_client = self.mock_bakery_client(user_is_admin=False)
         init.create_account_external_auth(
             self.auth_config, self.maas_config, bakery_client=mock_client)
         mock_client.request.assert_called()
-        self.assert_message_printed(
-            "A user with username 'user' has been created, but it's not\n"
-            "a superuser")
+        self.mock_print_msg.assert_called_with('Authentication is working.')
 
     def test_request_error_code(self):
         mock_client = self.mock_bakery_client(status_code=500)
         init.create_account_external_auth(
             self.auth_config, self.maas_config, bakery_client=mock_client)
         mock_client.request.assert_called()
-        self.assert_message_printed(
+        self.mock_print_msg.assert_called_with(
             "An error occurred while waiting for the first user creation: "
             "request failed with code 500")
 
@@ -345,7 +363,7 @@ class TestCreateAccountExternalAuth(MAASTestCase):
         init.create_account_external_auth(
             self.auth_config, self.maas_config, bakery_client=mock_client)
         mock_client.request.assert_called()
-        self.assert_message_printed(
+        self.mock_print_msg.assert_called_with(
             "An error occurred while waiting for the first user creation: "
             "something wrong happened")
 
diff --git a/src/maasserver/management/commands/configauth.py b/src/maasserver/management/commands/configauth.py
index 4e82186..36c713f 100644
--- a/src/maasserver/management/commands/configauth.py
+++ b/src/maasserver/management/commands/configauth.py
@@ -70,6 +70,7 @@ def update_auth_details_from_agent_file(agent_file_name, auth_details):
 
 def update_auth_details_from_rbac_registration(
         auth_details, service_name):
+    print('Please authenticate with the RBAC service to register this MAAS')
     client = RBACUserClient(auth_details.rbac_url)
     services = {
         service['name']: service