Skip to content

DockerSwarmOperator: Use inspect_service() instead of inspect_container() #56043

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

Merged
jason810496 merged 4 commits into from
Sep 27, 2025
Merged

DockerSwarmOperator: Use inspect_service() instead of inspect_container() #56043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0502846
use inspect_service() instead of inspect_container()
Sep 24, 2025
59bb199
Merge branch 'main' into main
sealmove Sep 24, 2025
f2b7934
fix tests
Sep 25, 2025
3f1e4c0
fix formatting
Sep 27, 2025
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
5 changes: 2 additions & 3 deletions providers/docker/src/airflow/providers/docker/operators/docker_swarm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,8 @@ def _run_service(self) -> None:
if self.service and self._service_status() == "complete":
self.tasks = self.cli.tasks(filters={"service": self.service["ID"]})
for task in self.tasks:
container_id = task["Status"]["ContainerStatus"]["ContainerID"]
container = self.cli.inspect_container(container_id)
self.containers.append(container)
docker_service = self.cli.inspect_service(task["ServiceID"])
self.containers.append(docker_service)

if self.retrieve_output:
return self._attempt_to_retrieve_results()
Expand Down
28 changes: 8 additions & 20 deletions providers/docker/tests/unit/docker/operators/test_docker_swarm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ def test_execute(self, types_mock, docker_api_client_patcher, caplog):

def _client_tasks_side_effect():
for _ in range(2):
yield [{"Status": {"State": "pending"}}]
yield [{"ServiceID": "some_id", "Status": {"State": "pending"}}]
while True:
yield [{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}]
yield [{"ServiceID": "some_id", "Status": {"State": "complete"}}]

def _client_service_logs_effect():
service_logs = [
Expand Down Expand Up @@ -138,9 +138,7 @@ def test_auto_remove(self, types_mock, docker_api_client_patcher, auto_remove):
client_mock.create_service.return_value = {"ID": "some_id"}
client_mock.images.return_value = []
client_mock.pull.return_value = [b'{"status":"pull log"}']
client_mock.tasks.return_value = [
{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}
]
client_mock.tasks.return_value = [{"ServiceID": "some_id", "Status": {"State": "complete"}}]
types_mock.TaskTemplate.return_value = mock_obj
types_mock.ContainerSpec.return_value = mock_obj
types_mock.RestartPolicy.return_value = mock_obj
Expand Down Expand Up @@ -194,9 +192,7 @@ def test_no_auto_remove(self, types_mock, docker_api_client_patcher):
client_mock.create_service.return_value = {"ID": "some_id"}
client_mock.images.return_value = []
client_mock.pull.return_value = [b'{"status":"pull log"}']
client_mock.tasks.return_value = [
{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}
]
client_mock.tasks.return_value = [{"ServiceID": "some_id", "Status": {"State": "complete"}}]
types_mock.TaskTemplate.return_value = mock_obj
types_mock.ContainerSpec.return_value = mock_obj
types_mock.RestartPolicy.return_value = mock_obj
Expand Down Expand Up @@ -272,9 +268,7 @@ def test_container_resources(self, types_mock, docker_api_client_patcher):
client_mock.create_service.return_value = {"ID": "some_id"}
client_mock.images.return_value = []
client_mock.pull.return_value = [b'{"status":"pull log"}']
client_mock.tasks.return_value = [
{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}
]
client_mock.tasks.return_value = [{"ServiceID": "some_id", "Status": {"State": "complete"}}]
types_mock.TaskTemplate.return_value = mock_obj
types_mock.ContainerSpec.return_value = mock_obj
types_mock.RestartPolicy.return_value = mock_obj
Expand Down Expand Up @@ -322,9 +316,7 @@ def test_service_args_str(self, types_mock, docker_api_client_patcher):
client_mock.create_service.return_value = {"ID": "some_id"}
client_mock.images.return_value = []
client_mock.pull.return_value = [b'{"status":"pull log"}']
client_mock.tasks.return_value = [
{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}
]
client_mock.tasks.return_value = [{"ServiceID": "some_id", "Status": {"State": "complete"}}]
types_mock.TaskTemplate.return_value = mock_obj
types_mock.ContainerSpec.return_value = mock_obj
types_mock.RestartPolicy.return_value = mock_obj
Expand Down Expand Up @@ -362,9 +354,7 @@ def test_service_args_list(self, types_mock, docker_api_client_patcher):
client_mock.create_service.return_value = {"ID": "some_id"}
client_mock.images.return_value = []
client_mock.pull.return_value = [b'{"status":"pull log"}']
client_mock.tasks.return_value = [
{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}
]
client_mock.tasks.return_value = [{"ServiceID": "some_id", "Status": {"State": "complete"}}]
types_mock.TaskTemplate.return_value = mock_obj
types_mock.ContainerSpec.return_value = mock_obj
types_mock.RestartPolicy.return_value = mock_obj
Expand Down Expand Up @@ -456,9 +446,7 @@ def test_service_prefix(self, types_mock, docker_api_client_patcher, service_pre
client_mock.create_service.return_value = {"ID": "some_id"}
client_mock.images.return_value = []
client_mock.pull.return_value = [b'{"status":"pull log"}']
client_mock.tasks.return_value = [
{"Status": {"State": "complete", "ContainerStatus": {"ContainerID": "some_id"}}}
]
client_mock.tasks.return_value = [{"ServiceID": "some_id", "Status": {"State": "complete"}}]
types_mock.TaskTemplate.return_value = mock_obj
types_mock.ContainerSpec.return_value = mock_obj
types_mock.RestartPolicy.return_value = mock_obj
Expand Down
Loading