Skip to content

Commit 008b5c1

Browse files
ingoningon
committed
update to latest api
1 parent 8131fdf commit 008b5c1

10 files changed

Lines changed: 132 additions & 76 deletions

File tree

‎egress_webhooks.go‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,23 @@ func egressWebhooksCreate() *cobra.Command {
5757
logID := cmd.Flags().String("log-id", "", "log id that will store webhook data")
5858
cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata")
5959
cmd.Flags().StringVar(&in.Destination, "destination", "", "where to deliver data")
60-
cmd.Flags().StringVar(&in.Payload, "payload", "message", "what payload to deliver")
60+
payload := cmd.Flags().String("payload", "message", "what payload to deliver")
6161

6262
cmd.MarkFlagRequired("log-id")
6363
cmd.MarkFlagRequired("destination")
6464

6565
cmd.RunE = func(cmd *cobra.Command, args []string) error {
66-
in.LogID = klev.LogID(*logID)
66+
var err error
67+
68+
in.LogID, err = klev.ParseLogID(*logID)
69+
if err != nil {
70+
return outputErr(err)
71+
}
72+
73+
in.Payload, err = klev.ParseEgressWebhookPayload(*payload)
74+
if err != nil {
75+
return outputErr(err)
76+
}
6777

6878
out, err := klient.EgressWebhooks.Create(cmd.Context(), in)
6979
return output(out, err)
@@ -80,7 +90,7 @@ func egressWebhooksGet() *cobra.Command {
8090
RunE: func(cmd *cobra.Command, args []string) error {
8191
id, err := klev.ParseEgressWebhookID(args[0])
8292
if err != nil {
83-
return err
93+
return outputErr(err)
8494
}
8595

8696
out, err := klient.EgressWebhooks.Get(cmd.Context(), id)
@@ -103,7 +113,7 @@ func egressWebhooksRotate() *cobra.Command {
103113
cmd.RunE = func(cmd *cobra.Command, args []string) error {
104114
id, err := klev.ParseEgressWebhookID(args[0])
105115
if err != nil {
106-
return err
116+
return outputErr(err)
107117
}
108118

109119
out, err := klient.EgressWebhooks.RotateRaw(cmd.Context(), id, in)
@@ -121,7 +131,7 @@ func egressWebhooksStatus() *cobra.Command {
121131
RunE: func(cmd *cobra.Command, args []string) error {
122132
id, err := klev.ParseEgressWebhookID(args[0])
123133
if err != nil {
124-
return err
134+
return outputErr(err)
125135
}
126136

127137
out, err := klient.EgressWebhooks.Status(cmd.Context(), id)
@@ -143,7 +153,7 @@ func egressWebhooksUpdate() *cobra.Command {
143153
cmd.RunE = func(cmd *cobra.Command, args []string) error {
144154
id, err := klev.ParseEgressWebhookID(args[0])
145155
if err != nil {
146-
return err
156+
return outputErr(err)
147157
}
148158

149159
var in klev.EgressWebhookUpdateParams
@@ -170,7 +180,7 @@ func egressWebhooksDelete() *cobra.Command {
170180
RunE: func(cmd *cobra.Command, args []string) error {
171181
id, err := klev.ParseEgressWebhookID(args[0])
172182
if err != nil {
173-
return err
183+
return outputErr(err)
174184
}
175185

176186
out, err := klient.EgressWebhooks.Delete(cmd.Context(), id)

‎filters.go‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,15 @@ func filtersCreate() *cobra.Command {
6363
cmd.MarkFlagRequired("expression")
6464

6565
cmd.RunE = func(cmd *cobra.Command, args []string) error {
66-
in.SourceID = klev.LogID(*sourceID)
67-
in.TargetID = klev.LogID(*targetID)
66+
var err error
67+
in.SourceID, err = klev.ParseLogID(*sourceID)
68+
if err != nil {
69+
return outputErr(err)
70+
}
71+
in.TargetID, err = klev.ParseLogID(*targetID)
72+
if err != nil {
73+
return outputErr(err)
74+
}
6875

6976
out, err := klient.Filters.Create(cmd.Context(), in)
7077
return output(out, err)
@@ -81,7 +88,7 @@ func filtersGet() *cobra.Command {
8188
RunE: func(cmd *cobra.Command, args []string) error {
8289
id, err := klev.ParseFilterID(args[0])
8390
if err != nil {
84-
return err
91+
return outputErr(err)
8592
}
8693

8794
out, err := klient.Filters.Get(cmd.Context(), id)
@@ -98,7 +105,7 @@ func filtersStatus() *cobra.Command {
98105
RunE: func(cmd *cobra.Command, args []string) error {
99106
id, err := klev.ParseFilterID(args[0])
100107
if err != nil {
101-
return err
108+
return outputErr(err)
102109
}
103110

104111
out, err := klient.Filters.Status(cmd.Context(), id)
@@ -120,7 +127,7 @@ func filtersUpdate() *cobra.Command {
120127
cmd.RunE = func(cmd *cobra.Command, args []string) error {
121128
id, err := klev.ParseFilterID(args[0])
122129
if err != nil {
123-
return err
130+
return outputErr(err)
124131
}
125132

126133
var in klev.FilterUpdateParams
@@ -146,7 +153,7 @@ func filtersDelete() *cobra.Command {
146153
RunE: func(cmd *cobra.Command, args []string) error {
147154
id, err := klev.ParseFilterID(args[0])
148155
if err != nil {
149-
return err
156+
return outputErr(err)
150157
}
151158

152159
out, err := klient.Filters.Delete(cmd.Context(), 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.8.0
6+
github.com/klev-dev/klev-api-go v0.9.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.8.0 h1:EsuZI5BI4XbLEUQECPbbALaniXunXfEzpxYFF/sGDgw=
6-
github.com/klev-dev/klev-api-go v0.8.0/go.mod h1:RNe/KNgqBRjY/VYp87CwCS4wIsQMTNmdIvICEAeETR8=
5+
github.com/klev-dev/klev-api-go v0.9.0 h1:9IImlwmcgM/v2g09kLfxxtZv/CueBIFgRd8mnrVgVXE=
6+
github.com/klev-dev/klev-api-go v0.9.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: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,25 @@ func ingressWebhooksCreate() *cobra.Command {
5454

5555
logID := cmd.Flags().String("log-id", "", "log id that will store webhook data")
5656
cmd.Flags().StringVar(&in.Metadata, "metadata", "", "machine readable metadata")
57-
cmd.Flags().StringVar(&in.Type, "type", "", "the type of the webhook")
57+
typ := cmd.Flags().String("type", "", "the type of the webhook")
5858
cmd.Flags().StringVar(&in.Secret, "secret", "", "the secret to validate webhook messages")
5959

6060
cmd.MarkFlagRequired("log-id")
6161
cmd.MarkFlagRequired("type")
6262
cmd.MarkFlagRequired("secret")
6363

6464
cmd.RunE = func(cmd *cobra.Command, args []string) error {
65-
in.LogID = klev.LogID(*logID)
65+
var err error
66+
67+
in.LogID, err = klev.ParseLogID(*logID)
68+
if err != nil {
69+
return outputErr(err)
70+
}
71+
72+
in.Type, err = klev.ParseIngressWebhookType(*typ)
73+
if err != nil {
74+
return outputErr(err)
75+
}
6676

6777
out, err := klient.IngressWebhooks.Create(cmd.Context(), in)
6878
return output(out, err)
@@ -79,7 +89,7 @@ func ingressWebhooksGet() *cobra.Command {
7989
RunE: func(cmd *cobra.Command, args []string) error {
8090
id, err := klev.ParseIngressWebhookID(args[0])
8191
if err != nil {
82-
return err
92+
return outputErr(err)
8393
}
8494

8595
out, err := klient.IngressWebhooks.Get(cmd.Context(), id)
@@ -101,7 +111,7 @@ func ingressWebhooksUpdate() *cobra.Command {
101111
cmd.RunE = func(cmd *cobra.Command, args []string) error {
102112
id, err := klev.ParseIngressWebhookID(args[0])
103113
if err != nil {
104-
return err
114+
return outputErr(err)
105115
}
106116

107117
var in klev.IngressWebhookUpdateParams
@@ -128,7 +138,7 @@ func ingressWebhooksDelete() *cobra.Command {
128138
RunE: func(cmd *cobra.Command, args []string) error {
129139
id, err := klev.ParseIngressWebhookID(args[0])
130140
if err != nil {
131-
return err
141+
return outputErr(err)
132142
}
133143

134144
out, err := klient.IngressWebhooks.Delete(cmd.Context(), id)

‎logs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func logsGet() *cobra.Command {
7676
RunE: func(cmd *cobra.Command, args []string) error {
7777
id, err := klev.ParseLogID(args[0])
7878
if err != nil {
79-
return err
79+
return outputErr(err)
8080
}
8181

8282
out, err := klient.Logs.Get(cmd.Context(), id)
@@ -93,7 +93,7 @@ func logsStats() *cobra.Command {
9393
RunE: func(cmd *cobra.Command, args []string) error {
9494
id, err := klev.ParseLogID(args[0])
9595
if err != nil {
96-
return err
96+
return outputErr(err)
9797
}
9898

9999
out, err := klient.Logs.Stats(cmd.Context(), id)
@@ -119,7 +119,7 @@ func logsUpdate() *cobra.Command {
119119
cmd.RunE = func(cmd *cobra.Command, args []string) error {
120120
id, err := klev.ParseLogID(args[0])
121121
if err != nil {
122-
return err
122+
return outputErr(err)
123123
}
124124

125125
var in klev.LogUpdateParams
@@ -158,7 +158,7 @@ func logsDelete() *cobra.Command {
158158
RunE: func(cmd *cobra.Command, args []string) error {
159159
id, err := klev.ParseLogID(args[0])
160160
if err != nil {
161-
return err
161+
return outputErr(err)
162162
}
163163

164164
out, err := klient.Logs.Delete(cmd.Context(), id)

‎main.go‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,22 @@ func paths() *cobra.Command {
7979
}
8080

8181
func output(v any, err error) error {
82-
if err := klev.GetError(err); err != nil {
83-
return outputValue(os.Stderr, err)
84-
} else if err != nil {
85-
return err
82+
if err != nil {
83+
return outputErr(err)
8684
}
8785
return outputValue(os.Stdout, v)
8886
}
8987

88+
func outputErr(err error) error {
89+
if err := klev.GetError(err); err != nil {
90+
if err := outputValue(os.Stderr, err); err != nil {
91+
return err
92+
}
93+
os.Exit(1)
94+
}
95+
return err
96+
}
97+
9098
func outputValue(w io.Writer, v any) error {
9199
enc := json.NewEncoder(w)
92100
enc.SetIndent("", " ")

0 commit comments

Comments
 (0)