Skip to content

Commit

Permalink
Fix generation temp filename in DataprocSubmitPySparkJobOperator (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Taragolis authored May 8, 2024
1 parent 0be4478 commit 5abe7ac
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion airflow/providers/google/cloud/operators/dataproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,7 @@ class DataprocSubmitPySparkJobOperator(DataprocJobBaseOperator):

@staticmethod
def _generate_temp_filename(filename):
return f"{time:%Y%m%d%H%M%S}_{uuid.uuid4()!s:.8}_{ntpath.basename(filename)}"
return f"{time.strftime('%Y%m%d%H%M%S')}_{uuid.uuid4()!s:.8}_{ntpath.basename(filename)}"

def _upload_file_temp(self, bucket, local_file):
"""Upload a local file to a Google Cloud Storage bucket."""
Expand Down
20 changes: 20 additions & 0 deletions tests/providers/google/cloud/operators/test_dataproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import inspect
from unittest import mock
from unittest.mock import MagicMock, Mock, call
from uuid import UUID

import pytest
from google.api_core.exceptions import AlreadyExists, NotFound
Expand Down Expand Up @@ -2567,6 +2568,25 @@ def test_execute(self, mock_hook, mock_uuid):
job = op.generate_job()
assert self.job == job

@pytest.mark.parametrize(
"filename",
[
pytest.param("/foo/bar/baz.py", id="absolute"),
pytest.param("foo/bar/baz.py", id="relative"),
pytest.param("baz.py", id="base-filename"),
pytest.param(r"C:\foo\bar\baz.py", id="windows-path"),
],
)
def test_generate_temp_filename(self, filename, time_machine):
time_machine.move_to(datetime(2024, 2, 29, 1, 2, 3), tick=False)
with mock.patch(
DATAPROC_PATH.format("uuid.uuid4"), return_value=UUID("12345678-0000-4000-0000-000000000000")
):
assert (
DataprocSubmitPySparkJobOperator._generate_temp_filename(filename)
== "20240229010203_12345678_baz.py"
)


class TestDataprocCreateWorkflowTemplateOperator:
@mock.patch(DATAPROC_PATH.format("DataprocHook"))
Expand Down

0 comments on commit 5abe7ac

Please sign in to comment.