Add JSON format for account show and rofl machine show
#677
+210
−132
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for oasisprotocol-cli canceled.
|
matevz
force-pushed
the
matevz/feature/account-show-json
branch
2 times, most recently
from
911b53c to
1d0ac28
Compare
matevz
force-pushed
the
matevz/feature/account-show-json
branch
from
1d0ac28 to
caa5bd3
Compare
matevz
changed the title
oasis account showaccount show and rofl machine show
ptrus
approved these changes
Jan 20, 2026
| cobra.CheckErr("Machine instance not found.\nTip: This often happens when instances expire. Run `oasis rofl deploy --replace-machine` to rent a new one.") | ||
| switch common.OutputFormat() { | ||
| case common.FormatJSON: | ||
| fmt.Printf("{ \"error\": \"%s\" }\n", err) |
Member
There was a problem hiding this comment.
cobra.CheckErr in the other case also exits the program, while this one doesn't?
peternose
approved these changes
Jan 21, 2026
| cfg := cliConfig.Global() | ||
| npa := common.GetNPASelection(cfg) | ||
|
|
||
| out := accountShowOutput{} |
Contributor
There was a problem hiding this comment.
Suggested change
| out := accountShowOutput{} | |
| var out accountShowOutput |
This is prefered way for zero values.
|
|
||
| if name := common.FindAccountName(nativeAddr.String()); name != "" { | ||
| fmt.Printf("Name: %s\n", name) | ||
| out.Name = name |
Contributor
There was a problem hiding this comment.
You can remove if as "" is zero value for Name'
| if showDelegations { | ||
| outgoingDelegations, err = c.Consensus().Staking().DelegationInfosFor(ctx, ownerQuery) | ||
| cobra.CheckErr(err) | ||
| out.OutgoingDelegations = outgoingDelegations |
Contributor
There was a problem hiding this comment.
The following lines can be removed.
var (
outgoingDelegations map[staking.Address]*staking.DelegationInfo
outgoingDebondingDelegations map[staking.Address][]*staking.DebondingDelegationInfo
)
cmd/rofl/machine/show.go
Outdated
| paidUntil := time.Unix(int64(insDsc.PaidUntil), 0) | ||
| expired := !time.Now().Before(paidUntil) | ||
|
|
||
| if common.OutputFormat() == common.FormatJSON { |
Contributor
There was a problem hiding this comment.
It would be nice to move code after if to a function for printing in text format, like is done for account show.
matevz
force-pushed
the
matevz/feature/account-show-json
branch
from
6a6f8a5 to
65a8648
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes it possible to use the Oasis CLI for automation.