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

DXCDT-325: Prevent erroneous truncation message with --json flag #607

Merged
merged 2 commits into from
Jan 13, 2023
Merged

DXCDT-325: Prevent erroneous truncation message with --json flag #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ae591
Prevent showing specific message if JSON flag is passed
willvedd Jan 12, 2023
10e1fe8
Merge branch 'v1' into DXCDT-325-erroneous-truncation-message-json
willvedd Jan 13, 2023
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
2 changes: 1 addition & 1 deletion internal/cli/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func showApiCmd(cli *cli) *cobra.Command {
return fmt.Errorf("Unable to get an API with Id '%s': %w", inputs.ID, err)
}

cli.renderer.ApiShow(api)
cli.renderer.ApiShow(api, cli.json)
return nil
},
}
Expand Down
4 changes: 2 additions & 2 deletions internal/display/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ func (r *Renderer) ApiList(apis []*management.ResourceServer) {
r.Results(results)
}

func (r *Renderer) ApiShow(api *management.ResourceServer) {
func (r *Renderer) ApiShow(api *management.ResourceServer, jsonFlag bool) {
r.Heading("api")
view, scopesTruncated := makeApiView(api)
r.Result(view)
if scopesTruncated {
if scopesTruncated && !jsonFlag {
r.Newline()
r.Infof("Scopes truncated for display. To see the full list, run %s", ansi.Faint(fmt.Sprintf("apis scopes list %s", *api.ID)))
}
Expand Down