Skip to content

refactor: migrate to new printer package #653

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

Open
avirtopeanu-ionos wants to merge 6 commits into
base: master
Choose a base branch
from
Open

refactor: migrate to new printer package #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b978bef
refactor: migrate to new printer package
avirtopeanu-ionos Mar 9, 2026
e59e021
fix: bracket to dot
avirtopeanu-ionos Mar 13, 2026
723f641
make docs
avirtopeanu-ionos Mar 13, 2026
f859401
bump go
avirtopeanu-ionos Mar 13, 2026
def447a
test: fix tests
avirtopeanu-ionos Mar 13, 2026
853e4eb
test: fix monitoring test
avirtopeanu-ionos Mar 13, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions commands/cdn/distribution/distribution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ import (
"github.com/ionos-cloud/ionosctl/v6/commands/cdn/distribution/routingrules"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
"github.com/spf13/cobra"
)

var (
allCols = []string{"Id", "Domain", "CertificateId", "State"}
defaultCols = []string{"Id", "Domain", "CertificateId", "State"}
)
var allCols = []table.Column{
{Name: "Id", JSONPath: "id", Default: true},
{Name: "Domain", JSONPath: "properties.domain", Default: true},
{Name: "CertificateId", JSONPath: "properties.certificateId", Default: true},
{Name: "State", JSONPath: "metadata.state", Default: true},
}

func Command() *core.Command {
cmd := &core.Command{
Expand All @@ -22,9 +24,9 @@ func Command() *core.Command {
TraverseChildren: true,
},
}
cmd.Command.PersistentFlags().StringSlice(constants.ArgCols, nil, tabheaders.ColsMessage(allCols))
cmd.Command.PersistentFlags().StringSlice(constants.ArgCols, nil, table.ColsMessage(allCols))
_ = cmd.Command.RegisterFlagCompletionFunc(constants.ArgCols, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
return allCols, cobra.ShellCompDirectiveNoFileComp
return table.AllCols(allCols), cobra.ShellCompDirectiveNoFileComp
})

cmd.AddCommand(List())
Expand Down
14 changes: 2 additions & 12 deletions commands/cdn/distribution/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ package distribution

import (
"context"
"fmt"

"github.com/ionos-cloud/ionosctl/v6/commands/cdn/completer"

"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
cdn "github.com/ionos-cloud/sdk-go-bundle/products/cdn/v2"
"github.com/spf13/viper"
)
Expand Down Expand Up @@ -41,14 +38,7 @@ func FindByID() *core.Command {
}

cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)
out, err := jsontabwriter.GenerateOutput("", jsonpaths.CDNDistribution, r,
tabheaders.GetHeadersAllDefault(defaultCols, cols))
if err != nil {
return err
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, r, cols))
},
InitClient: true,
})
Expand Down
26 changes: 2 additions & 24 deletions commands/cdn/distribution/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ import (
"github.com/ionos-cloud/ionosctl/v6/commands/cdn/completer"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
"github.com/ionos-cloud/sdk-go-bundle/products/cdn/v2"

"github.com/spf13/viper"
Expand Down Expand Up @@ -38,14 +35,6 @@ func List() *core.Command {
cmd.AddStringFlag(constants.FlagCDNDistributionFilterDomain, "", "", "Filter used to fetch only the records that contain specified domain.")
cmd.AddSetFlag(constants.FlagCDNDistributionFilterState, "", "", []string{"AVAILABLE", "BUSY", "FAILED", "UNKNOWN"}, "Filter used to fetch only the records that contain specified state.")

cmd.Command.PersistentFlags().StringSlice(
constants.ArgCols, nil,
fmt.Sprintf(
"Set of columns to be printed on output \nAvailable columns: %v",
allCols,
),
)

return cmd
}

Expand All @@ -70,17 +59,6 @@ func listDistributions(c *core.CommandConfig) error {
return fmt.Errorf("could not retrieve distributions")
}

convertedItems, err := json2table.ConvertJSONToTable("", jsonpaths.CDNDistribution, items)
if err != nil {
return fmt.Errorf("could not convert from JSON to Table format: %w", err)
}

cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)
out, err := jsontabwriter.GenerateOutputPreconverted(ls, convertedItems, tabheaders.GetHeaders(allCols, defaultCols, cols))
if err != nil {
return err
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, items, cols))
}
42 changes: 20 additions & 22 deletions commands/cdn/distribution/routingrules/routing_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@ package routingrules

import (
"context"
"fmt"

"github.com/ionos-cloud/ionosctl/v6/commands/cdn/completer"
"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/sdk-go-bundle/products/cdn/v2"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
cdn "github.com/ionos-cloud/sdk-go-bundle/products/cdn/v2"

"github.com/spf13/cobra"
"github.com/spf13/viper"
)

