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

Jump to bottom

feat(kumactl): support new inspect api #8192

Merged
merged 3 commits into from
Nov 2, 2023
Merged

feat(kumactl): support new inspect api #8192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d0be82
feat(kumactl): support new inspect api
lahabana Oct 30, 2023
1faa726
Merge branch 'master' of github.com:kumahq/kuma into inspectKumactl
lahabana Oct 31, 2023
04dcc73
PR reviews
lahabana Oct 31, 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: 2 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ linters-settings:
alias: core_model
- pkg: github.com/kumahq/kuma/api/common/v1alpha1
alias: common_api
- pkg: github.com/kumahq/kuma/api/openapi/types
alias: api_types
gomodguard:
blocked:
modules:
Expand Down
8 changes: 2 additions & 6 deletions app/kumactl/cmd/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import (
"github.com/spf13/cobra"

kumactl_cmd "github.com/kumahq/kuma/app/kumactl/pkg/cmd"
"github.com/kumahq/kuma/app/kumactl/pkg/output"
"github.com/kumahq/kuma/app/kumactl/pkg/output/printers"
yaml_output "github.com/kumahq/kuma/app/kumactl/pkg/output/yaml"
"github.com/kumahq/kuma/pkg/core/resources/apis/mesh"
"github.com/kumahq/kuma/pkg/core/resources/model"
rest_types "github.com/kumahq/kuma/pkg/core/resources/model/rest"
Expand Down Expand Up @@ -132,10 +131,7 @@ $ kumactl apply -f https://example.com/resource.yaml
return err
}
}
p, err := printers.NewGenericPrinter(output.YAMLFormat)
if err != nil {
return err
}
p := yaml_output.NewPrinter()
for _, resource := range resources {
if rs == nil {
if err := p.Print(rest_types.From.Resource(resource), cmd.OutOrStdout()); err != nil {
Expand Down
72 changes: 72 additions & 0 deletions app/kumactl/cmd/completion/testdata/bash.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3721,6 +3721,9 @@ _kumactl_inspect_circuit-breaker()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -3826,6 +3829,9 @@ _kumactl_inspect_fault-injection()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -3859,6 +3865,9 @@ _kumactl_inspect_healthcheck()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -3892,6 +3901,9 @@ _kumactl_inspect_meshaccesslog()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -3925,6 +3937,9 @@ _kumactl_inspect_meshcircuitbreaker()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -3988,6 +4003,9 @@ _kumactl_inspect_meshfaultinjection()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4051,6 +4069,9 @@ _kumactl_inspect_meshhealthcheck()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4084,6 +4105,9 @@ _kumactl_inspect_meshhttproute()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4117,6 +4141,9 @@ _kumactl_inspect_meshloadbalancingstrategy()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4150,6 +4177,9 @@ _kumactl_inspect_meshproxypatch()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4183,6 +4213,9 @@ _kumactl_inspect_meshratelimit()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4216,6 +4249,9 @@ _kumactl_inspect_meshretry()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4249,6 +4285,9 @@ _kumactl_inspect_meshtcproute()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4282,6 +4321,9 @@ _kumactl_inspect_meshtimeout()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4315,6 +4357,9 @@ _kumactl_inspect_meshtrace()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4348,6 +4393,9 @@ _kumactl_inspect_meshtrafficpermission()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4381,6 +4429,9 @@ _kumactl_inspect_proxytemplate()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4414,6 +4465,9 @@ _kumactl_inspect_rate-limit()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4447,6 +4501,9 @@ _kumactl_inspect_retry()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4513,6 +4570,9 @@ _kumactl_inspect_timeout()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4546,6 +4606,9 @@ _kumactl_inspect_traffic-log()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4579,6 +4642,9 @@ _kumactl_inspect_traffic-permission()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4612,6 +4678,9 @@ _kumactl_inspect_traffic-route()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down Expand Up @@ -4645,6 +4714,9 @@ _kumactl_inspect_traffic-trace()
flags+=("--mesh=")
two_word_flags+=("--mesh")
two_word_flags+=("-m")
flags+=("--new-api")
flags+=("--offset=")
two_word_flags+=("--offset")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down
33 changes: 15 additions & 18 deletions app/kumactl/cmd/config/config_control_planes_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
kumactl_cmd "github.com/kumahq/kuma/app/kumactl/pkg/cmd"
"github.com/kumahq/kuma/app/kumactl/pkg/output/printers"
"github.com/kumahq/kuma/app/kumactl/pkg/output/table"
"github.com/kumahq/kuma/pkg/config/app/kumactl/v1alpha1"
)

func newConfigControlPlanesListCmd(pctx *kumactl_cmd.RootContext) *cobra.Command {
Expand All @@ -21,26 +22,22 @@ func newConfigControlPlanesListCmd(pctx *kumactl_cmd.RootContext) *cobra.Command

data := printers.Table{
Headers: []string{"ACTIVE", "NAME", "ADDRESS"},
NextRow: func() func() []string {
i := 0
return func() []string {
defer func() { i++ }()
if len(controlPlanes) <= i {
return nil
}
cp := controlPlanes[i]

active := context != nil && context.ControlPlane == cp.Name

return []string{
table.Check(active), // ACTIVE
cp.GetName(), // NAME
cp.GetCoordinates().GetApiServer().GetUrl(), // URL
}
RowForItem: func(i int, container interface{}) ([]string, error) {
cps := container.([]*v1alpha1.ControlPlane)
if len(cps) <= i {
return nil, nil
}
}(),
cp := cps[i]
active := context != nil && context.ControlPlane == cp.Name

return []string{
table.Check(active), // ACTIVE
cp.GetName(), // NAME
cp.GetCoordinates().GetApiServer().GetUrl(), // URL
}, nil
},
}
return printers.NewTablePrinter().Print(data, cmd.OutOrStdout())
return data.Print(controlPlanes, cmd.OutOrStdout())
},
}
}
18 changes: 2 additions & 16 deletions app/kumactl/cmd/get/get_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/kumahq/kuma/app/kumactl/pkg/output"
"github.com/kumahq/kuma/app/kumactl/pkg/output/printers"
core_model "github.com/kumahq/kuma/pkg/core/resources/model"
rest_types "github.com/kumahq/kuma/pkg/core/resources/model/rest"
"github.com/kumahq/kuma/pkg/core/resources/store"
)

