Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions internal/cmd/load-balancer/describe/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
`Get details of a load balancer with name "my-load-balancer"`,
"$ stackit load-balancer describe my-load-balancer"),
examples.NewExample(
`Get details of a load-balancer with name "my-load-balancer" in a table format`,
"$ stackit load-balancer describe my-load-balancer --output-format pretty"),
`Get details of a load-balancer with name "my-load-balancer" in a JSON format`,
"$ stackit load-balancer describe my-load-balancer --output-format json"),
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
Expand Down Expand Up @@ -97,16 +97,16 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalance

func outputResult(p *print.Printer, outputFormat string, loadBalancer *loadbalancer.LoadBalancer) error {
switch outputFormat {
case print.PrettyOutputFormat:
return outputResultAsTable(p, loadBalancer)
default:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(loadBalancer, "", " ")
if err != nil {
return fmt.Errorf("marshal load balancer: %w", err)
}
p.Outputln(string(details))

return nil
default:
return outputResultAsTable(p, loadBalancer)
}
}

Expand Down
18 changes: 9 additions & 9 deletions internal/cmd/load-balancer/observability-credentials/add/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,23 @@ func NewCmd(p *print.Printer) *cobra.Command {
projectLabel = model.ProjectId
}

if !model.AssumeYes {
prompt := fmt.Sprintf("Are you sure you want to add observability credentials for Load Balancer on project %q?", projectLabel)
err = p.PromptForConfirmation(prompt)
if err != nil {
return err
}
}

// Prompt for password if not passed in as a flag
if model.Password == nil {
pwd, err := p.PromptForPassword("Enter password: ")
pwd, err := p.PromptForPassword("Enter user password: ")
if err != nil {
return fmt.Errorf("prompt for password: %w", err)
}
model.Password = utils.Ptr(pwd)
}

if !model.AssumeYes {
prompt := fmt.Sprintf("Are you sure you want to add observability credentials for Load Balancer on project %q?", projectLabel)
err = p.PromptForConfirmation(prompt)
if err != nil {
return err
}
}

// Call API
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,15 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalance

func outputResult(p *print.Printer, outputFormat string, credentials *loadbalancer.GetCredentialsResponse) error {
switch outputFormat {
case print.PrettyOutputFormat:
case print.JSONOutputFormat:
details, err := json.MarshalIndent(credentials, "", " ")
if err != nil {
return fmt.Errorf("marshal Load Balancer observability credentials: %w", err)
}
p.Outputln(string(details))

return nil
default:
table := tables.NewTable()
table.AddRow("REFERENCE", *credentials.Credential.CredentialsRef)
table.AddSeparator()
Expand All @@ -108,14 +116,6 @@ func outputResult(p *print.Printer, outputFormat string, credentials *loadbalanc
return fmt.Errorf("render table: %w", err)
}

return nil
default:
details, err := json.MarshalIndent(credentials, "", " ")
if err != nil {
return fmt.Errorf("marshal Load Balancer observability credentials: %w", err)
}
p.Outputln(string(details))

return nil
}
}