var (
allRoutingRulesColumns = []string{"Scheme", "Prefix", "Host", "Caching", "Waf", "RateLimitClass", "SniMode", "GeoRestrictionsAllowList", "GeoRestrictionsBlockList"}
defaultRoutingRulesColumns = []string{"Scheme", "Prefix", "Host", "RateLimitClass", "SniMode"}
)
var allCols = []table.Column{
{Name: "Scheme", JSONPath: "scheme", Default: true},
{Name: "Prefix", JSONPath: "prefix", Default: true},
{Name: "Host", JSONPath: "upstream.host", Default: true},
{Name: "Caching", JSONPath: "upstream.caching"},
{Name: "Waf", JSONPath: "upstream.waf"},
{Name: "RateLimitClass", JSONPath: "upstream.rateLimitClass", Default: true},
{Name: "SniMode", JSONPath: "upstream.sniMode", Default: true},
{Name: "GeoRestrictionsAllowList", JSONPath: "upstream.geoRestrictions.allowList"},
{Name: "GeoRestrictionsBlockList", JSONPath: "upstream.geoRestrictions.blockList"},
}

func Root() *core.Command {
cmd := &core.Command{
Expand Down Expand Up @@ -64,19 +67,8 @@ func GetDistributionRoutingRules() *core.Command {
return nil
}

convertedItems, err := json2table.ConvertJSONToTable("", jsonpaths.CDNRoutingRule, r.Properties.RoutingRules)
if err != nil {
return fmt.Errorf("could not convert from JSON to Table format: %w", err)
}

cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)
out, err := jsontabwriter.GenerateOutputPreconverted(r.Properties.RoutingRules, convertedItems, tabheaders.GetHeaders(allRoutingRulesColumns, defaultRoutingRulesColumns, cols))
if err != nil {
return err
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, r.Properties.RoutingRules, cols))
},
InitClient: true,
})
Expand All @@ -88,6 +80,12 @@ func GetDistributionRoutingRules() *core.Command {
})
}, constants.CDNApiRegionalURL, constants.CDNLocations),
)

cmd.Command.PersistentFlags().StringSlice(constants.ArgCols, nil, table.ColsMessage(allCols))
_ = cmd.Command.RegisterFlagCompletionFunc(constants.ArgCols, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
return table.AllCols(allCols), cobra.ShellCompDirectiveNoFileComp
})

cmd.Command.SilenceUsage = true
cmd.Command.Flags().SortFlags = false
return cmd
Expand Down
15 changes: 3 additions & 12 deletions commands/cdn/distribution/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ import (
"github.com/ionos-cloud/ionosctl/v6/commands/cdn/completer"
"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/sdk-go-bundle/products/cdn/v2"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
cdn "github.com/ionos-cloud/sdk-go-bundle/products/cdn/v2"

"github.com/spf13/viper"

Expand Down Expand Up @@ -81,12 +79,5 @@ func updateDistribution(c *core.CommandConfig, d cdn.Distribution) (cdn.Distribu

func printDistribution(c *core.CommandConfig, d cdn.Distribution) error {
cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)
out, err := jsontabwriter.GenerateOutput("", jsonpaths.CDNDistribution, d,
tabheaders.GetHeadersAllDefault(defaultCols, cols))
if err != nil {
return err
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, d, cols))
}
3 changes: 1 addition & 2 deletions commands/cert/api-version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
)

