Merge lp:~2-xtian/charm-helpers/application-version-set into lp:charm-helpers

[Christian Muirhead]

Add charmhelpers.core.hookenv.application_version_set as a convenience wrapper for the application-version-set command. If it's not available, then it falls back to logging the version instead.

Juju 2.0-beta12 adds the application-version-set hook tool that lets a charm tell Juju which version of the charmed software is running. This displayed in the status info for the application, which means that charm authors won't need to jam it into status messages.

Add charmhelpers.core.hookenv.application_version_set as a convenience wrapper for the application-version-set command. If it's not available, then it falls back to logging the version instead.

Juju 2.0-beta12 adds the application-version-set hook tool that lets a charm tell Juju which version of the charmed software is running. This displayed in the status info for the application, which means that charm authors won't need to jam it into status messages.

[Stuart Bishop (stub)]

A similar branch got landed, adding core.hookenv.application_version_set()

review: Disapprove

Unmerged revisions

602. By Christian Muirhead on 2016-07-08

Undo inadvertent change to license text

601. By Christian Muirhead on 2016-07-08

Add core.hookenv.application_version_set

This calls the application-version-set hook tool to tell juju what
version of the charmed software is running, which will be displayed in
status. If the application-version-set command doesn't exist it logs
the version instead.

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/core/hookenv.py	2016-07-15 13:01:11 +0000
@@ -829,6 +829,30 @@
         return (status["status"], status["message"])
 
 
+def application_version_set(version):
+    """Set the running version of the charmed software
+
+    This is used to tell Juju what version of the application is running
+    (as opposed to the version of the charm). It could be a package
+    version number or some other useful identifier, such as a Git
+    hash. The version set will be displayed in "juju status" output for
+    the application.
+
+    If the application-version-set command isn't found then assume this
+    is juju < 2.0 and log the version instead.
+    """
+    cmd = ['application-version-set', version]
+    try:
+        ret = subprocess.call(cmd)
+        if ret == 0:
+            return
+    except OSError as e:
+        if e.errno != errno.ENOENT:
+            raise
+    log_message = 'application-version-set: {}'.format(version)
+    log(log_message, level='INFO')
+
+
 def translate_exc(from_exc, to_exc):
     def inner_translate_exc1(f):
         @wraps(f)