Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Commit 3268f37

Browse files
committed
Drop more use of output mode
1 parent 79ab457 commit 3268f37

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

  • packages
    • jumpstarter-cli-common/jumpstarter_cli_common
    • jumpstarter-kubernetes/jumpstarter_kubernetes

packages/jumpstarter-cli-common/jumpstarter_cli_common/version.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import asyncclick as click
66
from pydantic import ConfigDict, Field
77

8-
from .opt import OutputMode, OutputType, opt_output_all
8+
from .echo import echo
9+
from .opt import OutputType, opt_output_auto
910
from jumpstarter.common.pydantic import SerializableBaseModel
1011

1112

@@ -39,12 +40,10 @@ def version_obj():
3940

4041

4142
@click.command()
42-
@opt_output_all
43+
@opt_output_auto(JumpstarterVersion)
4344
def version(output: OutputType):
4445
"""Get the current Jumpstarter version"""
45-
if output == OutputMode.JSON:
46-
click.echo(version_obj().dump_json())
47-
elif output == OutputMode.YAML:
48-
click.echo(version_obj().dump_yaml())
46+
if output:
47+
echo(version_obj().dump(output))
4948
else:
5049
click.echo(version_msg())

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/json.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
from pydantic import ConfigDict
22

3-
from jumpstarter.common.pydantic import OutputMode, OutputType, SerializableBaseModel
3+
from jumpstarter.common.pydantic import SerializableBaseModel
44

55

66
class JsonBaseModel(SerializableBaseModel):
77
"""A Pydantic BaseModel with additional Jumpstarter JSON options applied."""
88

9-
def dump(self, mode: OutputType = None):
10-
match mode:
11-
case OutputMode.NAME:
12-
return self.dump_name()
13-
case _:
14-
return super().dump(mode)
15-
169
def dump_name(self):
1710
return "{}.jumpstarter.dev/{}\n".format(self.kind.lower(), self.metadata.name)
1811

0 commit comments

Comments
 (0)