Skip to content
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

Jump to bottom

vdk-control-cli: Make list command print all jobs on empty team param #709

Merged
merged 5 commits into from
Feb 17, 2022
Merged

vdk-control-cli: Make list command print all jobs on empty team param #709

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca4fa26
vdk-control-cli: Make list command print all jobs on empty team param
gageorgiev Feb 16, 2022
394b06b
added test
gageorgiev Feb 16, 2022
3e34c38
fixed test
gageorgiev Feb 17, 2022
c6070f3
fix vdk_command_line hook comment
gageorgiev Feb 17, 2022
0ae6e5b
Merge branch 'main' into person/gageorgiev/simple-things
gageorgiev Feb 17, 2022
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
3 changes: 1 addition & 2 deletions projects/vdk-control-cli/src/vdk/internal/control/command_groups/job/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ class FilterOperation(Enum):
type=click.STRING,
default=load_default_team_name(),
cls=NotRequiredIfAllOperationExists,
required=True,
prompt="Job Team",
help="The name of the team that Data Jobs belong to in the searched list."
" Not required if (-a,--all) option is provided.",
)
Expand Down Expand Up @@ -237,6 +235,7 @@ def list_command(
cmd = JobList(rest_api_url)
if team is None:
team = "no-team-specified"
operation_all = FilterOperation.ALL.value
cmd.list_jobs(
team, (operation_all == FilterOperation.ALL.value), more_details, output
)
Expand Down
4 changes: 2 additions & 2 deletions projects/vdk-control-cli/src/vdk/internal/control/command_groups/logout_group/logout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@


@click.command(
short_help="Logout the user from the Data Jobs Service.",
help="Logout the user from the Data Jobs Service by deleting their refresh token stored locally.",
short_help="Logout the user from the Control Service.",
help="Logout the user from the Control Service by deleting their refresh token stored locally.",
)
def logout():
conf = VDKConfigFolder()
Expand Down
12 changes: 12 additions & 0 deletions projects/vdk-control-cli/tests/vdk/internal/control/command_groups/job/test_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@ def test_list_all(httpserver: PluginHTTPServer, tmpdir: LocalPath):
"test-job" in result.output
), f"expected data not found in output: {result.output} "

httpserver.expect_request(
uri="/data-jobs/for-team/no-team-specified/jobs",
).respond_with_json(response)

result = runner.invoke(list_command, ["-u", rest_api_url])
assert (
result.exit_code == 0
), f"result exit code is not 0, result output: {result.output}, exc: {result.exc_info}"
assert (
"test-job" in result.output
), f"expected data not found in output: {result.output} "


def test_list_without_url(httpserver: PluginHTTPServer, tmpdir: LocalPath):
runner = CliRunner()
Expand Down
5 changes: 3 additions & 2 deletions ...lugins/vdk-plugin-control-cli/src/vdk/plugin/control_cli_plugin/vdk_plugin_control_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
from vdk.plugin.control_cli_plugin import control_service_configuration


@hookimpl
@hookimpl(
tryfirst=True
) # hook will be tried first so any hooks which decorate these commands will be able to function
gageorgiev marked this conversation as resolved.
Show resolved Hide resolved
def vdk_command_line(root_command: click.Group):
root_command.add_command(login)
root_command.add_command(logout)
Expand All @@ -50,7 +52,6 @@ def vdk_command_line(root_command: click.Group):

@hookimpl(tryfirst=True)
def vdk_configure(config_builder: ConfigurationBuilder) -> None:
""""""
control_service_configuration.add_definitions(config_builder)


Expand Down