Expand Down Expand Up @@ -48,21 +47,8 @@ func NewGetResourceCmd(pctx *kumactl_cmd.RootContext, desc core_model.ResourceTy
return fmt.Errorf("Scope %s is unsupported", desc.Scope)
}

resources := desc.NewList()
if err := resources.AddItem(resource); err != nil {
return err
}

switch format := output.Format(pctx.GetContext.Args.OutputFormat); format {
case output.TableFormat:
return ResolvePrinter(desc.Name, resource.Descriptor().Scope).Print(pctx.Now(), resources, cmd.OutOrStdout())
default:
printer, err := printers.NewGenericPrinter(format)
if err != nil {
return err
}
return printer.Print(rest_types.From.Resource(resource), cmd.OutOrStdout())
}
format := output.Format(pctx.GetContext.Args.OutputFormat)
return printers.GenericPrint(format, resource, ResolvePrinter(desc.Name, resource.Descriptor().Scope, pctx.Now()), cmd.OutOrStdout())
},
}
cmd.PersistentFlags().StringVarP(&pctx.Args.Mesh, "mesh", "m", "default", "mesh to use")
Expand Down
13 changes: 2 additions & 11 deletions app/kumactl/cmd/get/get_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/kumahq/kuma/app/kumactl/pkg/output"
"github.com/kumahq/kuma/app/kumactl/pkg/output/printers"
"github.com/kumahq/kuma/pkg/core/resources/model"
rest_types "github.com/kumahq/kuma/pkg/core/resources/model/rest"
core_store "github.com/kumahq/kuma/pkg/core/resources/store"
)

Expand All @@ -37,16 +36,8 @@ func NewGetResourcesCmd(pctx *kumactl_cmd.RootContext, desc model.ResourceTypeDe
return errors.Wrapf(err, "failed to list "+string(desc.Name))
}

switch format := output.Format(pctx.GetContext.Args.OutputFormat); format {
case output.TableFormat:
return ResolvePrinter(desc.Name, resource.Descriptor().Scope).Print(pctx.Now(), resources, cmd.OutOrStdout())
default:
printer, err := printers.NewGenericPrinter(format)
if err != nil {
return err
}
return printer.Print(rest_types.From.ResourceList(resources), cmd.OutOrStdout())
}
format := output.Format(pctx.GetContext.Args.OutputFormat)
return printers.GenericPrint(format, resources, ResolvePrinter(desc.Name, resource.Descriptor().Scope, pctx.Now()), cmd.OutOrStdout())
},
}
cmd.PersistentFlags().StringVarP(&pctx.Args.Mesh, "mesh", "m", "default", "mesh to use")
Expand Down
Loading
Loading