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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
193 changes: 109 additions & 84 deletions go.mod

Large diffs are not rendered by default.

228 changes: 228 additions & 0 deletions go.sum

Large diffs are not rendered by default.

33 changes: 19 additions & 14 deletions pkg/cmd/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"path/filepath"

"github.com/olekukonko/tablewriter"
"github.com/olekukonko/tablewriter/tw"
"github.com/spf13/cobra"
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -34,20 +35,24 @@ import (

// NewTableWriter returns a default table writer
func NewTableWriter(out io.Writer) *tablewriter.Table {
tw := tablewriter.NewWriter(out)
tw.SetAutoWrapText(false)
tw.SetAutoFormatHeaders(true)
tw.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
tw.SetAlignment(tablewriter.ALIGN_LEFT)
tw.SetCenterSeparator("")
tw.SetColumnSeparator("")
tw.SetRowSeparator("")
tw.SetHeaderLine(false)
tw.SetBorder(false)
tw.SetTablePadding("\t")
tw.SetNoWhiteSpace(true)

return tw
table := tablewriter.NewWriter(out)
table.Options(
tablewriter.WithHeaderAutoWrap(tw.WrapNone),
tablewriter.WithRowAutoWrap(tw.WrapNone),
tablewriter.WithHeaderAutoFormat(tw.On),
tablewriter.WithHeaderAlignment(tw.AlignLeft),
tablewriter.WithRowAlignment(tw.AlignLeft),
tablewriter.WithPadding(tw.Padding{Left: "\t", Right: "\t"}),
tablewriter.WithRendition(tw.Rendition{
Borders: tw.BorderNone,
Settings: tw.Settings{
Lines: tw.LinesNone,
Separators: tw.SeparatorsNone,
},
}),
)

return table
}

// AutoCompletionFunc is a function that returns a list of completions
Expand Down
10 changes: 7 additions & 3 deletions pkg/cmd/tnctl/state/clean.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,13 @@ func (o *CleanCommand) Run(ctx context.Context) error {
}

tw := cmd.NewTableWriter(o.Stdout())
tw.SetHeader([]string{"Name", "Configuration", "Namespace", "Age"})
tw.AppendBulk(data)
tw.Render()
tw.Header([]string{"Name", "Configuration", "Namespace", "Age"})
if err := tw.Bulk(data); err != nil {
return err
}
if err := tw.Render(); err != nil {
return err
}

if !o.Force {
o.Printf("\nYou have %d secrets orphaned which can be removed, do you wish to delete? (y/n) ", len(data))
Expand Down
10 changes: 7 additions & 3 deletions pkg/cmd/tnctl/state/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,20 @@ func (o *ListCommand) Run(ctx context.Context) error {
}

tw := cmd.NewTableWriter(o.Stdout())
tw.SetHeader([]string{
tw.Header([]string{
"Configuration",
"State",
"Config",
"Policy",
"Cost",
"Age",
})
tw.AppendBulk(data)
tw.Render()
if err := tw.Bulk(data); err != nil {
return err
}
if err := tw.Render(); err != nil {
return err
}

return nil
}
3 changes: 2 additions & 1 deletion pkg/cmd/tnctl/state/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ var _ = Describe("Listing the state", func() {
})

It("should list the configurations", func() {
Expect(stdout.String()).To(Equal("CONFIGURATION\tSTATE\tCONFIG\tPOLICY\tCOST\tAGE \ntest \tNone \tNone \tNone \tNone\t292y\t\n"))
//Expect(stdout.String()).To(Equal("\tCONFIGURATION\tSTATE\tCONFIG\tPOLICY\tCOST\tAGE \ntest \tNone \tNone \tNone \tNone\t292y\t\n"))
Expect(stdout.String()).To(Equal("\tCONFIGURATION\tSTATE\tCONFIG\tPOLICY\tCOST\tAGE\t \n\ttest\t\t\t\t\t\t\t\t\t \tNone\t \tNone\t\t \tNone\t\t \tNone\t292y\n"))
})
})

Expand Down
1 change: 0 additions & 1 deletion vendor/cel.dev/expr/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ go_library(
importpath = "cel.dev/expr",
visibility = ["//visibility:public"],
deps = [
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
"@org_golang_google_protobuf//reflect/protoreflect",
"@org_golang_google_protobuf//runtime/protoimpl",
"@org_golang_google_protobuf//types/known/anypb",
Expand Down
22 changes: 2 additions & 20 deletions vendor/cel.dev/expr/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,9 @@ bazel_dep(
version = "0.39.1",
repo_name = "bazel_gazelle",
)
bazel_dep(
name = "googleapis",
version = "0.0.0-20241220-5e258e33.bcr.1",
repo_name = "com_google_googleapis",
)
bazel_dep(
name = "googleapis-cc",
version = "1.0.0",
)
bazel_dep(
name = "googleapis-java",
version = "1.0.0",
)
bazel_dep(
name = "googleapis-go",
version = "1.0.0",
)
bazel_dep(
name = "protobuf",
version = "27.0",
version = "27.1",
repo_name = "com_google_protobuf",
)
bazel_dep(
Expand Down Expand Up @@ -63,12 +46,11 @@ python.toolchain(
)

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.22.0")
go_sdk.download(version = "1.23.0")

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
use_repo(
go_deps,
"org_golang_google_genproto_googleapis_rpc",
"org_golang_google_protobuf",
)
Loading