From 47e611382512ea38d2ec88593ae93ca6903cbd44 Mon Sep 17 00:00:00 2001 From: Nikolay Petrov Date: Sun, 28 Jan 2024 15:45:13 -0500 Subject: [PATCH] better naming --- egress_webhooks.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- ingress_webhooks.go | 6 +++--- logs.go | 4 ++-- main.go | 10 +++++----- offsets.go | 6 +++--- tokens.go | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/egress_webhooks.go b/egress_webhooks.go index a824f8c..fb7d6bc 100644 --- a/egress_webhooks.go +++ b/egress_webhooks.go @@ -7,7 +7,7 @@ import ( "github.com/klev-dev/klev-api-go/logs" ) -func egressWebhooksCommand() *cobra.Command { +func egressWebhooksRoot() *cobra.Command { cmd := &cobra.Command{ Use: "egress-webhooks", Short: "interact with egress webhooks", @@ -50,7 +50,7 @@ func egressWebhooksCreate() *cobra.Command { Short: "create new egress webhook", } - var in egress_webhooks.EgressWebhookCreate + var in egress_webhooks.CreateParams logID := cmd.Flags().String("log-id", "", "log id that will store webhook data") cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata") @@ -89,7 +89,7 @@ func egressWebhooksRotate() *cobra.Command { Args: cobra.ExactArgs(1), } - var in egress_webhooks.EgressWebhookRotate + var in egress_webhooks.RotateParams cmd.Flags().Int64Var(&in.ExpireSeconds, "expire-seconds", 0, "for how long the old secret is valid") diff --git a/go.mod b/go.mod index 1e207b6..252ddb1 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/klev-dev/klev-cli go 1.19 require ( - github.com/klev-dev/klev-api-go v0.4.0 + github.com/klev-dev/klev-api-go v0.4.1 github.com/spf13/cobra v1.6.1 ) diff --git a/go.sum b/go.sum index 481b9d2..92f446b 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/klev-dev/klev-api-go v0.4.0 h1:M+GOU/rjtB37NZ1DHToyuPB6wqQfjTWmbqfWqtcY8V4= -github.com/klev-dev/klev-api-go v0.4.0/go.mod h1:RNe/KNgqBRjY/VYp87CwCS4wIsQMTNmdIvICEAeETR8= +github.com/klev-dev/klev-api-go v0.4.1 h1:yvE09kZD6rBKwtaZPlbO1dOstrPhJo+b6JLBY7RoA+U= +github.com/klev-dev/klev-api-go v0.4.1/go.mod h1:RNe/KNgqBRjY/VYp87CwCS4wIsQMTNmdIvICEAeETR8= github.com/klev-dev/kleverr v0.0.0-20230327002055-63b8717d8103 h1:QTdI0Ut6fvND4SCeuJqsuAY9FajkkmNL+okMFO9UuaU= github.com/klev-dev/kleverr v0.0.0-20230327002055-63b8717d8103/go.mod h1:DV1tEcfsgAzKraeb/7nux27wOJs8w9P8fLB6GT7DmGM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/ingress_webhooks.go b/ingress_webhooks.go index 16d02f4..cd29cfa 100644 --- a/ingress_webhooks.go +++ b/ingress_webhooks.go @@ -7,7 +7,7 @@ import ( "github.com/klev-dev/klev-api-go/logs" ) -func ingressWebhooksCommand() *cobra.Command { +func ingressWebhooksRoot() *cobra.Command { cmd := &cobra.Command{ Use: "ingress-webhooks", Short: "interact with ingress webhooks", @@ -49,7 +49,7 @@ func ingressWebhooksCreate() *cobra.Command { Short: "create new ingress webhook", } - var in ingress_webhooks.IngressWebhookCreate + var in ingress_webhooks.CreateParams logID := cmd.Flags().String("log-id", "", "log id that will store webhook data") cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata") @@ -88,7 +88,7 @@ func ingressWebhooksRotate() *cobra.Command { Short: "rotate ingress webhook secret", } - var in ingress_webhooks.IngressWebhookRotate + var in ingress_webhooks.RotateParams cmd.Flags().StringVar(&in.Secret, "secret", "", "the secret to validate webhook messages") diff --git a/logs.go b/logs.go index b09f743..48e2607 100644 --- a/logs.go +++ b/logs.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" ) -func logsCommand() *cobra.Command { +func logsRoot() *cobra.Command { cmd := &cobra.Command{ Use: "logs", Short: "interact with logs", @@ -46,7 +46,7 @@ func logsCreate() *cobra.Command { Short: "create new log", } - var in logs.LogCreate + var in logs.CreateParams cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata") cmd.Flags().BoolVar(&in.Compacting, "compacting", false, "if the log is compacting") diff --git a/main.go b/main.go index b9b8dbb..101c2e8 100644 --- a/main.go +++ b/main.go @@ -21,11 +21,11 @@ func main() { rootCmd.AddCommand(publish()) rootCmd.AddCommand(consume()) rootCmd.AddCommand(receive()) - rootCmd.AddCommand(logsCommand()) - rootCmd.AddCommand(offsetsCommand()) - rootCmd.AddCommand(tokensCommand()) - rootCmd.AddCommand(ingressWebhooksCommand()) - rootCmd.AddCommand(egressWebhooksCommand()) + rootCmd.AddCommand(logsRoot()) + rootCmd.AddCommand(offsetsRoot()) + rootCmd.AddCommand(tokensRoot()) + rootCmd.AddCommand(ingressWebhooksRoot()) + rootCmd.AddCommand(egressWebhooksRoot()) if err := rootCmd.Execute(); err != nil { fmt.Fprintln(os.Stderr, err) diff --git a/offsets.go b/offsets.go index 9cdd33d..9ae48a0 100644 --- a/offsets.go +++ b/offsets.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" ) -func offsetsCommand() *cobra.Command { +func offsetsRoot() *cobra.Command { cmd := &cobra.Command{ Use: "offsets", Short: "interact with offsets", @@ -48,7 +48,7 @@ func offsetsCreate() *cobra.Command { Short: "create new offset", } - var in offsets.OffsetCreate + var in offsets.CreateParams logID := cmd.Flags().String("log-id", "", "log id for this offset") cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata") @@ -83,7 +83,7 @@ func offsetsSet() *cobra.Command { Args: cobra.ExactArgs(1), } - var in offsets.OffsetSet + var in offsets.SetParams cmd.Flags().Int64Var(&in.Value, "value", 0, "value to set") cmd.Flags().StringVar(&in.ValueMetadata, "value-metadata", "", "machine readable metadata for the value") diff --git a/tokens.go b/tokens.go index f08e205..af26f58 100644 --- a/tokens.go +++ b/tokens.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" ) -func tokensCommand() *cobra.Command { +func tokensRoot() *cobra.Command { cmd := &cobra.Command{ Use: "tokens", Short: "interact with tokens", @@ -46,7 +46,7 @@ func tokensCreate() *cobra.Command { Short: "create new token", } - var in tokens.TokenCreate + var in tokens.CreateParams cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata") cmd.Flags().StringArrayVar(&in.ACL, "acl", nil, "token acl")