|
30 | 30 | from kubernetes.client import Configuration |
31 | 31 |
|
32 | 32 | from .config_exception import ConfigException |
33 | | -from .dateutil import format_rfc3339, parse_rfc3339 |
| 33 | +from .dateutil import UTC, format_rfc3339, parse_rfc3339 |
34 | 34 | from .kube_config import (ENV_KUBECONFIG_PATH_SEPARATOR, CommandTokenSource, |
35 | 35 | ConfigNode, FileOrData, KubeConfigLoader, |
36 | 36 | KubeConfigMerger, _cleanup_temp_files, |
@@ -89,10 +89,10 @@ def _raise_exception(st): |
89 | 89 | TEST_PASSWORD = "pass" |
90 | 90 | # token for me:pass |
91 | 91 | TEST_BASIC_TOKEN = "Basic bWU6cGFzcw==" |
92 | | -DATETIME_EXPIRY_PAST = datetime.datetime.utcnow( |
93 | | -) - datetime.timedelta(minutes=PAST_EXPIRY_TIMEDELTA) |
94 | | -DATETIME_EXPIRY_FUTURE = datetime.datetime.utcnow( |
95 | | -) + datetime.timedelta(minutes=FUTURE_EXPIRY_TIMEDELTA) |
| 92 | +DATETIME_EXPIRY_PAST = datetime.datetime.now(tz=UTC |
| 93 | + ).replace(tzinfo=None) - datetime.timedelta(minutes=PAST_EXPIRY_TIMEDELTA) |
| 94 | +DATETIME_EXPIRY_FUTURE = datetime.datetime.now(tz=UTC |
| 95 | + ).replace(tzinfo=None) + datetime.timedelta(minutes=FUTURE_EXPIRY_TIMEDELTA) |
96 | 96 | TEST_TOKEN_EXPIRY_PAST = _format_expiry_datetime(DATETIME_EXPIRY_PAST) |
97 | 97 |
|
98 | 98 | TEST_SSL_HOST = "https://test-host" |
@@ -1028,7 +1028,7 @@ def test_load_gcp_token_no_refresh(self): |
1028 | 1028 | def test_load_gcp_token_with_refresh(self): |
1029 | 1029 | def cred(): return None |
1030 | 1030 | cred.token = TEST_ANOTHER_DATA_BASE64 |
1031 | | - cred.expiry = datetime.datetime.utcnow() |
| 1031 | + cred.expiry = datetime.datetime.now(tz=UTC) |
1032 | 1032 |
|
1033 | 1033 | loader = KubeConfigLoader( |
1034 | 1034 | config_dict=self.TEST_KUBE_CONFIG, |
@@ -1124,7 +1124,6 @@ def test_oidc_with_idp_ca_file_refresh(self, mock_ApiClient, mock_OAuth2Session) |
1124 | 1124 | active_context="expired_oidc_with_idp_ca_file", |
1125 | 1125 | ) |
1126 | 1126 |
|
1127 | | - |
1128 | 1127 | self.assertTrue(loader._load_auth_provider_token()) |
1129 | 1128 | self.assertEqual("Bearer abc123", loader.token) |
1130 | 1129 |
|
@@ -1529,6 +1528,7 @@ def test_user_exec_auth_certificates(self, mock): |
1529 | 1528 | @mock.patch('kubernetes.config.kube_config.ExecProvider.run', autospec=True) |
1530 | 1529 | def test_user_exec_cwd(self, mock): |
1531 | 1530 | capture = {} |
| 1531 | + |
1532 | 1532 | def capture_cwd(exec_provider): |
1533 | 1533 | capture['cwd'] = exec_provider.cwd |
1534 | 1534 | mock.side_effect = capture_cwd |
|
0 commit comments