From a1f0c3ed7cb590789aa848a466f85f78f912282d Mon Sep 17 00:00:00 2001 From: Svyatoslav Ilinskiy Date: Tue, 9 Jan 2018 10:57:06 -0600 Subject: [PATCH] Rename `ps --filter` option from `key` to `source`. Signed-off-by: Svyatoslav Ilinskiy --- compose/cli/main.py | 10 +++++----- contrib/completion/bash/docker-compose | 4 ++-- tests/acceptance/cli_test.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compose/cli/main.py b/compose/cli/main.py index 3b6e25ccb..224e6263a 100644 --- a/compose/cli/main.py +++ b/compose/cli/main.py @@ -1349,13 +1349,13 @@ def filter_services(filt, services, project): containers = project.containers([service.name], stopped=True) if not has_container_with_state(containers, state): return False - elif f == 'key': - key = filt[f] - if key == 'image' or key == 'build': - if key not in service.options: + elif f == 'source': + source = filt[f] + if source == 'image' or source == 'build': + if source not in service.options: return False else: - raise UserError("Invalid value for key filter: %s" % key) + raise UserError("Invalid value for source filter: %s" % source) else: raise UserError("Invalid filter: %s" % f) return True diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose index 248ff9285..bbc08e583 100644 --- a/contrib/completion/bash/docker-compose +++ b/contrib/completion/bash/docker-compose @@ -66,12 +66,12 @@ __docker_compose_services_all() { # All services that are defined by a Dockerfile reference __docker_compose_services_from_build() { - COMPREPLY=( $(compgen -W "$(__docker_compose_q ps --services --filter "key=build")" -- "$cur") ) + COMPREPLY=( $(compgen -W "$(__docker_compose_q ps --services --filter "source=build")" -- "$cur") ) } # All services that are defined by an image __docker_compose_services_from_image() { - COMPREPLY=( $(compgen -W "$(__docker_compose_q ps --services --filter "key=image")" -- "$cur") ) + COMPREPLY=( $(compgen -W "$(__docker_compose_q ps --services --filter "source=image")" -- "$cur") ) } # The services for which at least one paused container exists diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index c6240419f..7622380a1 100644 --- a/tests/acceptance/cli_test.py +++ b/tests/acceptance/cli_test.py @@ -469,8 +469,8 @@ class CLITestCase(DockerClientTestCase): def test_ps_services_filter_option(self): self.base_dir = 'tests/fixtures/ps-services-filter' - image = self.dispatch(['ps', '--services', '--filter', 'key=image']) - build = self.dispatch(['ps', '--services', '--filter', 'key=build']) + image = self.dispatch(['ps', '--services', '--filter', 'source=image']) + build = self.dispatch(['ps', '--services', '--filter', 'source=build']) all_services = self.dispatch(['ps', '--services']) assert 'with_build' in all_services.stdout