fix(controller): allow unicode in config:set and app logging

Author: mboersma

client/deis.py

@@ -1112,11 +1112,13 @@ def config_list(self, args):
                 width = max(map(len, keys)) + 5
                 for k in keys:
                     v = values[k]
+                    k, v = k.encode('utf-8'), v.encode('utf-8')
                     self._logger.info(("{k:<" + str(width) + "} {v}").format(**locals()))
             else:
                 output = []
                 for k in keys:
                     v = values[k]
+                    k, v = k.encode('utf-8'), v.encode('utf-8')
                     output.append("{k}={v}".format(**locals()))
                 self._logger.info(' '.join(output))
         else:
@@ -1162,6 +1164,7 @@ def config_set(self, args):
                 self._logger.info('No configuration')
                 return
             for k, v in values.items():
+                k, v = k.encode('utf-8'), v.encode('utf-8')
                 self._logger.info("{k}: {v}".format(**locals()))
         else:
             raise ResponseError(response)

controller/api/models.py

@@ -172,9 +172,8 @@ def log(self, message):
         existing logging configurations.
         """
         with open(os.path.join(settings.DEIS_LOG_DIR, self.id + '.log'), 'a') as f:
-            f.write('{} deis[api]: {}\n'.format(
-                time.strftime('%Y-%m-%d %H:%M:%S'),
-                message))
+            msg = "{} deis[api]: {}\n".format(time.strftime('%Y-%m-%d %H:%M:%S'), message)
+            f.write(msg.encode('utf-8'))
 
     def create(self, *args, **kwargs):
         config = Config.objects.create(owner=self.owner, app=self)

controller/api/tests/test_config.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Unit tests for the Deis api app.
 
@@ -127,6 +128,29 @@ def test_config_set_same_key(self):
         self.assertIn('PORT', json.loads(response.data['values']))
         self.assertEqual(json.loads(response.data['values'])['PORT'], '5001')
 
+    @mock.patch('requests.post', mock_import_repository_task)
+    def test_config_set_unicode(self):
+        """
+        Test that config sets with unicode values are accepted.
+        """
+        url = '/api/apps'
+        body = {'cluster': 'autotest'}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        app_id = response.data['id']
+        url = "/api/apps/{app_id}/config".format(**locals())
+        # set an initial config value
+        body = {'values': json.dumps({'POWERED_BY': 'Деис'})}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        self.assertIn('POWERED_BY', json.loads(response.data['values']))
+        # reset same config value
+        body = {'values': json.dumps({'POWERED_BY': 'Кроликов'})}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        self.assertIn('POWERED_BY', json.loads(response.data['values']))
+        self.assertEqual(json.loads(response.data['values'])['POWERED_BY'], 'Кроликов')
+
     @mock.patch('requests.post', mock_import_repository_task)
     def test_config_str(self):
         """Test the text representation of a node."""

controller/registry/private.py

@@ -166,10 +166,10 @@ def _construct_env(env, config):
         if k in config:
             # update values defined by config
             v = config.pop(k)
-        new_env.append("{}={}".format(k, v))
+        new_env.append("{}={}".format(k.encode('utf-8'), v.encode('utf-8')))
     # add other config ENV items
     for k, v in config.items():
-        new_env.append("{}={}".format(k, v))
+        new_env.append("{}={}".format(k.encode('utf-8'), v.encode('utf-8')))
     return new_env
 
 

tests/config_test.go

@@ -10,8 +10,8 @@ import (
 
 var (
 	configListCmd  = "config:list --app={{.AppName}}"
-	configSetCmd   = "config:set jaf=1 --app={{.AppName}}"
-	configUnsetCmd = "config:unset jaf --app={{.AppName}}"
+	configSetCmd   = "config:set FOO=讲台 --app={{.AppName}}"
+	configUnsetCmd = "config:unset FOO --app={{.AppName}}"
 )
 
 func TestConfig(t *testing.T) {
@@ -48,7 +48,7 @@ func configSetup(t *testing.T) *utils.DeisTestConfig {
 
 func configListTest(
 	t *testing.T, params *utils.DeisTestConfig, notflag bool) {
-	utils.CheckList(t, configListCmd, params, "jaf", notflag)
+	utils.CheckList(t, configListCmd, params, "FOO", notflag)
 }
 
 func configSetTest(t *testing.T, params *utils.DeisTestConfig) {