Merge pull request #275 from aschleck/cwd

Run kubeconfig exec commands in the correct directory

Author: k8s-ci-robot

config/exec_provider.py

@@ -31,7 +31,7 @@ class ExecProvider(object):
     * caching
     """
 
-    def __init__(self, exec_config):
+    def __init__(self, exec_config, cwd):
         """
         exec_config must be of type ConfigNode because we depend on
         safe_get(self, key) to correctly handle optional exec provider
@@ -53,6 +53,7 @@ def __init__(self, exec_config):
                 value = item['value']
                 additional_vars[name] = value
             self.env.update(additional_vars)
+        self.cwd = cwd
 
     def run(self, previous_response=None):
         kubernetes_exec_info = {
@@ -69,6 +70,7 @@ def run(self, previous_response=None):
             self.args,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            cwd=self.cwd,
             env=self.env,
             universal_newlines=True)
         (stdout, stderr) = process.communicate()

config/exec_provider_test.py

@@ -47,7 +47,7 @@ def test_missing_input_keys(self):
                         ConfigNode('test3', {'apiVersion': ''})]
         for exec_config in exec_configs:
             with self.assertRaises(ConfigException) as context:
-                ExecProvider(exec_config)
+                ExecProvider(exec_config, None)
             self.assertIn('exec: malformed request. missing key',
                           context.exception.args[0])
 
@@ -57,7 +57,7 @@ def test_error_code_returned(self, mock):
         instance.wait.return_value = 1
         instance.communicate.return_value = ('', '')
         with self.assertRaises(ConfigException) as context:
-            ep = ExecProvider(self.input_ok)
+            ep = ExecProvider(self.input_ok, None)
             ep.run()
         self.assertIn('exec: process returned %d' %
                       instance.wait.return_value, context.exception.args[0])
@@ -68,7 +68,7 @@ def test_nonjson_output_returned(self, mock):
         instance.wait.return_value = 0
         instance.communicate.return_value = ('', '')
         with self.assertRaises(ConfigException) as context:
-            ep = ExecProvider(self.input_ok)
+            ep = ExecProvider(self.input_ok, None)
             ep.run()
         self.assertIn('exec: failed to decode process output',
                       context.exception.args[0])
@@ -102,7 +102,7 @@ def test_missing_output_keys(self, mock):
         for output in outputs:
             instance.communicate.return_value = (output, '')
             with self.assertRaises(ConfigException) as context:
-                ep = ExecProvider(self.input_ok)
+                ep = ExecProvider(self.input_ok, None)
                 ep.run()
             self.assertIn('exec: malformed response. missing key',
                           context.exception.args[0])
@@ -123,7 +123,7 @@ def test_mismatched_api_version(self, mock):
         """ % wrong_api_version
         instance.communicate.return_value = (output, '')
         with self.assertRaises(ConfigException) as context:
-            ep = ExecProvider(self.input_ok)
+            ep = ExecProvider(self.input_ok, None)
             ep.run()
         self.assertIn(
             'exec: plugin api version %s does not match' %
@@ -135,11 +135,20 @@ def test_ok_01(self, mock):
         instance = mock.return_value
         instance.wait.return_value = 0
         instance.communicate.return_value = (self.output_ok, '')
-        ep = ExecProvider(self.input_ok)
+        ep = ExecProvider(self.input_ok, None)
         result = ep.run()
         self.assertTrue(isinstance(result, dict))
         self.assertTrue('token' in result)
 
+    @mock.patch('subprocess.Popen')
+    def test_run_in_dir(self, mock):
+        instance = mock.return_value
+        instance.wait.return_value = 0
+        instance.communicate.return_value = (self.output_ok, '')
+        ep = ExecProvider(self.input_ok, '/some/directory')
+        ep.run()
+        self.assertEqual(mock.call_args.kwargs['cwd'], '/some/directory')
+
 
 if __name__ == '__main__':
     unittest.main()

config/kube_config.py

@@ -483,7 +483,8 @@ def _load_from_exec_plugin(self):
         if 'exec' not in self._user:
             return
         try:
-            status = ExecProvider(self._user['exec']).run()
+            base_path = self._get_base_path(self._cluster.path)
+            status = ExecProvider(self._user['exec'], base_path).run()
             if 'token' in status:
                 self.token = "Bearer %s" % status['token']
             elif 'clientCertificateData' in status:
@@ -493,7 +494,6 @@ def _load_from_exec_plugin(self):
                     logging.error('exec: missing clientKeyData field in '
                                   'plugin output')
                     return None
-                base_path = self._get_base_path(self._cluster.path)
                 self.cert_file = FileOrData(
                     status, None,
                     data_key_name='clientCertificateData',

config/kube_config_test.py

@@ -1441,6 +1441,20 @@ def test_user_exec_auth_certificates(self, mock):
             active_context="exec_cred_user_certificate").load_and_set(actual)
         self.assertEqual(expected, actual)
 
+    @mock.patch('kubernetes.config.kube_config.ExecProvider.run', autospec=True)
+    def test_user_exec_cwd(self, mock):
+        capture = {}
+        def capture_cwd(exec_provider):
+            capture['cwd'] = exec_provider.cwd
+        mock.side_effect = capture_cwd
+
+        expected = "/some/random/path"
+        KubeConfigLoader(
+            config_dict=self.TEST_KUBE_CONFIG,
+            active_context="exec_cred_user",
+            config_base_path=expected).load_and_set(FakeConfig())
+        self.assertEqual(expected, capture['cwd'])
+
     def test_user_cmd_path(self):
         A = namedtuple('A', ['token', 'expiry'])
         token = "dummy"