yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-19 04:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test Connection Improvements: Use patch instead of put (#10897)

Browse Source 
* Test Connection Improvements: Use patch instead of put

* Update openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowRepository.java

Co-authored-by: Nahuel <nahuel@getcollate.io>

---------

Co-authored-by: Nahuel <nahuel@getcollate.io>
This commit is contained in:
Mayur Singal 2023-04-04 19:45:51 +05:30 committed by GitHub
parent 6cf357ed2a
commit 5bd476da23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ingestion/src/metadata/ingestion/connections/test_connections.py
View File

@ -105,7 +105,7 @@ def _test_connection_steps(
def _test_connection_steps_automation_workflow(
metadata: OpenMetadata,
steps: List[TestConnectionStep],
automation_workflow: Optional[AutomationWorkflow],
automation_workflow: AutomationWorkflow,
) -> None:
"""
Run the test connection as part of the automation workflow
@ -137,15 +137,9 @@ def _test_connection_steps_automation_workflow(
)
test_connection_result.lastUpdatedAt = datetime.now().timestamp()
updated_workflow = CreateWorkflowRequest(
name=automation_workflow.name,
description=automation_workflow.description,
workflowType=automation_workflow.workflowType,
request=automation_workflow.request,
response=test_connection_result,
status=WorkflowStatus.Running,
metadata.patch_automation_workflow_response(
automation_workflow, test_connection_result, WorkflowStatus.Running
)
metadata.create_or_update(updated_workflow)
test_connection_result.lastUpdatedAt = datetime.now().timestamp()
@ -155,15 +149,8 @@ def _test_connection_steps_automation_workflow(
else StatusType.Successful
)
metadata.create_or_update(
CreateWorkflowRequest(
name=automation_workflow.name,
description=automation_workflow.description,
workflowType=automation_workflow.workflowType,
request=automation_workflow.request,
response=test_connection_result,
status=WorkflowStatus.Successful,
)
metadata.patch_automation_workflow_response(
automation_workflow, test_connection_result, WorkflowStatus.Successful
)
except Exception as err:

44
ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py
View File

@ -19,7 +19,14 @@ from typing import Dict, List, Optional, Type, TypeVar, Union
from pydantic import BaseModel
from metadata.generated.schema.entity.automations.workflow import (
Workflow as AutomationWorkflow,
)
from metadata.generated.schema.entity.automations.workflow import WorkflowStatus
from metadata.generated.schema.entity.data.table import Table, TableConstraint
from metadata.generated.schema.entity.services.connections.testConnectionResult import (
TestConnectionResult,
)
from metadata.generated.schema.type import basic
from metadata.generated.schema.type.entityReference import EntityReference
from metadata.generated.schema.type.tagLabel import LabelType, State, TagSource
@ -462,3 +469,40 @@ class OMetaPatchMixin(OMetaPatchMixinBase):
)
return None
def patch_automation_workflow_response(
self,
automation_workflow: AutomationWorkflow,
test_connection_result: TestConnectionResult,
workflow_status: WorkflowStatus,
) -> None:
"""
Given an AutomationWorkflow, JSON PATCH the status and response.
"""
result_data: Dict = {
PatchField.PATH: PatchPath.RESPONSE,
PatchField.VALUE: test_connection_result.dict(),
PatchField.OPERATION: PatchOperation.ADD,
}
# for deserializing into json convert enum object to string
result_data[PatchField.VALUE]["status"] = result_data[PatchField.VALUE][
"status"
].value
status_data: Dict = {
PatchField.PATH: PatchPath.STATUS,
PatchField.OPERATION: PatchOperation.ADD,
PatchField.VALUE: workflow_status.value,
}
try:
self.client.patch(
path=f"{self.get_suffix(AutomationWorkflow)}/{model_str(automation_workflow.id)}",
data=json.dumps([result_data, status_data]),
)
except Exception as exc:
logger.debug(traceback.format_exc())
logger.error(
f"Error trying to PATCH status for automation workflow [{model_str(automation_workflow)}]: {exc}"
)

2
ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin_utils.py
View File

@ -80,6 +80,8 @@ class PatchPath(str, Enum):
SYNONYMS = "/synonyms/{index}"
TABLE_CONSTRAINTS = "/tableConstraints"
TAGS = "/tags/{tag_index}"
RESPONSE = "/response"
STATUS = "/status"
class PatchValue(str, Enum):

2
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowRepository.java
View File

@ -15,7 +15,7 @@ import org.openmetadata.service.util.EntityUtil;
public class WorkflowRepository extends EntityRepository<Workflow> {
private static final String UPDATE_FIELDS = "owner";
private static final String PATCH_FIELDS = "owner";
private static final String PATCH_FIELDS = "owner,status,response";
public WorkflowRepository(CollectionDAO dao) {
super(