Merge pull request #1208 from mokibit/reset-depends-on

Fix reset tag attribute to also reset `depends_on` parameter

podman_compose.py

@@ -1713,6 +1713,8 @@ def normalize_service(service, sub_dir=""):
     if "depends_on" in service:
         # deps should become a dictionary of dependencies
         deps = service["depends_on"]
+        if isinstance(deps, ResetTag):
+            return service
         if isinstance(deps, str):
             deps = {deps: {}}
         elif is_list(deps):

tests/integration/merge/reset_and_override_tags/reset_tag_attribute/docker-compose.reset_attribute.yaml

@@ -3,3 +3,4 @@ services:
     app:
         image: busybox
         command: !reset {}
+        depends_on: !reset null

tests/integration/merge/reset_and_override_tags/reset_tag_attribute/docker-compose.yaml

@@ -3,3 +3,5 @@ services:
     app:
         image: busybox
         command: ["/bin/busybox", "echo", "Zero"]
+        depends_on:
+            - db

tests/integration/merge/reset_and_override_tags/reset_tag_attribute/test_podman_compose_reset_tag_attribute.py

@@ -53,6 +53,8 @@ class TestComposeResetTagAttribute(unittest.TestCase, RunSubprocessMixin):
                 "logs",
             ])
             self.assertEqual(output, b"")
+            # depends_on: !reset null testing: if this test works, depends_on is correctly reset.
+            # Otherwise the test would break, since "db" dependency service is not provided
         finally:
             self.run_subprocess_assert_returncode([
                 podman_compose_path(),