func CertGetApiVersionCmd() *core.Command {
Expand All @@ -31,7 +30,7 @@ func CertGetApiVersionCmd() *core.Command {
return cmd
}
func CmdGetApiVersion(c *core.CommandConfig) error {
fmt.Fprintf(c.Command.Command.ErrOrStderr(), "%s", jsontabwriter.GenerateVerboseOutput("Getting Api Version..."))
c.Verbose("Getting Api Version...")

// v2.0 API version removed this route. This is a dummy response. to avoid errs and breaking changes.
fmt.Fprintf(c.Command.Command.OutOrStdout(), "v2.0")
Expand Down
26 changes: 15 additions & 11 deletions commands/cert/autocertificate/autocertificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@
"github.com/ionos-cloud/ionosctl/v6/internal/completions"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
"github.com/spf13/cobra"
)

var (
allCols = []string{"Id", "Provider", "CommonName", "KeyAlgorithm", "Name", "AlternativeNames", "State"}
)
var allCols = []table.Column{
{Name: "Id", JSONPath: "id", Default: true},
{Name: "Provider", JSONPath: "properties.provider", Default: true},
{Name: "CommonName", JSONPath: "properties.commonName", Default: true},
{Name: "KeyAlgorithm", JSONPath: "properties.keyAlgorithm", Default: true},
{Name: "Name", JSONPath: "properties.name", Default: true},
{Name: "AlternativeNames", JSONPath: "properties.subjectAlternativeNames", Default: true},
{Name: "State", JSONPath: "metadata.state", Default: true},
}

func AutocertificateCommand() *core.Command {
cmd := &core.Command{
Expand All @@ -27,10 +31,10 @@
},
}

cmd.Command.PersistentFlags().StringSlice(constants.ArgCols, nil, tabheaders.ColsMessage(allCols))
cmd.Command.PersistentFlags().StringSlice(constants.ArgCols, nil, table.ColsMessage(allCols))
_ = cmd.Command.RegisterFlagCompletionFunc(
constants.ArgCols, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
return allCols, cobra.ShellCompDirectiveNoFileComp
return table.AllCols(allCols), cobra.ShellCompDirectiveNoFileComp
},
)
cmd.AddCommand(AutocertificatePostCmd())
Expand All @@ -47,9 +51,9 @@
if err != nil {
return nil
}
autocertificateConverted, err := json2table.ConvertJSONToTable("items", jsonpaths.CertManagerAutocertificate, autocertificate)
if err != nil {
t := table.New(allCols, table.WithPrefix("items"))
if err := t.Extract(autocertificate); err != nil {

Check warning on line 55 in commands/cert/autocertificate/autocertificate.go

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unnecessary variable declaration and use the expression directly in the condition. 

 See more on https://sonarcloud.io/project/issues?id=cli-ionosctl&issues=AZzmeyEt3w0qoWZOK9d4&open=AZzmeyEt3w0qoWZOK9d4&pullRequest=653
return nil
}
return completions.NewCompleter(autocertificateConverted, "Id").AddInfo("Name").AddInfo("CommonName").AddInfo("KeyAlgorithm").AddInfo("Provider").AddInfo("AlternativeNames").AddInfo("State").ToString()
return completions.NewCompleter(t.Rows(), "Id").AddInfo("Name").AddInfo("CommonName").AddInfo("KeyAlgorithm").AddInfo("Provider").AddInfo("AlternativeNames").AddInfo("State").ToString()
}
13 changes: 2 additions & 11 deletions commands/cert/autocertificate/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
"github.com/ionos-cloud/sdk-go-bundle/products/cert/v2"
"github.com/spf13/viper"
)
Expand Down Expand Up @@ -65,14 +63,7 @@ func AutocertificatePostCmd() *core.Command {
}

cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)

out, err := jsontabwriter.GenerateOutput("", jsonpaths.CertManagerAutocertificate, z, tabheaders.GetHeadersAllDefault(allCols, cols))
if err != nil {
return fmt.Errorf("failed generating the output: %w", err)
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, z, cols))
},
InitClient: true,
})
Expand Down
3 changes: 1 addition & 2 deletions commands/cert/autocertificate/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/pkg/confirm"
"github.com/ionos-cloud/ionosctl/v6/pkg/functional"
"github.com/ionos-cloud/sdk-go-bundle/products/cert/v2"
Expand Down Expand Up @@ -66,7 +65,7 @@ func AutocertificateDeleteCmd() *core.Command {
}

func deleteAll(c *core.CommandConfig) error {
fmt.Fprintf(c.Command.Command.ErrOrStderr(), "%s", jsontabwriter.GenerateVerboseOutput("Deleting all AutoCertificates!"))
c.Verbose("Deleting all AutoCertificates!")
xs, _, err := client.Must().CertManagerClient.AutoCertificateApi.AutoCertificatesGet(context.Background()).Execute()
if err != nil {
return fmt.Errorf("failed getting the AutoCertificates: %w", err)
Expand Down
13 changes: 2 additions & 11 deletions commands/cert/autocertificate/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import (
"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
"github.com/spf13/viper"
)

Expand All @@ -36,14 +34,7 @@ func AutocertificateFindByIdCmd() *core.Command {
}

cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)

out, err := jsontabwriter.GenerateOutput("", jsonpaths.CertManagerAutocertificate, r, tabheaders.GetHeadersAllDefault(allCols, cols))
if err != nil {
return fmt.Errorf("failed generating the output: %w", err)
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, r, cols))
},
InitClient: true,
})
Expand Down
14 changes: 2 additions & 12 deletions commands/cert/autocertificate/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import (
"github.com/ionos-cloud/ionosctl/v6/internal/client"
"github.com/ionos-cloud/ionosctl/v6/internal/constants"
"github.com/ionos-cloud/ionosctl/v6/internal/core"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/json2table/jsonpaths"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/jsontabwriter"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/tabheaders"
"github.com/ionos-cloud/ionosctl/v6/internal/printer/table"
"github.com/spf13/viper"
)

Expand Down Expand Up @@ -37,15 +35,7 @@ func AutocertificateListCmd() *core.Command {
}

cols, _ := c.Command.Command.Flags().GetStringSlice(constants.ArgCols)

out, err := jsontabwriter.GenerateOutput("items", jsonpaths.CertManagerAutocertificate, ls,
tabheaders.GetHeadersAllDefault(allCols, cols))
if err != nil {
return fmt.Errorf("failed generating the output: %w", err)
}

fmt.Fprintf(c.Command.Command.OutOrStdout(), "%s", out)
return nil
return c.Out(table.Sprint(allCols, ls, cols, table.WithPrefix("items")))
},
InitClient: true,
})
Expand Down
Loading
Loading