Merge ~jamon/influxdb-charm:master into influxdb-charm:master

[Jamon Camisso]

Add actions to create user, database, and privileges

Add actions to create user, database, and privileges

[David Lawson (deej)]

+1

review: Approve

diff --git a/actions.yaml b/actions.yaml
 new file mode 100644
index 0000000..9540fd5
--- /dev/null
+++ b/actions.yaml
@@ -0,0 +1,8 @@
+create-database:
+  description: Creates a database. Use format 'database=dbname'
+create-user:
+  description: Create a user. Use format 'user=username'
+grant-privilege:
+  description: |
+    Grant privileges for a user to a database. Format is a string
+    following privilege='privilege,database,username' format.
diff --git a/actions/create-database b/actions/create-database
 new file mode 100755
index 0000000..555ff4d
--- /dev/null
+++ b/actions/create-database
@@ -0,0 +1,41 @@
+#!/usr/bin/python3
+# Create a database
+
+import influxdb
+
+import requests
+import traceback
+from charmhelpers.core.hookenv import (
+    action_fail,
+    action_set,
+    action_get,
+    log,
+)
+
+action = "create-database"
+
+try:
+    database = action_get('database')
+except Exception:
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
+
+
+try:
+    client = influxdb.InfluxDBClient('127.0.0.1', 8086)
+except requests.exceptions.ConnectionError:
+    action_fail("Failed to connect to InfluxDB!")
+    exit(0)
+try:
+    print("Create database: " + database)
+    client.create_database(database)
+    action_set({"created": database})
+except:
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
diff --git a/actions/create-user b/actions/create-user
 new file mode 100755
index 0000000..2e65191
--- /dev/null
+++ b/actions/create-user
@@ -0,0 +1,57 @@
+#!/usr/bin/python3
+# Create a database
+
+import influxdb
+import random
+import string
+import traceback
+
+from charmhelpers.core.hookenv import (
+    action_fail,
+    action_set,
+    action_get,
+    log,
+)
+
+action = "create-user"
+charset = string.ascii_lowercase + string.ascii_uppercase + string.digits
+password = ''.join(random.sample(charset, 16))
+
+
+def unhandled_exception():
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
+
+
+try:
+    user = action_get('user')
+except Exception:
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
+
+if user is None:
+    action_fail("Couldn't get 'user' value.")
+    exit(0)
+
+try:
+    client = influxdb.InfluxDBClient('127.0.0.1', 8086)
+except requests.exceptions.ConnectionError:
+    action_fail("Failed to connect to InfluxDB!")
+    exit(0)
+try:
+    client.create_user(user, password)
+    action_set({"created": user, "password": password})
+    print("Created user: " + user)
+except influxdb.exceptions.InfluxDBClientError as e:
+    if e.content == "user already exists":
+        action_fail("User {} already exists".format(user))
+    else:
+        unhandled_exception()
+except:
+    unhandled_exception()
diff --git a/actions/grant-privilege b/actions/grant-privilege
 new file mode 100755
index 0000000..62e0759
--- /dev/null
+++ b/actions/grant-privilege
@@ -0,0 +1,48 @@
+#!/usr/bin/python3
+# Create a database
+
+import influxdb
+import traceback
+
+from charmhelpers.core.hookenv import (
+    action_fail,
+    action_set,
+    action_get,
+    log,
+)
+
+action = "grant-privilege"
+
+
+def unhandled_exception():
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
+
+
+try:
+    privilege, database, user = action_get('privilege').split(',')
+except Exception:
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
+
+if privilege is None:
+    action_fail("Couldn't get 'privilege' value.")
+    exit(0)
+
+try:
+    client = influxdb.InfluxDBClient('127.0.0.1', 8086)
+except requests.exceptions.ConnectionError:
+    action_fail("Failed to connect to InfluxDB!")
+    exit(0)
+try:
+    client.grant_privilege(privilege, database, user)
+    action_set({"granted": user, "privilege": privilege, "database": database})
+    print("Granted {} {} on {}".format(user, privilege, database))
+except:
+    unhandled_exception()
diff --git a/layer.yaml b/layer.yaml
index 37d19f1..e4abc0e 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -7,5 +7,10 @@ includes:
   - interface:influxdb-api
 options:
   basic:
-    use_venv: true
-    include_system_packages: true
+    packages:
+      # we need to specify these here due to https://github.com/juju-solutions/charms.reactive/issues/82
+      - build-essential
+      - python3-setuptools
+      - python3-wheel
+      - python3-yaml 
+      - python3-influxdb