Merge lp:~jorge/charms/trusty/juju-gui/add-default-values into lp:charms/trusty/juju-gui

[Jorge Castro]

Add default values to pass charm proof.

[Brad Crittenden (bac)]

Thanks for the changes Jorge.

Unfortunately this version does not pass charm-proof, which is a fault of the proofing tool. Running it I see:

[juju-gui]bac@trusty64:~/charms/trusty/juju-gui$ charm-proof .
I: config.yaml: option password has no default value
I: config.yaml: option ssl-key-contents has no default value
I: config.yaml: option ssl-cert-contents has no default value
I: config.yaml: option login-help has no default value

Null should be a valid default value for strings. It is treated as None when parsed in Python. The tool is satisfied if you use:

default: ""

But the empty string is not the same as None. In our charm we have tests like:

if login_help is None: # Use the default value

Setting the default to the empty string causes this test to fail and no login help is shown.

If we insist that a 'default: ' key be provide for each configuration value then the tool should be updated to accept a null value as represented by:

default:
default: null
default: ~

See http://yaml.org/type/null.html for more details.

If the tool is already being updated or you have more information please let me know.

review: Needs Information

Unmerged revisions

98. By Jorge Castro on 2014-09-09

Add default values to pass charm proof.

=== modified file 'config.yaml'
--- config.yaml	2014-04-15 14:17:12 +0000
+++ config.yaml	2014-09-09 23:39:59 +0000
@@ -66,17 +66,20 @@
       the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
       If not, cetificates will be automatically generated.
     type: string
+    default:
   ssl-key-contents:
     description: |
       The contents of the private key file to be used in SSL connections to
       the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
       If not, cetificates will be automatically generated.
     type: string
+    default:
   login-help:
     description: |
       The help text shown to the user on the login screen. If not provided, a
       default message is used, suggesting how to find the login credentials.
     type: string
+    default: 
   read-only:
     description: |
       Whether or not the GUI is in read-only mode. Note that read-only mode is
@@ -103,6 +106,7 @@
       If given, the password to use for the environment to immediately
       connect.  Do not set unless you understand and accept the risks.
     type: string
+    default:
   sandbox:
     description: |
       Run using an in-memory sandbox rather than a real Juju backend. Sandbox