Add x-konfig-prefix support in python generator (#595)

* Add x-konfig-prefix support in python generator * update integration test SDKs
konfig-dev · Feb 27, 2024 · 5e83dde · 5e83dde
1 parent 897ddd1
commit 5e83dde
Show file tree

Hide file tree

Showing 32 changed files with 103 additions and 32 deletions.
diff --git a/generator/konfig-generator-api/src/main/resources/python/configuration.handlebars b/generator/konfig-generator-api/src/main/resources/python/configuration.handlebars
@@ -292,6 +292,13 @@ conf = {{{packageName}}}.Configuration(
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            {{#each apiKeyMethods}}
+            {{#if vendorExtensions.x-konfig-prefix}}
+            self.api_key_prefix['{{{name}}}'] = "{{{vendorExtensions.x-konfig-prefix}}}"
+            {{/if}}
+            {{/each}}
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -548,7 +555,7 @@ conf = {{{packageName}}}.Configuration(
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 {{#unless removeDefaultConfigurationParameters}}

diff --git a/...sts/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/configuration.py b/...sts/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/configuration.py
@@ -147,6 +147,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -361,7 +363,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...ts/sdks/python-async-default-timeout/python/python_async_default_timeout/configuration.py b/...ts/sdks/python-async-default-timeout/python/python_async_default_timeout/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...top-level-operation/python/python_async_timeout_with_top_level_operation/configuration.py b/...top-level-operation/python/python_async_timeout_with_top_level_operation/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...-integration-tests/sdks/python-async-timeout/python/python_async_timeout/configuration.py b/...-integration-tests/sdks/python-async-timeout/python/python_async_timeout/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/generator/konfig-integration-tests/sdks/python-carbon/python/carbon/configuration.py b/generator/konfig-integration-tests/sdks/python-carbon/python/carbon/configuration.py
@@ -142,6 +142,10 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            self.api_key_prefix['accessToken'] = "Token "
+            self.api_key_prefix['apiKey'] = "Bearer "
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -350,7 +354,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...on-tests/sdks/python-circular-reference/python/python_circular_reference/configuration.py b/...on-tests/sdks/python-circular-reference/python/python_circular_reference/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...gration-tests/sdks/python-decentro/python/decentro_in_collections_client/configuration.py b/...gration-tests/sdks/python-decentro/python/decentro_in_collections_client/configuration.py
@@ -154,6 +154,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -362,7 +364,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...ration-tests/sdks/python-invalid-response/python/python_invalid_response/configuration.py b/...ration-tests/sdks/python-invalid-response/python/python_invalid_response/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...g-integration-tests/sdks/python-newscatcher/python/newscatcherapi_client/configuration.py b/...g-integration-tests/sdks/python-newscatcher/python/newscatcherapi_client/configuration.py
@@ -147,6 +147,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -361,7 +363,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...onal-properties-anyof/python/python_pydantic_additional_properties_anyof/configuration.py b/...onal-properties-anyof/python/python_pydantic_additional_properties_anyof/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...any-schema-dict-response/python/python_pydantic_any_schema_dict_response/configuration.py b/...any-schema-dict-response/python/python_pydantic_any_schema_dict_response/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...thon-pydantic-array-with-object/python/python_pydantic_array_with_object/configuration.py b/...thon-pydantic-array-with-object/python/python_pydantic_array_with_object/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...dks/python-pydantic-empty-response/python/python_pydantic_empty_response/configuration.py b/...dks/python-pydantic-empty-response/python/python_pydantic_empty_response/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...tion-tests/sdks/python-pydantic-enum-str/python/python_pydantic_enum_str/configuration.py b/...tion-tests/sdks/python-pydantic-enum-str/python/python_pydantic_enum_str/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...ee-form-object-property/python/python_pydantic_free_form_object_property/configuration.py b/...ee-form-object-property/python/python_pydantic_free_form_object_property/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...ee-form-object-response/python/python_pydantic_free_form_object_response/configuration.py b/...ee-form-object-response/python/python_pydantic_free_form_object_response/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/.../sdks/python-pydantic-list-in-union/python/python_pydantic_list_in_union/configuration.py b/.../sdks/python-pydantic-list-in-union/python/python_pydantic_list_in_union/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/.../sdks/python-pydantic-list-response/python/python_pydantic_list_response/configuration.py b/.../sdks/python-pydantic-list-response/python/python_pydantic_list_response/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...-with-list-and-str/python/python_pydantic_nested_union_with_list_and_str/configuration.py b/...-with-list-and-str/python/python_pydantic_nested_union_with_list_and_str/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key
 

diff --git a/...s/python-pydantic-nullable-string/python/python_pydantic_nullable_string/configuration.py b/...s/python-pydantic-nullable-string/python/python_pydantic_nullable_string/configuration.py
@@ -139,6 +139,8 @@ def __init__(self, host=None,
         self.api_key_prefix = {}
         if api_key_prefix:
             self.api_key_prefix = api_key_prefix
+        else:
+            pass
         """dict to store API prefix (e.g. Bearer)
         """
         self.refresh_api_key_hook = None
@@ -347,7 +349,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
-                return "%s %s" % (prefix, key)
+                return "%s%s" % (prefix, key)
             else:
                 return key