Update the code generation (#132)

* Update the code generation * Pulled the latest data-services
dominodatalab · Jan 18, 2024 · 062b365 · 062b365
1 parent d53ccfe
commit 062b365
Show file tree

Hide file tree

Showing 7 changed files with 772 additions and 723 deletions.
diff --git a/datasource_api_client/models/datasource_dto_auth_type.py b/datasource_api_client/models/datasource_dto_auth_type.py
@@ -10,6 +10,7 @@ class DatasourceDtoAuthType(str, Enum):
     AWSIAMROLEWITHUSERNAME = "AWSIAMRoleWithUsername"
     GCPBASIC = "GCPBasic"
     OAUTH = "OAuth"
+    OAUTHTOKEN = "OAuthToken"
     CLIENTIDSECRET = "ClientIdSecret"
     PERSONALTOKEN = "PersonalToken"
 

diff --git a/domino_data/configuration_gen.py b/domino_data/configuration_gen.py
@@ -1,6 +1,6 @@
 """Code generated by gen.py; DO NOT EDIT.
 This file was generated by robots at
-2023-09-27 17:47:39.546325"""
+2024-01-18 15:51:53.230967"""
 from typing import Any, Dict, Optional, Union
 
 from enum import Enum
@@ -74,9 +74,10 @@ class ConfigElem(Enum):
     REGION = "region"
     ROLE = "role"
     SCHEMA = "schema"
-    QUERYTIMEOUT = "queryTimeout"
+    SUBFOLDER = "subfolder"
     WAREHOUSE = "warehouse"
     CATALOGCODE = "catalogCode"
+    ENVIRONMENT = "environment"
 
 
 class CredElem(Enum):
@@ -93,6 +94,8 @@ class CredElem(Enum):
     CLIENTID = "clientId"
     CLIENTSECRET = "clientSecret"
     PERSONALACCESSTOKEN = "personalAccessToken"
+    APIKEY = "apiKey"
+    OAUTHTOKEN = "oAuthToken"
 
 
 def _cred(elem: CredElem) -> Any:
@@ -154,7 +157,6 @@ class DatabricksConfig(Config):
 
     catalog: Optional[str] = _config(elem=ConfigElem.CATALOG)
     schema: Optional[str] = _config(elem=ConfigElem.SCHEMA)
-    query_timeout: Optional[str] = _config(elem=ConfigElem.QUERYTIMEOUT)
 
     personal_access_token: Optional[str] = _cred(elem=CredElem.PERSONALACCESSTOKEN)
 
@@ -197,6 +199,7 @@ class GenericS3Config(Config):
     """GenericS3Config datasource configuration."""
 
     bucket: Optional[str] = _config(elem=ConfigElem.BUCKET)
+    subfolder: Optional[str] = _config(elem=ConfigElem.SUBFOLDER)
     host: Optional[str] = _config(elem=ConfigElem.HOST)
     region: Optional[str] = _config(elem=ConfigElem.REGION)
 
@@ -274,6 +277,7 @@ class PalantirConfig(Config):
 
     client_id: Optional[str] = _cred(elem=CredElem.CLIENTID)
     client_secret: Optional[str] = _cred(elem=CredElem.CLIENTSECRET)
+    o_auth_token: Optional[str] = _cred(elem=CredElem.OAUTHTOKEN)
 
 
 @attr.s(auto_attribs=True)
@@ -309,6 +313,7 @@ class S3Config(Config):
     """S3Config datasource configuration."""
 
     bucket: Optional[str] = _config(elem=ConfigElem.BUCKET)
+    subfolder: Optional[str] = _config(elem=ConfigElem.SUBFOLDER)
     region: Optional[str] = _config(elem=ConfigElem.REGION)
 
     aws_access_key_id: Optional[str] = _cred(elem=CredElem.ACCESSKEYID)

diff --git a/openapi/datasource.yaml b/openapi/datasource.yaml
@@ -213,6 +213,7 @@ components:
             - AWSIAMRoleWithUsername
             - GCPBasic
             - OAuth
+            - OAuthToken
             - ClientIdSecret
             - PersonalToken
         config:

diff --git a/poetry.lock b/poetry.lock
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-anyio==4.1.0 ; python_version >= "3.8" and python_version < "4.0"
-attrs==23.1.0 ; python_version >= "3.8" and python_version < "4.0"
+anyio==4.2.0 ; python_version >= "3.8" and python_version < "4.0"
+attrs==23.2.0 ; python_version >= "3.8" and python_version < "4.0"
 backoff==1.11.1 ; python_version >= "3.8" and python_version < "4.0"
 bson==0.5.10 ; python_version >= "3.8" and python_version < "4.0"
 certifi==2023.11.17 ; python_version >= "3.8" and python_version < "4.0"
@@ -18,5 +18,6 @@ pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "4.0"
 rfc3986[idna2008]==1.5.0 ; python_version >= "3.8" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
 sniffio==1.3.0 ; python_version >= "3.8" and python_version < "4.0"
+typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.11"
 urllib3==1.26.18 ; python_version >= "3.8" and python_version < "4.0"
 win32-setctime==1.1.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
diff --git a/scripts/gen.py b/scripts/gen.py
@@ -177,7 +177,11 @@ def main(args: Any) -> None:
     with open(args.config, encoding="ascii") as config_file:
         configs = yaml.load(config_file, Loader=yaml.FullLoader)
 
-    datasource_configs = configs["datasource_configs"]
+    datasource_configs = {
+        k: v
+        for k, v in configs["datasource_configs"].items()
+        if v.get("connectorGroup", "Native") != "ReverseProxy"
+    }
     auth_configs = configs["auth_configs"]
 
     datasource_names: Dict[str, Any] = {}
@@ -220,12 +224,12 @@ def main(args: Any) -> None:
         )
         gen.write(
             env.get_template(Configs).render(
-                datasource_configs=configs["datasource_configs"],
+                datasource_configs=datasource_configs,
                 datasource_names=datasource_names,
                 auth_names=auth_names,
             ),
         )
-        gen.write(env.get_template(Storages).render(datasources=configs["datasource_configs"]))
+        gen.write(env.get_template(Storages).render(datasources=datasource_configs))
 
 
 if __name__ == "__main__":

diff --git a/services b/services