Merge pull request #2718 from bacongobbler/issue-2650

fix(controller): set config as the issuing user

Author: Matthew Fisher

controller/api/tests/test_config.py

@@ -187,6 +187,7 @@ def test_admin_can_create_config_on_other_apps(self):
                                     HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 201)
         self.assertIn('PORT', response.data['values'])
+        return response
 
     @mock.patch('requests.post', mock_import_repository_task)
     def test_limit_memory(self):
@@ -423,3 +424,11 @@ def test_tags(self):
         self.assertEqual(response.status_code, 405)
         response = self.client.delete(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 405)
+
+    def test_config_owner_is_requesting_user(self):
+        """
+        Ensure that setting the config value is owned by the requesting user
+        See https://github.com/deis/deis/issues/2650
+        """
+        response = self.test_admin_can_create_config_on_other_apps()
+        self.assertEqual(response.data['owner'], self.user.username)

controller/api/views.py

@@ -289,7 +289,6 @@ def pre_save(self, config):
         previous_config = config.app.config_set.latest()
         config.owner = self.request.user
         if previous_config:
-            config.owner = previous_config.owner
             for attr in ['cpu', 'memory', 'tags', 'values']:
                 # Guard against migrations from older apps without fixes to
                 # JSONField encoding.