Skip to content

Commit 1a0beb2

Browse files
ingoningon
committed
validate ids locally
1 parent 1ec0806 commit 1a0beb2

8 files changed

Lines changed: 113 additions & 25 deletions

File tree

‎egress_webhooks.go‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ func egressWebhooksGet() *cobra.Command {
7878
Short: "get an egress webhook",
7979
Args: cobra.ExactArgs(1),
8080
RunE: func(cmd *cobra.Command, args []string) error {
81-
id := klev.EgressWebhookID(args[0])
81+
id, err := klev.ParseEgressWebhookID(args[0])
82+
if err != nil {
83+
return err
84+
}
85+
8286
out, err := klient.EgressWebhooks.Get(cmd.Context(), id)
8387
return output(out, err)
8488
},
@@ -97,7 +101,11 @@ func egressWebhooksRotate() *cobra.Command {
97101
cmd.Flags().Int64Var(&in.ExpireSeconds, "expire-seconds", 0, "for how long the old secret is valid")
98102

99103
cmd.RunE = func(cmd *cobra.Command, args []string) error {
100-
id := klev.EgressWebhookID(args[0])
104+
id, err := klev.ParseEgressWebhookID(args[0])
105+
if err != nil {
106+
return err
107+
}
108+
101109
out, err := klient.EgressWebhooks.RotateRaw(cmd.Context(), id, in)
102110
return output(out, err)
103111
}
@@ -111,7 +119,11 @@ func egressWebhooksStatus() *cobra.Command {
111119
Short: "status an egress webhook",
112120
Args: cobra.ExactArgs(1),
113121
RunE: func(cmd *cobra.Command, args []string) error {
114-
id := klev.EgressWebhookID(args[0])
122+
id, err := klev.ParseEgressWebhookID(args[0])
123+
if err != nil {
124+
return err
125+
}
126+
115127
out, err := klient.EgressWebhooks.Status(cmd.Context(), id)
116128
return output(out, err)
117129
},
@@ -129,6 +141,11 @@ func egressWebhooksUpdate() *cobra.Command {
129141
destination := cmd.Flags().String("destination", "", "where to deliver data")
130142

131143
cmd.RunE = func(cmd *cobra.Command, args []string) error {
144+
id, err := klev.ParseEgressWebhookID(args[0])
145+
if err != nil {
146+
return err
147+
}
148+
132149
var in klev.EgressWebhookUpdateParams
133150

134151
if cmd.Flags().Changed("metadata") {
@@ -138,7 +155,6 @@ func egressWebhooksUpdate() *cobra.Command {
138155
in.Destination = destination
139156
}
140157

141-
id := klev.EgressWebhookID(args[0])
142158
out, err := klient.EgressWebhooks.UpdateRaw(cmd.Context(), id, in)
143159
return output(out, err)
144160
}
@@ -152,7 +168,11 @@ func egressWebhooksDelete() *cobra.Command {
152168
Short: "delete an egress webhook",
153169
Args: cobra.ExactArgs(1),
154170
RunE: func(cmd *cobra.Command, args []string) error {
155-
id := klev.EgressWebhookID(args[0])
171+
id, err := klev.ParseEgressWebhookID(args[0])
172+
if err != nil {
173+
return err
174+
}
175+
156176
out, err := klient.EgressWebhooks.Delete(cmd.Context(), id)
157177
return output(out, err)
158178
},

‎filters.go‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ func filtersGet() *cobra.Command {
7979
Short: "get a filter",
8080
Args: cobra.ExactArgs(1),
8181
RunE: func(cmd *cobra.Command, args []string) error {
82-
id := klev.FilterID(args[0])
82+
id, err := klev.ParseFilterID(args[0])
83+
if err != nil {
84+
return err
85+
}
86+
8387
out, err := klient.Filters.Get(cmd.Context(), id)
8488
return output(out, err)
8589
},
@@ -92,7 +96,11 @@ func filtersStatus() *cobra.Command {
9296
Short: "status of a filter",
9397
Args: cobra.ExactArgs(1),
9498
RunE: func(cmd *cobra.Command, args []string) error {
95-
id := klev.FilterID(args[0])
99+
id, err := klev.ParseFilterID(args[0])
100+
if err != nil {
101+
return err
102+
}
103+
96104
out, err := klient.Filters.Status(cmd.Context(), id)
97105
return output(out, err)
98106
},
@@ -110,6 +118,11 @@ func filtersUpdate() *cobra.Command {
110118
expression := cmd.Flags().String("expression", "", "expression to eval")
111119

112120
cmd.RunE = func(cmd *cobra.Command, args []string) error {
121+
id, err := klev.ParseFilterID(args[0])
122+
if err != nil {
123+
return err
124+
}
125+
113126
var in klev.FilterUpdateParams
114127

115128
if cmd.Flags().Changed("metadata") {
@@ -119,7 +132,6 @@ func filtersUpdate() *cobra.Command {
119132
in.Expression = expression
120133
}
121134

122-
id := klev.FilterID(args[0])
123135
out, err := klient.Filters.UpdateRaw(cmd.Context(), id, in)
124136
return output(out, err)
125137
}
@@ -132,7 +144,11 @@ func filtersDelete() *cobra.Command {
132144
Short: "delete a filter",
133145
Args: cobra.ExactArgs(1),
134146
RunE: func(cmd *cobra.Command, args []string) error {
135-
id := klev.FilterID(args[0])
147+
id, err := klev.ParseFilterID(args[0])
148+
if err != nil {
149+
return err
150+
}
151+
136152
out, err := klient.Filters.Delete(cmd.Context(), id)
137153
return output(out, err)
138154
},

‎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.7.0
6+
github.com/klev-dev/klev-api-go v0.7.1
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.7.0 h1:nZt3yRmoMsVbCM2lTXcL1smh8/3wb64JZteK+wm8a5o=
6-
github.com/klev-dev/klev-api-go v0.7.0/go.mod h1:RNe/KNgqBRjY/VYp87CwCS4wIsQMTNmdIvICEAeETR8=
5+
github.com/klev-dev/klev-api-go v0.7.1 h1:ybhgX5FPbeffhgEbHx4XAwO38LzHRD/0JefLe8KrfUc=
6+
github.com/klev-dev/klev-api-go v0.7.1/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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ func ingressWebhooksGet() *cobra.Command {
7777
Short: "get an ingress webhook",
7878
Args: cobra.ExactArgs(1),
7979
RunE: func(cmd *cobra.Command, args []string) error {
80-
id := klev.IngressWebhookID(args[0])
80+
id, err := klev.ParseIngressWebhookID(args[0])
81+
if err != nil {
82+
return err
83+
}
84+
8185
out, err := klient.IngressWebhooks.Get(cmd.Context(), id)
8286
return output(out, err)
8387
},
@@ -95,6 +99,11 @@ func ingressWebhooksUpdate() *cobra.Command {
9599
secret := cmd.Flags().String("secret", "", "the secret to validate webhook messages")
96100

97101
cmd.RunE = func(cmd *cobra.Command, args []string) error {
102+
id, err := klev.ParseIngressWebhookID(args[0])
103+
if err != nil {
104+
return err
105+
}
106+
98107
var in klev.IngressWebhookUpdateParams
99108

100109
if cmd.Flags().Changed("metadata") {
@@ -104,7 +113,6 @@ func ingressWebhooksUpdate() *cobra.Command {
104113
in.Secret = secret
105114
}
106115

107-
id := klev.IngressWebhookID(args[0])
108116
out, err := klient.IngressWebhooks.UpdateRaw(cmd.Context(), id, in)
109117
return output(out, err)
110118
}
@@ -118,7 +126,11 @@ func ingressWebhooksDelete() *cobra.Command {
118126
Short: "delete an ingress webhook",
119127
Args: cobra.ExactArgs(1),
120128
RunE: func(cmd *cobra.Command, args []string) error {
121-
id := klev.IngressWebhookID(args[0])
129+
id, err := klev.ParseIngressWebhookID(args[0])
130+
if err != nil {
131+
return err
132+
}
133+
122134
out, err := klient.IngressWebhooks.Delete(cmd.Context(), id)
123135
return output(out, err)
124136
},

‎logs.go‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ func logsGet() *cobra.Command {
7474
Short: "get a log",
7575
Args: cobra.ExactArgs(1),
7676
RunE: func(cmd *cobra.Command, args []string) error {
77-
id := klev.LogID(args[0])
77+
id, err := klev.ParseLogID(args[0])
78+
if err != nil {
79+
return err
80+
}
81+
7882
out, err := klient.Logs.Get(cmd.Context(), id)
7983
return output(out, err)
8084
},
@@ -87,7 +91,11 @@ func logsStats() *cobra.Command {
8791
Short: "stats a log",
8892
Args: cobra.ExactArgs(1),
8993
RunE: func(cmd *cobra.Command, args []string) error {
90-
id := klev.LogID(args[0])
94+
id, err := klev.ParseLogID(args[0])
95+
if err != nil {
96+
return err
97+
}
98+
9199
out, err := klient.Logs.Stats(cmd.Context(), id)
92100
return output(out, err)
93101
},
@@ -109,6 +117,11 @@ func logsUpdate() *cobra.Command {
109117
expireSeconds := cmd.Flags().Int64("expire-seconds", 0, "age of the log to expire")
110118

111119
cmd.RunE = func(cmd *cobra.Command, args []string) error {
120+
id, err := klev.ParseLogID(args[0])
121+
if err != nil {
122+
return err
123+
}
124+
112125
var in klev.LogUpdateParams
113126

114127
if cmd.Flags().Changed("metadata") {
@@ -130,7 +143,6 @@ func logsUpdate() *cobra.Command {
130143
in.ExpireSeconds = expireSeconds
131144
}
132145

133-
id := klev.LogID(args[0])
134146
out, err := klient.Logs.UpdateRaw(cmd.Context(), id, in)
135147
return output(out, err)
136148
}
@@ -144,7 +156,11 @@ func logsDelete() *cobra.Command {
144156
Short: "delete a log",
145157
Args: cobra.ExactArgs(1),
146158
RunE: func(cmd *cobra.Command, args []string) error {
147-
id := klev.LogID(args[0])
159+
id, err := klev.ParseLogID(args[0])
160+
if err != nil {
161+
return err
162+
}
163+
148164
out, err := klient.Logs.Delete(cmd.Context(), id)
149165
return output(out, err)
150166
},

‎offsets.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ func offsetsGet() *cobra.Command {
7171
Short: "get an offset",
7272
Args: cobra.ExactArgs(1),
7373
RunE: func(cmd *cobra.Command, args []string) error {
74-
id := klev.OffsetID(args[0])
74+
id, err := klev.ParseOffsetID(args[0])
75+
if err != nil {
76+
return err
77+
}
78+
7579
out, err := klient.Offsets.Get(cmd.Context(), id)
7680
return output(out, err)
7781
},
@@ -90,6 +94,11 @@ func offsetsUpdate() *cobra.Command {
9094
valueMetadata := cmd.Flags().String("value-metadata", "", "machine readable metadata for the value")
9195

9296
cmd.RunE = func(cmd *cobra.Command, args []string) error {
97+
id, err := klev.ParseOffsetID(args[0])
98+
if err != nil {
99+
return err
100+
}
101+
93102
var in klev.OffsetUpdateParams
94103

95104
if cmd.Flags().Changed("metadata") {
@@ -102,7 +111,6 @@ func offsetsUpdate() *cobra.Command {
102111
in.ValueMetadata = valueMetadata
103112
}
104113

105-
id := klev.OffsetID(args[0])
106114
out, err := klient.Offsets.UpdateRaw(cmd.Context(), id, in)
107115
return output(out, err)
108116
}
@@ -116,7 +124,11 @@ func offsetsDelete() *cobra.Command {
116124
Short: "delete an offset",
117125
Args: cobra.ExactArgs(1),
118126
RunE: func(cmd *cobra.Command, args []string) error {
119-
id := klev.OffsetID(args[0])
127+
id, err := klev.ParseOffsetID(args[0])
128+
if err != nil {
129+
return err
130+
}
131+
120132
out, err := klient.Offsets.Delete(cmd.Context(), id)
121133
return output(out, err)
122134
},

‎tokens.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ func tokensGet() *cobra.Command {
6868
Short: "get a token",
6969
Args: cobra.ExactArgs(1),
7070
RunE: func(cmd *cobra.Command, args []string) error {
71-
id := klev.TokenID(args[0])
71+
id, err := klev.ParseTokenID(args[0])
72+
if err != nil {
73+
return err
74+
}
75+
7276
out, err := klient.Tokens.Get(cmd.Context(), id)
7377
return output(out, err)
7478
},
@@ -86,6 +90,11 @@ func tokensUpdate() *cobra.Command {
8690
acl := cmd.Flags().StringArray("acl", nil, "token acl")
8791

8892
cmd.RunE = func(cmd *cobra.Command, args []string) error {
93+
id, err := klev.ParseTokenID(args[0])
94+
if err != nil {
95+
return err
96+
}
97+
8998
var in klev.TokenUpdateParams
9099

91100
if cmd.Flags().Changed("metadata") {
@@ -95,7 +104,6 @@ func tokensUpdate() *cobra.Command {
95104
in.ACL = acl
96105
}
97106

98-
id := klev.TokenID(args[0])
99107
out, err := klient.Tokens.UpdateRaw(cmd.Context(), id, in)
100108
return output(out, err)
101109
}
@@ -109,7 +117,11 @@ func tokensDelete() *cobra.Command {
109117
Short: "delete a token",
110118
Args: cobra.ExactArgs(1),
111119
RunE: func(cmd *cobra.Command, args []string) error {
112-
id := klev.TokenID(args[0])
120+
id, err := klev.ParseTokenID(args[0])
121+
if err != nil {
122+
return err
123+
}
124+
113125
out, err := klient.Tokens.Delete(cmd.Context(), id)
114126
return output(out, err)
115127
},

0 commit comments

Comments
 (0)