Skip to content

Revert Dataform workflow invocation dict normalization (#69161) #70395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahar1 wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −24
Open

Revert Dataform workflow invocation dict normalization (#69161) #70395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions providers/google/src/airflow/providers/google/cloud/hooks/dataform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ def create_workflow_invocation(
"""
client = self.get_dataform_client()
parent = f"projects/{project_id}/locations/{region}/repositories/{repository_id}"
if isinstance(workflow_invocation, dict):
workflow_invocation = WorkflowInvocation(workflow_invocation)
return client.create_workflow_invocation(
request={"parent": parent, "workflow_invocation": workflow_invocation},
retry=retry,
Expand Down
23 changes: 1 addition & 22 deletions providers/google/tests/unit/google/cloud/hooks/test_dataform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@
f"{REPOSITORY_ID}/compilationResults/{COMPILATION_RESULT_ID}"
),
}
FULL_REFRESH_WORKFLOW_INVOCATION = {
**WORKFLOW_INVOCATION,
"invocation_config": {
"fully_refresh_incremental_tables_enabled": True,
},
}
WORKFLOW_INVOCATION_ID = "test_workflow_invocation_id"
PATH_TO_FOLDER = "path/to/folder"
FILEPATH = "path/to/file.txt"
Expand Down Expand Up @@ -119,27 +113,12 @@ def test_create_workflow_invocation(self, mock_client):
)
parent = f"projects/{PROJECT_ID}/locations/{REGION}/repositories/{REPOSITORY_ID}"
mock_client.return_value.create_workflow_invocation.assert_called_once_with(
request=dict(parent=parent, workflow_invocation=WorkflowInvocation(WORKFLOW_INVOCATION)),
request=dict(parent=parent, workflow_invocation=WORKFLOW_INVOCATION),
retry=DEFAULT,
timeout=None,
metadata=(),
)

@mock.patch(DATAFORM_STRING.format("DataformHook.get_dataform_client"))
def test_create_workflow_invocation_preserves_invocation_config_from_dict(self, mock_client):
self.hook.create_workflow_invocation(
project_id=PROJECT_ID,
region=REGION,
repository_id=REPOSITORY_ID,
workflow_invocation=FULL_REFRESH_WORKFLOW_INVOCATION,
)

request = mock_client.return_value.create_workflow_invocation.call_args.kwargs["request"]
workflow_invocation = request["workflow_invocation"]
assert isinstance(workflow_invocation, WorkflowInvocation)
assert workflow_invocation.compilation_result == WORKFLOW_INVOCATION["compilation_result"]
assert workflow_invocation.invocation_config.fully_refresh_incremental_tables_enabled is True

@mock.patch(DATAFORM_STRING.format("DataformHook.get_dataform_client"))
def test_get_workflow_invocation(self, mock_client):
self.hook.get_workflow_invocation(
Expand Down