[DOP-30631] Improve Iceberg params naming

Author: dolfinus

syncmaster/dto/connections.py

@@ -103,7 +103,7 @@ class IcebergRESTCatalogOAuth2ClientCredentialsS3DTO(IcebergRESTCatalogS3Connect
     rest_catalog_oauth2_scopes: list[str]
     rest_catalog_oauth2_resource: str | None = None
     rest_catalog_oauth2_audience: str | None = None
-    rest_catalog_oauth2_server_uri: str | None = None
+    rest_catalog_oauth2_token_endpoint: str | None = None
     rest_catalog_auth_type: Literal["oauth2"] = "oauth2"
 
 

syncmaster/schemas/v1/auth/iceberg/oauth2_client_credentials.py

@@ -13,7 +13,7 @@ class ReadIcebergRESTCatalogOAuth2ClientCredentialsAuthSchema(BaseModel):
     rest_catalog_oauth2_scopes: list[str] = Field(default_factory=list)
     rest_catalog_oauth2_resource: str | None = None
     rest_catalog_oauth2_audience: str | None = None
-    rest_catalog_oauth2_server_uri: URL | None = None
+    rest_catalog_oauth2_token_endpoint: URL | None = None
     s3_access_key: str
 
 

syncmaster/worker/handlers/db/iceberg.py

@@ -97,7 +97,7 @@ def _make_auth(self):
                 scopes=self.connection_dto.rest_catalog_oauth2_scopes,
                 resource=self.connection_dto.rest_catalog_oauth2_resource,
                 audience=self.connection_dto.rest_catalog_oauth2_audience,
-                server_uri=self.connection_dto.rest_catalog_oauth2_server_uri,
+                oauth2_token_endpoint=self.connection_dto.rest_catalog_oauth2_token_endpoint,
             )
         return Iceberg.RESTCatalog.BasicAuth(
             user=self.connection_dto.rest_catalog_username,

tests/test_unit/test_connections/test_db_connection/test_create_iceberg_connection.py

@@ -124,7 +124,7 @@ async def test_developer_plus_can_create_iceberg_rest_s3_connection_with_oauth2_
                 "rest_catalog_oauth2_client_secret": "my_client_secret",
                 "rest_catalog_oauth2_scopes": ["catalog:read"],
                 "rest_catalog_oauth2_audience": "iceberg-catalog",
-                "rest_catalog_oauth2_server_uri": "https://oauth.example.com/token",
+                "rest_catalog_oauth2_token_endpoint": "https://oauth.example.com/token",
                 "s3_access_key": "access_key",
                 "s3_secret_key": "secret_key",
             },
@@ -172,7 +172,7 @@ async def test_developer_plus_can_create_iceberg_rest_s3_connection_with_oauth2_
             "rest_catalog_oauth2_scopes": decrypted["rest_catalog_oauth2_scopes"],
             "rest_catalog_oauth2_audience": decrypted["rest_catalog_oauth2_audience"],
             "rest_catalog_oauth2_resource": decrypted["rest_catalog_oauth2_resource"],
-            "rest_catalog_oauth2_server_uri": decrypted["rest_catalog_oauth2_server_uri"],
+            "rest_catalog_oauth2_token_endpoint": decrypted["rest_catalog_oauth2_token_endpoint"],
             "s3_access_key": decrypted["s3_access_key"],
         },
     }

tests/test_unit/test_connections/test_db_connection/test_update_iceberg_connection.py

@@ -112,8 +112,8 @@ async def test_developer_plus_can_update_iceberg_rest_s3_connection(
                 "rest_catalog_oauth2_client_secret": "my_client_secret",
                 "rest_catalog_oauth2_scopes": ["catalog:read"],
                 "rest_catalog_oauth2_audience": "iceberg-catalog",
-                "rest_catalog_oauth2_resource": None,
-                "rest_catalog_oauth2_server_uri": "https://oauth.example.com/token",
+                "rest_catalog_oauth2_resource": "some-old-resource",
+                "rest_catalog_oauth2_token_endpoint": "https://oauth.example.com/token",
                 "s3_access_key": "access_key",
                 "s3_secret_key": "secret_key",
             },
@@ -151,7 +151,7 @@ async def test_developer_plus_can_update_iceberg_rest_s3_connection_with_oauth2_
                 "rest_catalog_oauth2_scopes": ["catalog:write"],
                 "rest_catalog_oauth2_audience": "iceberg-new-catalog",
                 "rest_catalog_oauth2_resource": "iceberg-new-resource",
-                "rest_catalog_oauth2_server_uri": "https://oauth.new.example.com/token",
+                "rest_catalog_oauth2_token_endpoint": "https://oauth.new.example.com/token",
                 "s3_access_key": "new_access_key",
                 "s3_secret_key": "new_secret_key",
             },
@@ -182,7 +182,7 @@ async def test_developer_plus_can_update_iceberg_rest_s3_connection_with_oauth2_
             "rest_catalog_oauth2_scopes": ["catalog:write"],
             "rest_catalog_oauth2_audience": "iceberg-new-catalog",
             "rest_catalog_oauth2_resource": "iceberg-new-resource",
-            "rest_catalog_oauth2_server_uri": "https://oauth.new.example.com/token",
+            "rest_catalog_oauth2_token_endpoint": "https://oauth.new.example.com/token",
             "s3_access_key": "new_access_key",
         },
     }