Merge ~peter-sabaini/charm-grafana:fix-create-user into charm-grafana:master

[Peter Sabaini]

Fix create-user action

Closes-Bug: #1868869

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Wouter van Bommel (woutervb)]

lgtm, ideally you would also test that the created account can also login

review: Approve

[Alvaro Uria (aluria)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision b1ef22aab6285084ee2af7314ccfd6699225124a

diff --git a/actions/create-user b/actions/create-user
index 7abd043..728c994 100755
--- a/actions/create-user
+++ b/actions/create-user
@@ -97,8 +97,7 @@ else:
     sys.exit(0)
 
 if r_org.status_code == 200:
-    org_data = r_org.json
-    org_id = org_data['id']
+    org_data = r_org.json()
     org_name = org_data['name']
     org_user_data = '''{
 "role": %s,
diff --git a/tests/functional/test_deploy.py b/tests/functional/test_deploy.py
index 11447b7..5b18eab 100644
--- a/tests/functional/test_deploy.py
+++ b/tests/functional/test_deploy.py
@@ -14,9 +14,16 @@ pytestmark = pytest.mark.asyncio
 OPENSTACK_TIMEOUT = 3600
 APP_TIMEOUT = 900
 
-CHARM_BUILD_DIR = os.getenv('JUJU_REPOSITORY', '/tmp/charm-builds/grafana').rstrip('/')
-BUNDLE_PATH = os.path.join(CHARM_BUILD_DIR, "..", "bundle.yaml")
-OVERLAY_PATH = os.path.join(CHARM_BUILD_DIR, "..", "overlay.yaml")
+CHARM_BUILD_DIR = os.getenv('CHARM_BUILD_DIR')
+JUJU_REPOSITORY = os.getenv('JUJU_REPOSITORY')
+if CHARM_BUILD_DIR is not None:
+    GRAFANA_BUILD_DIR = os.path.join(CHARM_BUILD_DIR.rstrip('/'), "grafana")
+elif JUJU_REPOSITORY is not None:
+    GRAFANA_BUILD_DIR = os.path.join(JUJU_REPOSITORY.rstrip('/'), "builds", "grafana")
+else:
+    GRAFANA_BUILD_DIR = "/tmp/charm-builds/grafana"
+BUNDLE_PATH = os.path.join(GRAFANA_BUILD_DIR, "..", "bundle.yaml")
+OVERLAY_PATH = os.path.join(GRAFANA_BUILD_DIR, "..", "overlay.yaml")
 
 APP_SERIES = [
     "xenial",
@@ -133,7 +140,7 @@ async def deploy_app(request, model):
         'appname': app_name,
         'series': series,
         'install_method': install_method,
-        'charm_path': CHARM_BUILD_DIR,
+        'charm_path': GRAFANA_BUILD_DIR,
         'openstack_origin': OPENSTACK_VERSIONS[ubuntu_os_version],
     }
     # render bundle config file
@@ -236,3 +243,35 @@ async def test_grafana_imported_dashboards(deploy_app, model):
         assert req.status_code == 200
 
     assert len(units) > 0
+
+
+async def test_grafana_create_user(deploy_app, model):
+    config = await deploy_app.get_config()
+    install_method = config['install_method']['value']
+    if install_method == FAKE_INSTALL_METHOD:
+        status = 'blocked'
+        message = 'Unsupported install_method'
+    else:
+        status = 'active'
+        message = INSTALL_METHOD[install_method].get("message")
+
+    units = deploy_app.units
+    for grafana_unit in units:
+        await model.block_until(lambda: (grafana_unit.workload_status == status
+                                         and grafana_unit.agent_status == 'idle'
+                                         and grafana_unit.workload_status_message == message),
+                                timeout=APP_TIMEOUT)
+        if install_method == FAKE_INSTALL_METHOD:
+            # no further checks
+            continue
+        action = await grafana_unit.run_action("create-user", name="FooUser", login="foouser", email="[e-mail]",
+                                               password="sikkrit", role="Viewer")
+        action = await action.wait()
+        assert action.results["Code"] == '0'
+        port = config['port']['value']
+        host = grafana_unit.public_address
+        req = requests.get('http://{host}:{port}/api/org/'.format(host=host, port=port),
+                           auth=('foouser', 'sikkrit'))
+        assert req.status_code == 200
+        assert 'name' in req.json()
+    assert len(units) > 0