Skip to content

Output format none #234

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

Merged
vicentepinto98 merged 3 commits into from
Apr 22, 2024
Merged

Output format none #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c6f2cb
Output format none
vicentepinto98 Apr 22, 2024
db3de2a
Add unit test, move const to print pkg
vicentepinto98 Apr 22, 2024
fb850d3
Switch usage of const
vicentepinto98 Apr 22, 2024
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/cmd/argus/grafana/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func buildGetInstanceRequest(ctx context.Context, model *inputModel, apiClient *

func outputResult(p *print.Printer, inputModel *inputModel, grafanaConfigs *argus.GrafanaConfigs, instance *argus.GetInstanceResponse) error {
switch inputModel.OutputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
initialAdminPassword := *instance.Instance.GrafanaAdminPassword
if inputModel.HidePassword {
initialAdminPassword = "<hidden>"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *argus.APICl

func outputResult(p *print.Printer, outputFormat string, instance *argus.GetInstanceResponse) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:

table := tables.NewTable()
table.AddRow("ID", *instance.Id)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *argus.APICl

func outputResult(p *print.Printer, outputFormat string, instances []argus.ProjectInstanceFull) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(instances, "", " ")
if err != nil {
return fmt.Errorf("marshal Argus instance list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/plans/plans.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *argus.APICl

func outputResult(p *print.Printer, outputFormat string, plans []argus.Plan) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(plans, "", " ")
if err != nil {
return fmt.Errorf("marshal Argus plans: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/dns/record-set/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *dns.APIClie

func outputResult(p *print.Printer, outputFormat string, recordSet *dns.RecordSet) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
recordsData := make([]string, 0, len(*recordSet.Records))
for _, r := range *recordSet.Records {
recordsData = append(recordsData, *r.Content)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/dns/record-set/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func fetchRecordSets(ctx context.Context, model *inputModel, apiClient dnsClient

func outputResult(p *print.Printer, outputFormat string, recordSets []dns.RecordSet) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(recordSets, "", " ")
if err != nil {
return fmt.Errorf("marshal DNS record set list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/dns/zone/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *dns.APIClie

func outputResult(p *print.Printer, outputFormat string, zone *dns.Zone) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *zone.Id)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/dns/zone/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func fetchZones(ctx context.Context, model *inputModel, apiClient dnsClient) ([]

func outputResult(p *print.Printer, outputFormat string, zones []dns.Zone) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
// Show details
details, err := json.MarshalIndent(zones, "", " ")
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/logme/credentials/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APICl

func outputResult(p *print.Printer, outputFormat string, credentials *logme.CredentialsResponse) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *credentials.Id)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/logme/credentials/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APICl

func outputResult(p *print.Printer, outputFormat string, credentials []logme.CredentialsListItem) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(credentials, "", " ")
if err != nil {
return fmt.Errorf("marshal LogMe credentials list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/logme/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APICl

func outputResult(p *print.Printer, outputFormat string, instance *logme.Instance) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *instance.InstanceId)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/logme/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APICl

func outputResult(p *print.Printer, outputFormat string, instances []logme.Instance) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(instances, "", " ")
if err != nil {
return fmt.Errorf("marshal LogMe instance list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/logme/plans/plans.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APICl

func outputResult(p *print.Printer, outputFormat string, plans []logme.Offering) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(plans, "", " ")
if err != nil {
return fmt.Errorf("marshal LogMe plans: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mariadb/credentials/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mariadb.API

func outputResult(p *print.Printer, outputFormat string, credentials *mariadb.CredentialsResponse) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *credentials.Id)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mariadb/credentials/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mariadb.API

func outputResult(p *print.Printer, outputFormat string, credentials []mariadb.CredentialsListItem) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(credentials, "", " ")
if err != nil {
return fmt.Errorf("marshal MariaDB credentials list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mariadb/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mariadb.API

func outputResult(p *print.Printer, outputFormat string, instance *mariadb.Instance) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *instance.InstanceId)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mariadb/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mariadb.API

func outputResult(p *print.Printer, outputFormat string, instances []mariadb.Instance) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(instances, "", " ")
if err != nil {
return fmt.Errorf("marshal MariaDB instance list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mariadb/plans/plans.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mariadb.API

func outputResult(p *print.Printer, outputFormat string, plans []mariadb.Offering) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(plans, "", " ")
if err != nil {
return fmt.Errorf("marshal MariaDB plans: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mongodbflex/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mongodbflex

func outputResult(p *print.Printer, outputFormat string, instance *mongodbflex.Instance) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
aclsArray := *instance.Acl.Items
acls := strings.Join(aclsArray, ",")

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mongodbflex/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mongodbflex

func outputResult(p *print.Printer, outputFormat string, instances []mongodbflex.InstanceListInstance) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(instances, "", " ")
if err != nil {
return fmt.Errorf("marshal MongoDB Flex instance list: %w", err)
Expand Down
5 changes: 2 additions & 3 deletions internal/cmd/mongodbflex/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/pager"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/mongodbflex/client"
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
Expand Down Expand Up @@ -174,7 +173,7 @@ func outputResult(p *print.Printer, model *inputModel, flavors *mongodbflex.List
}

switch model.OutputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(options, "", " ")
if err != nil {
return fmt.Errorf("marshal MongoDB Flex options: %w", err)
Expand All @@ -198,7 +197,7 @@ func outputResultAsTable(p *print.Printer, model *inputModel, options *options)
content += renderStorages(options.Storages.Storages)
}

err := pager.Display(p, content)
err := p.PagerDisplay(content)
if err != nil {
return fmt.Errorf("display output: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mongodbflex/user/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mongodbflex

func outputResult(p *print.Printer, outputFormat string, user mongodbflex.InstanceResponseUser) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *user.Id)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/mongodbflex/user/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mongodbflex

func outputResult(p *print.Printer, outputFormat string, users []mongodbflex.ListUser) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(users, "", " ")
if err != nil {
return fmt.Errorf("marshal MongoDB Flex user list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/object-storage/bucket/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstora

func outputResult(p *print.Printer, outputFormat string, bucket *objectstorage.Bucket) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("Name", *bucket.Name)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/object-storage/bucket/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstora

func outputResult(p *print.Printer, outputFormat string, buckets []objectstorage.Bucket) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(buckets, "", " ")
if err != nil {
return fmt.Errorf("marshal Object Storage bucket list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/object-storage/credentials-group/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstora

func outputResult(p *print.Printer, outputFormat string, credentialsGroups []objectstorage.CredentialsGroup) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(credentialsGroups, "", " ")
if err != nil {
return fmt.Errorf("marshal Object Storage credentials group list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/object-storage/credentials/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *objectstora

func outputResult(p *print.Printer, outputFormat string, credentials []objectstorage.AccessKey) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(credentials, "", " ")
if err != nil {
return fmt.Errorf("marshal Object Storage credentials list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/opensearch/credentials/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *opensearch.

func outputResult(p *print.Printer, outputFormat string, credentials *opensearch.CredentialsResponse) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *credentials.Id)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/opensearch/credentials/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *opensearch.

func outputResult(p *print.Printer, outputFormat string, credentials []opensearch.CredentialsListItem) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(credentials, "", " ")
if err != nil {
return fmt.Errorf("marshal OpenSearch credentials list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/opensearch/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *opensearch.

func outputResult(p *print.Printer, outputFormat string, instance *opensearch.Instance) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *instance.InstanceId)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/opensearch/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *opensearch.

func outputResult(p *print.Printer, outputFormat string, instances []opensearch.Instance) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(instances, "", " ")
if err != nil {
return fmt.Errorf("marshal OpenSearch instance list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/opensearch/plans/plans.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *opensearch.

func outputResult(p *print.Printer, outputFormat string, plans []opensearch.Offering) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(plans, "", " ")
if err != nil {
return fmt.Errorf("marshal OpenSearch plans: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/organization/member/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func outputResult(p *print.Printer, model *inputModel, members []authorization.M
sort.SliceStable(members, sortFn)

switch model.OutputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
// Show details
details, err := json.MarshalIndent(members, "", " ")
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/organization/role/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *authorizati

func outputRolesResult(p *print.Printer, outputFormat string, roles []authorization.Role) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
// Show details
details, err := json.MarshalIndent(roles, "", " ")
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/postgresflex/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *postgresfle

func outputResult(p *print.Printer, outputFormat string, instance *postgresflex.Instance) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
aclsArray := *instance.Acl.Items
acls := strings.Join(aclsArray, ",")

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/postgresflex/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *postgresfle

func outputResult(p *print.Printer, outputFormat string, instances []postgresflex.InstanceListInstance) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(instances, "", " ")
if err != nil {
return fmt.Errorf("marshal PostgreSQL Flex instance list: %w", err)
Expand Down
5 changes: 2 additions & 3 deletions internal/cmd/postgresflex/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/pager"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/postgresflex/client"
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
Expand Down Expand Up @@ -174,7 +173,7 @@ func outputResult(p *print.Printer, model *inputModel, flavors *postgresflex.Lis
}

switch model.OutputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(options, "", " ")
if err != nil {
return fmt.Errorf("marshal PostgreSQL Flex options: %w", err)
Expand All @@ -198,7 +197,7 @@ func outputResultAsTable(p *print.Printer, model *inputModel, options *options)
content += renderStorages(options.Storages.Storages)
}

err := pager.Display(p, content)
err := p.PagerDisplay(content)
if err != nil {
return fmt.Errorf("display output: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/postgresflex/user/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *postgresfle

func outputResult(p *print.Printer, outputFormat string, user postgresflex.UserResponse) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *user.Id)
table.AddSeparator()
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/postgresflex/user/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *postgresfle

func outputResult(p *print.Printer, outputFormat string, users []postgresflex.ListUsersResponseItem) error {
switch outputFormat {
case globalflags.JSONOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(users, "", " ")
if err != nil {
return fmt.Errorf("marshal PostgreSQL Flex user list: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/project/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *resourceman

func outputResult(p *print.Printer, outputFormat string, project *resourcemanager.ProjectResponseWithParents) error {
switch outputFormat {
case globalflags.PrettyOutputFormat:
case print.PrettyOutputFormat:
table := tables.NewTable()
table.AddRow("ID", *project.ProjectId)
table.AddSeparator()
Expand Down
Loading