From 49fceb4674c26f7da6754e0b2626568d8ccdf33e Mon Sep 17 00:00:00 2001 From: Ethan <63649819+kuma0128@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:02:41 +0900 Subject: [PATCH] Fixes #18104 : change parse_obj and assertEquals which was deprecated (#18105) * change deprecationwarning * fix format python * fix replace module * change : java function name --- .../source/database/datalake/clients/gcs.py | 10 ++++++---- .../ingestion/source/database/datalake/metadata.py | 2 +- .../ingestion/source/storage/gcs/metadata.py | 4 ++-- .../ometa/test_ometa_custom_properties_api.py | 12 +++++------- .../unit/data_quality/source/test_test_suite.py | 2 +- .../tests/unit/topology/database/test_athena.py | 2 +- .../tests/unit/topology/test_context_manager.py | 12 ++++++------ .../v1.4.x/deployment/upgrade/versions/130-to-140.md | 4 ++-- .../v1.5.x/deployment/upgrade/versions/130-to-140.md | 4 ++-- .../deployment/upgrade/versions/130-to-140.md | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ingestion/src/metadata/ingestion/source/database/datalake/clients/gcs.py b/ingestion/src/metadata/ingestion/source/database/datalake/clients/gcs.py index be717dbfdc3..8b29ae407be 100644 --- a/ingestion/src/metadata/ingestion/source/database/datalake/clients/gcs.py +++ b/ingestion/src/metadata/ingestion/source/database/datalake/clients/gcs.py @@ -49,8 +49,10 @@ class DatalakeGcsClient(DatalakeBaseClient): if hasattr(config.securityConfig, "gcpConfig") and isinstance( config.securityConfig.gcpConfig.projectId, MultipleProjectId ): - gcs_config.securityConfig.gcpConfig.projectId = SingleProjectId.parse_obj( - gcs_config.securityConfig.gcpConfig.projectId.root[0] + gcs_config.securityConfig.gcpConfig.projectId = ( + SingleProjectId.model_validate( + gcs_config.securityConfig.gcpConfig.projectId.root[0] + ) ) if not gcs_config.securityConfig: @@ -89,8 +91,8 @@ class DatalakeGcsClient(DatalakeBaseClient): gcs_config = deepcopy(config) if hasattr(gcs_config.securityConfig, "gcpConfig"): - gcs_config.securityConfig.gcpConfig.projectId = SingleProjectId.parse_obj( - database_name + gcs_config.securityConfig.gcpConfig.projectId = ( + SingleProjectId.model_validate(database_name) ) self._client = self.get_gcs_client(gcs_config) diff --git a/ingestion/src/metadata/ingestion/source/database/datalake/metadata.py b/ingestion/src/metadata/ingestion/source/database/datalake/metadata.py index 1d60a896314..ee4516fad31 100644 --- a/ingestion/src/metadata/ingestion/source/database/datalake/metadata.py +++ b/ingestion/src/metadata/ingestion/source/database/datalake/metadata.py @@ -240,7 +240,7 @@ class DatalakeSource(DatabaseServiceSource): verbose=False, ) content = json.loads(metadata_config_response) - metadata_entry = StorageContainerConfig.parse_obj(content) + metadata_entry = StorageContainerConfig.model_validate(content) except ReadException: metadata_entry = None if self.source_config.includeTables: diff --git a/ingestion/src/metadata/ingestion/source/storage/gcs/metadata.py b/ingestion/src/metadata/ingestion/source/storage/gcs/metadata.py index 095a8987636..c245172053c 100644 --- a/ingestion/src/metadata/ingestion/source/storage/gcs/metadata.py +++ b/ingestion/src/metadata/ingestion/source/storage/gcs/metadata.py @@ -87,7 +87,7 @@ class GcsSource(StorageServiceSource): def create( cls, config_dict, metadata: OpenMetadata, pipeline_name: Optional[str] = None ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) connection: GcsConnection = config.serviceConnection.root.config if not isinstance(connection, GcsConnection): raise InvalidSourceException( @@ -451,7 +451,7 @@ class GcsSource(StorageServiceSource): verbose=False, ) content = json.loads(response_object) - metadata_config = StorageContainerConfig.parse_obj(content) + metadata_config = StorageContainerConfig.model_validate(content) return metadata_config except ReadException: logger.warning( diff --git a/ingestion/tests/integration/ometa/test_ometa_custom_properties_api.py b/ingestion/tests/integration/ometa/test_ometa_custom_properties_api.py index f08a7bbafa8..960a15adae9 100644 --- a/ingestion/tests/integration/ometa/test_ometa_custom_properties_api.py +++ b/ingestion/tests/integration/ometa/test_ometa_custom_properties_api.py @@ -333,24 +333,22 @@ class OMetaCustomAttributeTest(TestCase): for custom_property in custom_properties: if expected_custom_property["name"] == custom_property["name"]: actual_custom_properties.append(custom_property) - self.assertEquals( + self.assertEqual( custom_property["name"], expected_custom_property["name"] ) - self.assertEquals( + self.assertEqual( custom_property["description"], expected_custom_property["description"], ) - self.assertEquals( + self.assertEqual( custom_property.get("customPropertyConfig"), expected_custom_property.get("customPropertyConfig"), ) - self.assertEquals( + self.assertEqual( custom_property["propertyType"]["name"], expected_custom_property["propertyType"]["name"], ) - self.assertEquals( - len(actual_custom_properties), len(EXPECTED_CUSTOM_PROPERTIES) - ) + self.assertEqual(len(actual_custom_properties), len(EXPECTED_CUSTOM_PROPERTIES)) def test_add_custom_property_table(self): """ diff --git a/ingestion/tests/unit/data_quality/source/test_test_suite.py b/ingestion/tests/unit/data_quality/source/test_test_suite.py index 822f125a846..9359a6e3b1e 100644 --- a/ingestion/tests/unit/data_quality/source/test_test_suite.py +++ b/ingestion/tests/unit/data_quality/source/test_test_suite.py @@ -102,7 +102,7 @@ def test_source_config(parameters, expected, monkeypatch): ) source = TestSuiteSource( - OpenMetadataWorkflowConfig.parse_obj(workflow_config), mock_metadata + OpenMetadataWorkflowConfig.model_validate(workflow_config), mock_metadata ) test_cases = list(source._iter())[0].right.test_cases assert [t.name.root for t in test_cases] == expected diff --git a/ingestion/tests/unit/topology/database/test_athena.py b/ingestion/tests/unit/topology/database/test_athena.py index 506d1ca2804..04447362619 100644 --- a/ingestion/tests/unit/topology/database/test_athena.py +++ b/ingestion/tests/unit/topology/database/test_athena.py @@ -284,7 +284,7 @@ class TestAthenaService(unittest.TestCase): def __init__(self, methodName, test_connection) -> None: super().__init__(methodName) test_connection.return_value = False - self.config = OpenMetadataWorkflowConfig.parse_obj(mock_athena_config) + self.config = OpenMetadataWorkflowConfig.model_validate(mock_athena_config) self.athena_source = AthenaSource.create( mock_athena_config["source"], self.config.workflowConfig.openMetadataServerConfig, diff --git a/ingestion/tests/unit/topology/test_context_manager.py b/ingestion/tests/unit/topology/test_context_manager.py index a7079fdd34b..da74bd7ca20 100644 --- a/ingestion/tests/unit/topology/test_context_manager.py +++ b/ingestion/tests/unit/topology/test_context_manager.py @@ -37,7 +37,7 @@ class TopologyContextManagerTest(TestCase): def test_main_thread_is_set_correctly(self): """Asserts self.main_thread is set accordingly.""" - self.assertEquals(self.manager.main_thread, MAIN_THREAD) + self.assertEqual(self.manager.main_thread, MAIN_THREAD) def test_get_returns_correct_context(self): """Asserts get and get_global returns the correct context even on a different thread.""" @@ -49,8 +49,8 @@ class TopologyContextManagerTest(TestCase): self.manager.get_global().database = MOCK_DATABASE_NAME - self.assertEquals(self.manager.get().database, None) - self.assertEquals(self.manager.get_global().database, MOCK_DATABASE_NAME) + self.assertEqual(self.manager.get().database, None) + self.assertEqual(self.manager.get_global().database, MOCK_DATABASE_NAME) def test_thread_is_created_correctly(self): """Asserts copy_from copies correctly the context from parent thread.""" @@ -64,7 +64,7 @@ class TopologyContextManagerTest(TestCase): self.manager.copy_from(MAIN_THREAD) # Check we are retrieving the right thread - self.assertEquals(self.manager.get().database, MOCK_DATABASE_NAME) + self.assertEqual(self.manager.get().database, MOCK_DATABASE_NAME) def test_pop_removes_the_correct_thread(self): """Asserts pop removes the correct thread and not another one.""" @@ -72,10 +72,10 @@ class TopologyContextManagerTest(TestCase): with patch("threading.get_ident", return_value=OTHER_THREAD): self.manager.copy_from(MAIN_THREAD) - self.assertEquals( + self.assertEqual( list(self.manager.contexts.keys()), [MAIN_THREAD, OTHER_THREAD] ) self.manager.pop(OTHER_THREAD) - self.assertEquals(list(self.manager.contexts.keys()), [MAIN_THREAD]) + self.assertEqual(list(self.manager.contexts.keys()), [MAIN_THREAD]) diff --git a/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/130-to-140.md b/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/130-to-140.md index 3729fb52b73..d7e3542a842 100644 --- a/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/130-to-140.md +++ b/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/130-to-140.md @@ -64,7 +64,7 @@ def create( config_dict: dict, metadata_config: OpenMetadataConnection ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) ..... ..... return cls(config, metadata_config) @@ -79,7 +79,7 @@ def create( metadata_config: OpenMetadataConnection, pipeline_name: Optional[str] = None ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) ..... ..... return cls(config, metadata_config) diff --git a/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/130-to-140.md b/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/130-to-140.md index bf68079e4c0..162e83809bc 100644 --- a/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/130-to-140.md +++ b/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/130-to-140.md @@ -65,7 +65,7 @@ def create( config_dict: dict, metadata_config: OpenMetadataConnection ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) ..... ..... return cls(config, metadata_config) @@ -80,7 +80,7 @@ def create( metadata_config: OpenMetadataConnection, pipeline_name: Optional[str] = None ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) ..... ..... return cls(config, metadata_config) diff --git a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/130-to-140.md b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/130-to-140.md index bf68079e4c0..162e83809bc 100644 --- a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/130-to-140.md +++ b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/130-to-140.md @@ -65,7 +65,7 @@ def create( config_dict: dict, metadata_config: OpenMetadataConnection ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) ..... ..... return cls(config, metadata_config) @@ -80,7 +80,7 @@ def create( metadata_config: OpenMetadataConnection, pipeline_name: Optional[str] = None ): - config: WorkflowSource = WorkflowSource.parse_obj(config_dict) + config: WorkflowSource = WorkflowSource.model_validate(config_dict) ..... ..... return cls(config, metadata_config)