Support multiple expires-on field formats

config/kube_config.py

@@ -227,8 +227,14 @@ def _load_azure_token(self, provider):
         if 'access-token' not in provider['config']:
             return
         if 'expires-on' in provider['config']:
-            if int(provider['config']['expires-on']) < time.gmtime():
-                self._refresh_azure_token(provider['config'])
+            try:
+                if time.gmtime(int(provider['config']['expires-on'])) < time.gmtime():
+                    self._refresh_azure_token(provider['config'])
+            except ValueError:  # sometimes expires-on is not an int, but a datestring
+                parsed_time = time.strptime(
+                    provider['config']['expires-on'], '%Y-%m-%d %H:%M:%S.%f')
+                if parsed_time < time.gmtime():
+                    self._refresh_azure_token(provider['config'])
         self.token = 'Bearer %s' % provider['config']['access-token']
         return self.token
 

config/kube_config_test.py

@@ -20,6 +20,7 @@
 import os
 import shutil
 import tempfile
+import time
 import unittest
 
 import mock
@@ -1117,7 +1118,8 @@ def test_list_kube_config_contexts(self):
             {'context': {'cluster': 'ssl', 'user': 'ssl'}, 'name': 'ssl'},
             {'context': {'cluster': 'default', 'user': 'simple_token'},
              'name': 'simple_token'},
-            {'context': {'cluster': 'default', 'user': 'expired_oidc'}, 'name': 'expired_oidc'}]
+            {'context': {'cluster': 'default', 'user': 'expired_oidc'},
+             'name': 'expired_oidc'}]
 
         contexts, active_context = list_kube_config_contexts(
             config_file=kubeconfigs)
@@ -1151,6 +1153,62 @@ def test_save_changes(self):
         # new token
         self.assertEqual(provider.value['id-token'], "token-changed")
 
+    @mock.patch('time')
+    def test___load_azure_token(self, mock_time):
+        class TestKubeConfigLoader(KubeConfigLoader):
+            def __init__(self):
+                self.refresh_called = 0
+
+            def _refresh_azure_token(self, param_1):
+                self.refresh_called += 1
+
+        time.gmtime = mock.Mock(return_value=time.struct_time(
+            tm_year=2019, tm_mon=5, tm_mday=10, tm_hour=14, tm_min=47, tm_sec=31, tm_wday=4, tm_yday=130, tm_isdst=0))
+
+        fake_provider_expires_on_int_old = {
+            "config": "dummy",
+            "access-token": "dummy",
+            "expires-on": 1555503941  # 17 April 2019
+        }
+
+        fake_provider_expires_on_int_new = {
+            "config": "dummy",
+            "access-token": "dummy",
+            "expires-on": 1585555941  # 30 March 2020
+        }
+
+        fake_provider_expires_on_datestring_old = {
+            "config": "dummy",
+            "access-token": "dummy",
+            "expires-on": "2018-02-03 14:56:48.999"
+        }
+
+        fake_provider_expires_on_datestring_new = {
+            "config": "dummy",
+            "access-token": "dummy",
+            "expires-on": "2021-02-03 14:56:48.999"
+        }
+
+        test_kube_config_loader = TestKubeConfigLoader()
+        test_kube_config_loader._load_azure_token(
+            fake_provider_expires_on_int_old)
+        self.assertEqual(test_kube_config_loader.refresh_called, 0)
+
+        test_kube_config_loader = TestKubeConfigLoader()
+        test_kube_config_loader._load_azure_token(
+            fake_provider_expires_on_datestring_old)
+        self.assertEqual(test_kube_config_loader.refresh_called, 0)
+
+        test_kube_config_loader = TestKubeConfigLoader()
+        test_kube_config_loader._load_azure_token(
+            fake_provider_expires_on_int_new)
+        self.assertEqual(test_kube_config_loader.refresh_called, 1)
+
+        test_kube_config_loader = TestKubeConfigLoader()
+        test_kube_config_loader._load_azure_token(
+            fake_provider_expires_on_datestring_new)
+        self.assertEqual(test_kube_config_loader.refresh_called, 1)
+
 
 if __name__ == '__main__':
     unittest.main()

watch/watch_test.py

@@ -78,7 +78,7 @@ def test_watch_for_follow(self):
 
         fake_api = Mock()
         fake_api.read_namespaced_pod_log = Mock(return_value=fake_resp)
-        fake_api.read_namespaced_pod_log.__doc__ = ':param bool follow:\n:return: str'
+        fake_api.read_namespaced_pod_log.__doc__ = ':param bool follow:\n:return: str'  # noqa: E501
 
         w = Watch()
         count = 1