Merge pull request #184 from fooka03/bugfix/179

Fix apiserver_id 'get' method

Author: k8s-ci-robot

config/kube_config.py

@@ -326,9 +326,12 @@ def _refresh_azure_token(self, config):
         )
         refresh_token = config['refresh-token']
         client_id = config['client-id']
-        apiserver_id = config.get(
-            'apiserver-id',
-            '00000002-0000-0000-c000-000000000000')
+        apiserver_id = '00000002-0000-0000-c000-000000000000'
+        try:
+            apiserver_id = config['apiserver-id']
+        except ConfigException:
+            # We've already set a default above
+            pass
         token_response = context.acquire_token_with_refresh_token(
             refresh_token, client_id, apiserver_id)
 

config/kube_config_test.py

@@ -461,20 +461,6 @@ class TestKubeConfigLoader(BaseTestCase):
                     "user": "azure_str_error"
                 }
             },
-            {
-                "name": "azure_no_apiserver",
-                "context": {
-                    "cluster": "default",
-                    "user": "azure_no_apiserver"
-                }
-            },
-            {
-                "name": "azure_bad_apiserver",
-                "context": {
-                    "cluster": "default",
-                    "user": "azure_bad_apiserver"
-                }
-            },
             {
                 "name": "expired_oidc",
                 "context": {
@@ -772,39 +758,6 @@ class TestKubeConfigLoader(BaseTestCase):
                     }
                 }
             },
-            {
-                "name": "azure_no_apiserver",
-                "user": {
-                    "auth-provider": {
-                        "config": {
-                            "access-token": TEST_AZURE_TOKEN,
-                            "environment": "AzurePublicCloud",
-                            "expires-in": "0",
-                            "expires-on": "156207275",
-                            "refresh-token": "refreshToken",
-                            "tenant-id": "9d2ac018-e843-4e14-9e2b-4e0ddac75433"
-                        },
-                        "name": "azure"
-                    }
-                }
-            },
-            {
-                "name": "azure_bad_apiserver",
-                "user": {
-                    "auth-provider": {
-                        "config": {
-                            "access-token": TEST_AZURE_TOKEN,
-                            "apiserver-id": "ApiserverId",
-                            "environment": "AzurePublicCloud",
-                            "expires-in": "0",
-                            "expires-on": "156207275",
-                            "refresh-token": "refreshToken",
-                            "tenant-id": "9d2ac018-e843-4e14-9e2b-4e0ddac75433"
-                        },
-                        "name": "azure"
-                    }
-                }
-            },
             {
                 "name": "expired_oidc",
                 "user": {
@@ -1162,22 +1115,6 @@ def test_azure_with_expired_int_error(self):
         provider = loader._user['auth-provider']
         self.assertRaises(ValueError, loader._azure_is_expired, provider)
 
-    def test_azure_with_no_apiserver(self):
-        loader = KubeConfigLoader(
-            config_dict=self.TEST_KUBE_CONFIG,
-            active_context="azure_no_apiserver",
-        )
-        provider = loader._user['auth-provider']
-        self.assertTrue(loader._azure_is_expired(provider))
-
-    def test_azure_with_bad_apiserver(self):
-        loader = KubeConfigLoader(
-            config_dict=self.TEST_KUBE_CONFIG,
-            active_context="azure_bad_apiserver",
-        )
-        provider = loader._user['auth-provider']
-        self.assertTrue(loader._azure_is_expired(provider))
-
     def test_user_pass(self):
         expected = FakeConfig(host=TEST_HOST, token=TEST_BASIC_TOKEN)
         actual = FakeConfig()