Merge ~tasdomas/influxdb-charm:d01-actions-fix into influxdb-charm:master

[Domas Monkus]

Actions in the current version of the influxdb charm are broken due to changes in the basic layer. This fixes the actions.

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

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

[Tom Haddon (mthaddon)]

This creates a number of lint errors:

$ make lint
./actions/create-database:8:1: E402 module level import not at top of file
./actions/create-database:11:1: E402 module level import not at top of file
./actions/create-database:12:1: E402 module level import not at top of file
./actions/create-database:14:1: E402 module level import not at top of file
./actions/create-user:8:1: E402 module level import not at top of file
./actions/create-user:11:1: E402 module level import not at top of file
./actions/create-user:12:1: E402 module level import not at top of file
./actions/create-user:13:1: E402 module level import not at top of file
./actions/create-user:14:1: E402 module level import not at top of file
./actions/create-user:16:1: E402 module level import not at top of file
./actions/grant-privilege:8:1: E402 module level import not at top of file
./actions/grant-privilege:11:1: E402 module level import not at top of file
./actions/grant-privilege:12:1: E402 module level import not at top of file
./actions/grant-privilege:14:1: E402 module level import not at top of file
./actions/show-admin-password:7:1: E402 module level import not at top of file
./actions/show-admin-password:10:1: E402 module level import not at top of file
./actions/show-admin-password:10:1: F401 'os' imported but unused
./actions/show-admin-password:11:1: E402 module level import not at top of file
./lib/influxdbcharmlib.py:36:78: W291 trailing whitespace
./lib/influxdbcharmlib.py:37:78: W291 trailing whitespace

It looks like not all of those are you changes, but could those be addressed as part of this?

review: Needs Fixing

[Stuart Bishop (stub)]

The shebang lines for all the action scripts should be "!/usr/local/sbin/charm-env python3", and the sys.path.append manipulation and activate_venv() calls removed. What you have works, but can break with base layer updates and has lint issues as the #noqa comments demonstrate.

The switch to a raw string for the regexp is correct, thanks.

[Stuart Bishop (stub)]

review: Needs Fixing

[Domas Monkus (tasdomas)]

Fixed

review: Needs Resubmitting

[Stuart Bishop (stub)]

Yup, looks good. Thanks!

Feel free to attempt to fix the influxdb import, or not since that is existing code and you are just delinting it.

review: Approve

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

Change successfully merged at revision 0a38401b2c89ec85afb02d1239c7029ae5e9ee93

diff --git a/actions/create-database b/actions/create-database
index d2cd4bd..2736b9e 100755
--- a/actions/create-database
+++ b/actions/create-database
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/sbin/charm-env python3
 # Create a database
 
 import requests
diff --git a/actions/create-user b/actions/create-user
index 8ad8db3..628696d 100755
--- a/actions/create-user
+++ b/actions/create-user
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/sbin/charm-env python3
 # Create a database
 
 import random
@@ -14,7 +14,7 @@ from charmhelpers.core.hookenv import (
 )
 
 try:
-    import influxdb
+    import influxdb  # noqa: E402
 except ImportError:
     print("Missing python3-influxdb package")
     exit(1)
diff --git a/actions/grant-privilege b/actions/grant-privilege
index 87cfb0d..6ae856c 100755
--- a/actions/grant-privilege
+++ b/actions/grant-privilege
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/sbin/charm-env python3
 # Create a database
 
 import requests
diff --git a/actions/show-admin-password b/actions/show-admin-password
index 093b2d2..878bb8e 100755
--- a/actions/show-admin-password
+++ b/actions/show-admin-password
@@ -1,17 +1,8 @@
 #!/usr/local/sbin/charm-env python3
 
-import os
-import sys
+from charmhelpers.core import hookenv
 
-hooks_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'hooks'))
-if hooks_dir not in sys.path:
-    sys.path.append(hooks_dir)
-libs_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'lib'))
-if libs_dir not in sys.path:
-    sys.path.append(libs_dir)
-
-from charmhelpers.core import hookenv  # NOQA: E402
-from influxdbcharmlib import get_influxdb_credentials  # NOQA: E402
+from influxdbcharmlib import get_influxdb_credentials
 
 
 if __name__ == '__main__':
diff --git a/lib/influxdbcharmlib.py b/lib/influxdbcharmlib.py
index 4bf06b5..3c0016c 100644
--- a/lib/influxdbcharmlib.py
+++ b/lib/influxdbcharmlib.py
@@ -33,8 +33,8 @@ def create_influxdb_user(username, admin=False, local_user=None):
     password = str(uuid.uuid4())
 
     # Repeat the process of creating teh user until completed or max times
-    # reached because sometimes happens a race condition between the influxdb 
-    # service startup and the client use. In those cases the service is still 
+    # reached because sometimes happens a race condition between the influxdb
+    # service startup and the client use. In those cases the service is still
     # not fully started when the client is sending the first request
     n = 3
     while True:
diff --git a/reactive/influxdb.py b/reactive/influxdb.py
index db19fca..c751ea8 100644
--- a/reactive/influxdb.py
+++ b/reactive/influxdb.py
@@ -92,7 +92,7 @@ def apply_configs(fh, config):  # noqa: TODO: fix overly complex
                 indent = '  '
             continue
         # Format is 'key = value' or '# key = value'
-        match = re.match('^([\s#]*)(\S+)(\s*=.*)', line)
+        match = re.match(r'^([\s#]*)(\S+)(\s*=.*)', line)
         if not match:
             new_config.append(line)
             continue