Skip to content

Commit 1ec0806

Browse files
ingoningon
committed
update api and commands
1 parent df9cdef commit 1ec0806

8 files changed

Lines changed: 182 additions & 22 deletions

File tree

‎egress_webhooks.go‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ func egressWebhooksRoot() *cobra.Command {
1717
cmd.AddCommand(egressWebhooksGet())
1818
cmd.AddCommand(egressWebhooksRotate())
1919
cmd.AddCommand(egressWebhooksStatus())
20+
cmd.AddCommand(egressWebhooksUpdate())
2021
cmd.AddCommand(egressWebhooksDelete())
2122

2223
return cmd
@@ -26,6 +27,7 @@ func egressWebhooksList() *cobra.Command {
2627
cmd := &cobra.Command{
2728
Use: "list",
2829
Short: "list egress webhooks",
30+
Args: cobra.NoArgs,
2931
}
3032

3133
metadata := cmd.Flags().String("metadata", "", "webhook metadata")
@@ -47,6 +49,7 @@ func egressWebhooksCreate() *cobra.Command {
4749
cmd := &cobra.Command{
4850
Use: "create",
4951
Short: "create new egress webhook",
52+
Args: cobra.NoArgs,
5053
}
5154

5255
var in klev.EgressWebhookCreateParams
@@ -115,6 +118,34 @@ func egressWebhooksStatus() *cobra.Command {
115118
}
116119
}
117120

121+
func egressWebhooksUpdate() *cobra.Command {
122+
cmd := &cobra.Command{
123+
Use: "update <egress-webhook-id>",
124+
Short: "update egress webhook",
125+
Args: cobra.ExactArgs(1),
126+
}
127+
128+
metadata := cmd.Flags().String("metadata", "", "machine readable metadata")
129+
destination := cmd.Flags().String("destination", "", "where to deliver data")
130+
131+
cmd.RunE = func(cmd *cobra.Command, args []string) error {
132+
var in klev.EgressWebhookUpdateParams
133+
134+
if cmd.Flags().Changed("metadata") {
135+
in.Metadata = metadata
136+
}
137+
if cmd.Flags().Changed("destination") {
138+
in.Destination = destination
139+
}
140+
141+
id := klev.EgressWebhookID(args[0])
142+
out, err := klient.EgressWebhooks.UpdateRaw(cmd.Context(), id, in)
143+
return output(out, err)
144+
}
145+
146+
return cmd
147+
}
148+
118149
func egressWebhooksDelete() *cobra.Command {
119150
return &cobra.Command{
120151
Use: "delete <egress-webhook-id>",

‎filters.go‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ func filtersRoot() *cobra.Command {
1616
cmd.AddCommand(filtersCreate())
1717
cmd.AddCommand(filtersGet())
1818
cmd.AddCommand(filtersStatus())
19+
cmd.AddCommand(filtersUpdate())
1920
cmd.AddCommand(filtersDelete())
2021

2122
return cmd
@@ -25,6 +26,7 @@ func filtersList() *cobra.Command {
2526
cmd := &cobra.Command{
2627
Use: "list",
2728
Short: "list filters",
29+
Args: cobra.NoArgs,
2830
}
2931

3032
metadata := cmd.Flags().String("metadata", "", "webhook metadata")
@@ -46,6 +48,7 @@ func filtersCreate() *cobra.Command {
4648
cmd := &cobra.Command{
4749
Use: "create",
4850
Short: "create new filter",
51+
Args: cobra.NoArgs,
4952
}
5053

5154
var in klev.FilterCreateParams
@@ -96,6 +99,33 @@ func filtersStatus() *cobra.Command {
9699
}
97100
}
98101

102+
func filtersUpdate() *cobra.Command {
103+
cmd := &cobra.Command{
104+
Use: "update <filter-id>",
105+
Short: "update filter",
106+
Args: cobra.ExactArgs(1),
107+
}
108+
109+
metadata := cmd.Flags().String("metadata", "", "machine readable metadata")
110+
expression := cmd.Flags().String("expression", "", "expression to eval")
111+
112+
cmd.RunE = func(cmd *cobra.Command, args []string) error {
113+
var in klev.FilterUpdateParams
114+
115+
if cmd.Flags().Changed("metadata") {
116+
in.Metadata = metadata
117+
}
118+
if cmd.Flags().Changed("expression") {
119+
in.Expression = expression
120+
}
121+
122+
id := klev.FilterID(args[0])
123+
out, err := klient.Filters.UpdateRaw(cmd.Context(), id, in)
124+
return output(out, err)
125+
}
126+
127+
return cmd
128+
}
99129
func filtersDelete() *cobra.Command {
100130
return &cobra.Command{
101131
Use: "delete <filter-id>",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/klev-dev/klev-cli
33
go 1.19
44

55
require (
6-
github.com/klev-dev/klev-api-go v0.6.1
6+
github.com/klev-dev/klev-api-go v0.7.0
77
github.com/spf13/cobra v1.6.1
88
)
99

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
44
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
5-
github.com/klev-dev/klev-api-go v0.6.1 h1:vyeJyjv53dBC3ofwnrt2H0Ps6ZYY8OHxnRA/7m/TTns=
6-
github.com/klev-dev/klev-api-go v0.6.1/go.mod h1:RNe/KNgqBRjY/VYp87CwCS4wIsQMTNmdIvICEAeETR8=
5+
github.com/klev-dev/klev-api-go v0.7.0 h1:nZt3yRmoMsVbCM2lTXcL1smh8/3wb64JZteK+wm8a5o=
6+
github.com/klev-dev/klev-api-go v0.7.0/go.mod h1:RNe/KNgqBRjY/VYp87CwCS4wIsQMTNmdIvICEAeETR8=
77
github.com/klev-dev/kleverr v0.0.0-20230327002055-63b8717d8103 h1:QTdI0Ut6fvND4SCeuJqsuAY9FajkkmNL+okMFO9UuaU=
88
github.com/klev-dev/kleverr v0.0.0-20230327002055-63b8717d8103/go.mod h1:DV1tEcfsgAzKraeb/7nux27wOJs8w9P8fLB6GT7DmGM=
99
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

‎ingress_webhooks.go‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func ingressWebhooksRoot() *cobra.Command {
1515
cmd.AddCommand(ingressWebhooksList())
1616
cmd.AddCommand(ingressWebhooksCreate())
1717
cmd.AddCommand(ingressWebhooksGet())
18-
cmd.AddCommand(ingressWebhooksRotate())
18+
cmd.AddCommand(ingressWebhooksUpdate())
1919
cmd.AddCommand(ingressWebhooksDelete())
2020

2121
return cmd
@@ -25,6 +25,7 @@ func ingressWebhooksList() *cobra.Command {
2525
cmd := &cobra.Command{
2626
Use: "list",
2727
Short: "list ingress webhooks",
28+
Args: cobra.NoArgs,
2829
}
2930

3031
metadata := cmd.Flags().String("metadata", "", "webhook metadata")
@@ -46,6 +47,7 @@ func ingressWebhooksCreate() *cobra.Command {
4647
cmd := &cobra.Command{
4748
Use: "create",
4849
Short: "create new ingress webhook",
50+
Args: cobra.NoArgs,
4951
}
5052

5153
var in klev.IngressWebhookCreateParams
@@ -82,21 +84,28 @@ func ingressWebhooksGet() *cobra.Command {
8284
}
8385
}
8486

85-
func ingressWebhooksRotate() *cobra.Command {
87+
func ingressWebhooksUpdate() *cobra.Command {
8688
cmd := &cobra.Command{
87-
Use: "rotate <ingress-webhook-id>",
88-
Short: "rotate ingress webhook secret",
89+
Use: "update <ingress-webhook-id>",
90+
Short: "update ingress webhook",
91+
Args: cobra.ExactArgs(1),
8992
}
9093

91-
var in klev.IngressWebhookRotateParams
94+
metadata := cmd.Flags().String("metadata", "", "machine readable metadata")
95+
secret := cmd.Flags().String("secret", "", "the secret to validate webhook messages")
9296

93-
cmd.Flags().StringVar(&in.Secret, "secret", "", "the secret to validate webhook messages")
97+
cmd.RunE = func(cmd *cobra.Command, args []string) error {
98+
var in klev.IngressWebhookUpdateParams
9499

95-
cmd.MarkFlagRequired("secret")
100+
if cmd.Flags().Changed("metadata") {
101+
in.Metadata = metadata
102+
}
103+
if cmd.Flags().Changed("secret") {
104+
in.Secret = secret
105+
}
96106

97-
cmd.RunE = func(cmd *cobra.Command, args []string) error {
98107
id := klev.IngressWebhookID(args[0])
99-
out, err := klient.IngressWebhooks.RotateRaw(cmd.Context(), id, in)
108+
out, err := klient.IngressWebhooks.UpdateRaw(cmd.Context(), id, in)
100109
return output(out, err)
101110
}
102111

‎logs.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ func logsRoot() *cobra.Command {
1515
cmd.AddCommand(logsCreate())
1616
cmd.AddCommand(logsGet())
1717
cmd.AddCommand(logsStats())
18+
cmd.AddCommand(logsUpdate())
1819
cmd.AddCommand(logsDelete())
1920

2021
return cmd
@@ -24,6 +25,7 @@ func logsList() *cobra.Command {
2425
cmd := &cobra.Command{
2526
Use: "list",
2627
Short: "list logs",
28+
Args: cobra.NoArgs,
2729
}
2830

2931
metadata := cmd.Flags().String("metadata", "", "log metadata")
@@ -45,6 +47,7 @@ func logsCreate() *cobra.Command {
4547
cmd := &cobra.Command{
4648
Use: "create",
4749
Short: "create new log",
50+
Args: cobra.NoArgs,
4851
}
4952

5053
var in klev.LogCreateParams
@@ -91,6 +94,50 @@ func logsStats() *cobra.Command {
9194
}
9295
}
9396

97+
func logsUpdate() *cobra.Command {
98+
cmd := &cobra.Command{
99+
Use: "update <log-id>",
100+
Short: "update log",
101+
Args: cobra.ExactArgs(1),
102+
}
103+
104+
metadata := cmd.Flags().String("metadata", "", "machine readable metadata")
105+
trimSeconds := cmd.Flags().Int64("trim-seconds", 0, "age of the log to trim")
106+
trimSize := cmd.Flags().Int64("trim-size", 0, "size of the log to trim")
107+
trimCount := cmd.Flags().Int64("trim-count", 0, "count of message in the log to trim")
108+
compactSeconds := cmd.Flags().Int64("compact-seconds", 0, "age of the log to compact")
109+
expireSeconds := cmd.Flags().Int64("expire-seconds", 0, "age of the log to expire")
110+
111+
cmd.RunE = func(cmd *cobra.Command, args []string) error {
112+
var in klev.LogUpdateParams
113+
114+
if cmd.Flags().Changed("metadata") {
115+
in.Metadata = metadata
116+
}
117+
if cmd.Flags().Changed("trim-seconds") {
118+
in.TrimSeconds = trimSeconds
119+
}
120+
if cmd.Flags().Changed("trim-size") {
121+
in.TrimSize = trimSize
122+
}
123+
if cmd.Flags().Changed("trim-count") {
124+
in.TrimCount = trimCount
125+
}
126+
if cmd.Flags().Changed("compact-seconds") {
127+
in.CompactSeconds = compactSeconds
128+
}
129+
if cmd.Flags().Changed("expire-seconds") {
130+
in.ExpireSeconds = expireSeconds
131+
}
132+
133+
id := klev.LogID(args[0])
134+
out, err := klient.Logs.UpdateRaw(cmd.Context(), id, in)
135+
return output(out, err)
136+
}
137+
138+
return cmd
139+
}
140+
94141
func logsDelete() *cobra.Command {
95142
return &cobra.Command{
96143
Use: "delete <log-id>",

‎offsets.go‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func offsetsRoot() *cobra.Command {
1414
cmd.AddCommand(offsetsList())
1515
cmd.AddCommand(offsetsCreate())
1616
cmd.AddCommand(offsetsGet())
17-
cmd.AddCommand(offsetsSet())
17+
cmd.AddCommand(offsetsUpdate())
1818
cmd.AddCommand(offsetsDelete())
1919

2020
return cmd
@@ -24,6 +24,7 @@ func offsetsList() *cobra.Command {
2424
cmd := &cobra.Command{
2525
Use: "list",
2626
Short: "list offsets",
27+
Args: cobra.NoArgs,
2728
}
2829

2930
metadata := cmd.Flags().String("metadata", "", "offset metadata")
@@ -45,6 +46,7 @@ func offsetsCreate() *cobra.Command {
4546
cmd := &cobra.Command{
4647
Use: "create",
4748
Short: "create new offset",
49+
Args: cobra.NoArgs,
4850
}
4951

5052
var in klev.OffsetCreateParams
@@ -76,22 +78,32 @@ func offsetsGet() *cobra.Command {
7678
}
7779
}
7880

79-
func offsetsSet() *cobra.Command {
81+
func offsetsUpdate() *cobra.Command {
8082
cmd := &cobra.Command{
81-
Use: "set <offset-id>",
82-
Short: "set log offset",
83+
Use: "update <offset-id>",
84+
Short: "update log offset",
8385
Args: cobra.ExactArgs(1),
8486
}
8587

86-
var in klev.OffsetSetParams
87-
cmd.Flags().Int64Var(&in.Value, "value", 0, "value to set")
88-
cmd.Flags().StringVar(&in.ValueMetadata, "value-metadata", "", "machine readable metadata for the value")
89-
90-
cmd.MarkFlagRequired("value")
88+
metadata := cmd.Flags().String("metadata", "", "machine readable metadata")
89+
value := cmd.Flags().Int64("value", 0, "value to set")
90+
valueMetadata := cmd.Flags().String("value-metadata", "", "machine readable metadata for the value")
9191

9292
cmd.RunE = func(cmd *cobra.Command, args []string) error {
93+
var in klev.OffsetUpdateParams
94+
95+
if cmd.Flags().Changed("metadata") {
96+
in.Metadata = metadata
97+
}
98+
if cmd.Flags().Changed("value") {
99+
in.Value = value
100+
}
101+
if cmd.Flags().Changed("value-metadata") {
102+
in.ValueMetadata = valueMetadata
103+
}
104+
93105
id := klev.OffsetID(args[0])
94-
out, err := klient.Offsets.SetRaw(cmd.Context(), id, in)
106+
out, err := klient.Offsets.UpdateRaw(cmd.Context(), id, in)
95107
return output(out, err)
96108
}
97109

‎tokens.go‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ func tokensRoot() *cobra.Command {
1414
cmd.AddCommand(tokensList())
1515
cmd.AddCommand(tokensCreate())
1616
cmd.AddCommand(tokensGet())
17+
cmd.AddCommand(tokensUpdate())
1718
cmd.AddCommand(tokensDelete())
1819

1920
return cmd
@@ -23,6 +24,7 @@ func tokensList() *cobra.Command {
2324
cmd := &cobra.Command{
2425
Use: "list",
2526
Short: "list tokens",
27+
Args: cobra.NoArgs,
2628
}
2729

2830
metadata := cmd.Flags().String("metadata", "", "token metadata")
@@ -44,6 +46,7 @@ func tokensCreate() *cobra.Command {
4446
cmd := &cobra.Command{
4547
Use: "create",
4648
Short: "create new token",
49+
Args: cobra.NoArgs,
4750
}
4851

4952
var in klev.TokenCreateParams
@@ -72,6 +75,34 @@ func tokensGet() *cobra.Command {
7275
}
7376
}
7477

78+
func tokensUpdate() *cobra.Command {
79+
cmd := &cobra.Command{
80+
Use: "update <token-id>",
81+
Short: "update token",
82+
Args: cobra.ExactArgs(1),
83+
}
84+
85+
metadata := cmd.Flags().String("metadata", "", "machine readable metadata")
86+
acl := cmd.Flags().StringArray("acl", nil, "token acl")
87+
88+
cmd.RunE = func(cmd *cobra.Command, args []string) error {
89+
var in klev.TokenUpdateParams
90+
91+
if cmd.Flags().Changed("metadata") {
92+
in.Metadata = metadata
93+
}
94+
if cmd.Flags().Changed("acl") {
95+
in.ACL = acl
96+
}
97+
98+
id := klev.TokenID(args[0])
99+
out, err := klient.Tokens.UpdateRaw(cmd.Context(), id, in)
100+
return output(out, err)
101+
}
102+
103+
return cmd
104+
}
105+
75106
func tokensDelete() *cobra.Command {
76107
return &cobra.Command{
77108
Use: "delete <token-id>",

0 commit comments

Comments
 (0)