fix applying patch

Author: tomplus

kubernetes_asyncio/client/api_client.py

@@ -165,7 +165,7 @@ async def __call_api(
             post_params.extend(self.files_parameters(files))
 
         # auth setting
-        self.update_params_for_auth(
+        await self.update_params_for_auth(
             header_params, query_params, auth_settings,
             request_auth=_request_auth)
 
@@ -198,7 +198,9 @@ async def __call_api(
         if not _preload_content:
             return return_data
 
-        response_type = response_types_map.get(response_data.status, None)
+        response_type = None
+        if response_types_map:
+            response_type = response_types_map.get(response_data.status, None)
 
         if six.PY3 and response_type not in ["file", "bytes"]:
             match = None
@@ -548,7 +550,7 @@ def select_header_content_type(self, content_types, method=None, body=None):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, queries, auth_settings,
+    async def update_params_for_auth(self, headers, queries, auth_settings,
                                request_auth=None):
         """Updates header and query params based on authentication setting.
 
@@ -566,7 +568,7 @@ def update_params_for_auth(self, headers, queries, auth_settings,
             return
 
         for auth in auth_settings:
-            auth_setting = self.configuration.auth_settings().get(auth)
+            auth_setting = (await self.configuration.auth_settings()).get(auth)
             if auth_setting:
                 self._apply_auth_params(headers, queries, auth_setting)
 

kubernetes_asyncio/client/configuration.py

@@ -12,6 +12,7 @@
 
 from __future__ import absolute_import
 
+import asyncio
 import copy
 import logging
 import sys
@@ -177,6 +178,14 @@ def __init__(self, host=None,
            Set this to false to skip verifying SSL certificate when calling API
            from https server.
         """
+        self.disable_strict_ssl_verification = False
+        """Set to true, to accept certificates violate X509 strict certificate
+           verification requirements, like missing the following extensions:
+           - X509v3 Subject Key Identifier
+           - X509v3 Authority Key Identifier
+           - X509v3 Subject Alternative Name
+           (It is implemented by removing ssl.VERIFY_X509_STRICT from SSLContext.verify_flags)
+        """
         self.ssl_ca_cert = ssl_ca_cert
         """Set this to customize the certificate file to verify the peer.
         """
@@ -189,6 +198,10 @@ def __init__(self, host=None,
         self.assert_hostname = None
         """Set this to True/False to enable/disable SSL hostname verification.
         """
+        self.tls_server_name = None
+        """SSL/TLS Server Name Indication (SNI)
+           Set this to the SNI value expected by Kubernetes API.
+        """
 
         self.connection_pool_maxsize = 100
         """This value is passed to the aiohttp to limit simultaneous connections.
@@ -249,6 +262,16 @@ def set_default(cls, default):
         """
         cls._default = copy.deepcopy(default)
 
+    @classmethod
+    def get_default(cls):
+        """Get default instance of configuration.
+
+        :return: The Configuration object.
+        """
+        if cls._default is None:
+            cls.set_default(Configuration())
+        return cls._default
+
     @classmethod
     def get_default_copy(cls):
         """Return new instance of configuration.
@@ -348,15 +371,17 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier, alias=None):
+    async def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
         :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
-            self.refresh_api_key_hook(self)
+            result = self.refresh_api_key_hook(self)
+            if asyncio.iscoroutine(result):
+                await result
         key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
@@ -380,7 +405,7 @@ def get_basic_auth_token(self):
             basic_auth=username + ':' + password
         ).get('authorization')
 
-    def auth_settings(self):
+    async def auth_settings(self):
         """Gets Auth Settings dict for api client.
 
         :return: The Auth Settings information dict.
@@ -391,7 +416,7 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'authorization',
-                'value': self.get_api_key_with_prefix(
+                'value': await self.get_api_key_with_prefix(
                     'BearerToken',
                 ),
             }

kubernetes_asyncio/client/configuration.py.orig

@@ -5,7 +5,7 @@
 
     No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
 
-    The version of the OpenAPI document: v1.32.3
+    The version of the OpenAPI document: v1.33.3
     Generated by: https://openapi-generator.tech
 """
 
@@ -417,8 +417,8 @@ conf = client.Configuration(
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: v1.32.3\n"\
-               "SDK Package Version: 32.3.0+snapshot".\
+               "Version of the API: v1.33.3\n"\
+               "SDK Package Version: 33.3.0+snapshot".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

kubernetes_asyncio/client/models/admissionregistration_v1_service_reference.py

@@ -52,7 +52,7 @@ class AdmissionregistrationV1ServiceReference(object):
     def __init__(self, name=None, namespace=None, path=None, port=None, local_vars_configuration=None):  # noqa: E501
         """AdmissionregistrationV1ServiceReference - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._name = None

kubernetes_asyncio/client/models/admissionregistration_v1_webhook_client_config.py

@@ -50,7 +50,7 @@ class AdmissionregistrationV1WebhookClientConfig(object):
     def __init__(self, ca_bundle=None, service=None, url=None, local_vars_configuration=None):  # noqa: E501
         """AdmissionregistrationV1WebhookClientConfig - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._ca_bundle = None

kubernetes_asyncio/client/models/apiextensions_v1_service_reference.py

@@ -52,7 +52,7 @@ class ApiextensionsV1ServiceReference(object):
     def __init__(self, name=None, namespace=None, path=None, port=None, local_vars_configuration=None):  # noqa: E501
         """ApiextensionsV1ServiceReference - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._name = None

kubernetes_asyncio/client/models/apiextensions_v1_webhook_client_config.py

@@ -50,7 +50,7 @@ class ApiextensionsV1WebhookClientConfig(object):
     def __init__(self, ca_bundle=None, service=None, url=None, local_vars_configuration=None):  # noqa: E501
         """ApiextensionsV1WebhookClientConfig - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._ca_bundle = None

kubernetes_asyncio/client/models/apiregistration_v1_service_reference.py

@@ -50,7 +50,7 @@ class ApiregistrationV1ServiceReference(object):
     def __init__(self, name=None, namespace=None, port=None, local_vars_configuration=None):  # noqa: E501
         """ApiregistrationV1ServiceReference - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._name = None

kubernetes_asyncio/client/models/authentication_v1_token_request.py

@@ -54,7 +54,7 @@ class AuthenticationV1TokenRequest(object):
     def __init__(self, api_version=None, kind=None, metadata=None, spec=None, status=None, local_vars_configuration=None):  # noqa: E501
         """AuthenticationV1TokenRequest - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._api_version = None

kubernetes_asyncio/client/models/core_v1_endpoint_port.py

@@ -52,7 +52,7 @@ class CoreV1EndpointPort(object):
     def __init__(self, app_protocol=None, name=None, port=None, protocol=None, local_vars_configuration=None):  # noqa: E501
         """CoreV1EndpointPort - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
-            local_vars_configuration = Configuration.get_default_copy()
+            local_vars_configuration = Configuration.get_default()
         self.local_vars_configuration = local_vars_configuration
 
         self._app_protocol = None