Skip to content
This repository was archived by the owner on Dec 28, 2024. It is now read-only.

Commit a91eae1

Browse files
svix-luchosvix-lucho
authored
Upgrade svix libs and fix default endpoint version in 'create endpoint' command (#98)
* Upgrade svix lib and set endpoint version to 1 when it is not specified * Add command context with timeout * Use correct patterns * a bit more refactoring
1 parent 8ae69bc commit a91eae1

File tree

13 files changed

+87
-61
lines changed

13 files changed

+87
-61
lines changed

‎cmd/application.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ type applicationCmd struct {
1616
}
1717

1818
func newApplicationCmd() *applicationCmd {
19-
2019
ac := &applicationCmd{}
2120
ac.cmd = &cobra.Command{
2221
Use: "application",
@@ -31,7 +30,7 @@ func newApplicationCmd() *applicationCmd {
3130
Run: func(cmd *cobra.Command, args []string) {
3231
printer := pretty.NewPrinter(getPrinterOptions(cmd))
3332
svixClient := getSvixClientOrExit()
34-
l, err := svixClient.Application.List(getApplicationListOptions(cmd))
33+
l, err := svixClient.Application.List(cmd.Context(), getApplicationListOptions(cmd))
3534
printer.CheckErr(err)
3635

3736
printer.Print(l)
@@ -95,7 +94,7 @@ Example Schema:
9594
}
9695

9796
svixClient := getSvixClientOrExit()
98-
out, err := svixClient.Application.Create(&app)
97+
out, err := svixClient.Application.Create(cmd.Context(), &app)
9998
printer.CheckErr(err)
10099

101100
printer.Print(out)
@@ -117,7 +116,7 @@ Example Schema:
117116
appID := args[0]
118117

119118
svixClient := getSvixClientOrExit()
120-
out, err := svixClient.Application.Get(appID)
119+
out, err := svixClient.Application.Get(cmd.Context(), appID)
121120
printer.CheckErr(err)
122121

123122
printer.Print(out)
@@ -175,7 +174,7 @@ Example Schema:
175174
}
176175

177176
svixClient := getSvixClientOrExit()
178-
out, err := svixClient.Application.Update(appID, &app)
177+
out, err := svixClient.Application.Update(cmd.Context(), appID, &app)
179178
printer.CheckErr(err)
180179

181180
printer.Print(out)
@@ -200,7 +199,7 @@ Example Schema:
200199

201200
utils.Confirm(fmt.Sprintf("Are you sure you want to delete the app with id: %s", appID))
202201

203-
err := svixClient.Application.Delete(appID)
202+
err := svixClient.Application.Delete(cmd.Context(), appID)
204203
printer.CheckErr(err)
205204

206205
fmt.Printf("Application \"%s\" Deleted!\n", appID)

‎cmd/authentication.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func newAuthenticationCmd() *authenticationCmd {
3434
printer := pretty.NewPrinter(getPrinterOptions(cmd))
3535

3636
svixClient := getSvixClientOrExit()
37-
da, err := svixClient.Authentication.DashboardAccess(appID)
37+
da, err := svixClient.Authentication.DashboardAccess(cmd.Context(), appID)
3838
printer.CheckErr(err)
3939

4040
printer.Print(da)
@@ -52,7 +52,7 @@ func newAuthenticationCmd() *authenticationCmd {
5252
printer := pretty.NewPrinter(getPrinterOptions(cmd))
5353

5454
svixClient := svix.New(authToken, getSvixClientOptsOrExit())
55-
err := svixClient.Authentication.Logout()
55+
err := svixClient.Authentication.Logout(cmd.Context())
5656
printer.CheckErr(err)
5757
},
5858
}
@@ -84,7 +84,7 @@ func newAuthenticationCmd() *authenticationCmd {
8484
}
8585

8686
svixClient := getSvixClientOrExit()
87-
out, err := svixClient.Authentication.AppPortalAccess(appID, &appPortalAccessIn)
87+
out, err := svixClient.Authentication.AppPortalAccess(cmd.Context(), appID, &appPortalAccessIn)
8888

8989
printer.CheckErr(err)
9090
printer.Print(out)

‎cmd/endpoint.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func newEndpointCmd() *endpointCmd {
3333
appID := args[0]
3434

3535
svixClient := getSvixClientOrExit()
36-
l, err := svixClient.Endpoint.List(appID, getEndpointListOptions(cmd))
36+
l, err := svixClient.Endpoint.List(cmd.Context(), appID, getEndpointListOptions(cmd))
3737
printer.CheckErr(err)
3838

3939
printer.Print(l)
@@ -56,7 +56,7 @@ func newEndpointCmd() *endpointCmd {
5656
Example Schema:
5757
{
5858
"url": "string",
59-
"version": 0,
59+
"version": 1,
6060
"description": "",
6161
"filterTypes": [
6262
"string"
@@ -90,11 +90,6 @@ Example Schema:
9090
printer.CheckErr(err)
9191
ep.Url = urlFlag
9292
}
93-
if cmd.Flags().Changed(versionFlagName) {
94-
versionFlag, err := cmd.Flags().GetInt32(versionFlagName)
95-
printer.CheckErr(err)
96-
ep.Version = versionFlag
97-
}
9893
if cmd.Flags().Changed(filterTypesFlagName) {
9994
filterTypesFlag, err := cmd.Flags().GetStringArray(filterTypesFlagName)
10095
printer.CheckErr(err)
@@ -110,16 +105,19 @@ Example Schema:
110105
printer.CheckErr(err)
111106
ep.Disabled = &disabledFlag
112107
}
108+
versionFlag, err := cmd.Flags().GetInt32(versionFlagName)
109+
printer.CheckErr(err)
110+
ep.Version = versionFlag
113111

114112
svixClient := getSvixClientOrExit()
115-
out, err := svixClient.Endpoint.Create(appID, &ep)
113+
out, err := svixClient.Endpoint.Create(cmd.Context(), appID, &ep)
116114
printer.CheckErr(err)
117115

118116
printer.Print(out)
119117
},
120118
}
121119
create.Flags().String(urlFlagName, "", "")
122-
create.Flags().Int32(versionFlagName, 0, "")
120+
create.Flags().Int32(versionFlagName, 1, "")
123121
create.Flags().StringArray(filterTypesFlagName, []string{}, "")
124122
create.Flags().Int32(rateLimitFlagName, 0, "Rate Limit of the endpoint (optional)")
125123
create.Flags().Bool(disabledFlagName, false, "")
@@ -137,7 +135,7 @@ Example Schema:
137135
endpointID := args[1]
138136

139137
svixClient := getSvixClientOrExit()
140-
out, err := svixClient.Endpoint.Get(appID, endpointID)
138+
out, err := svixClient.Endpoint.Get(cmd.Context(), appID, endpointID)
141139
printer.CheckErr(err)
142140

143141
printer.Print(out)
@@ -153,7 +151,7 @@ Example Schema:
153151
Example Schema:
154152
{
155153
"url": "string",
156-
"version": 0,
154+
"version": 1,
157155
"description": "",
158156
"filterTypes": [
159157
"string"
@@ -210,14 +208,14 @@ Example Schema:
210208
}
211209

212210
svixClient := getSvixClientOrExit()
213-
out, err := svixClient.Endpoint.Update(appID, endpointID, &ep)
211+
out, err := svixClient.Endpoint.Update(cmd.Context(), appID, endpointID, &ep)
214212
printer.CheckErr(err)
215213

216214
printer.Print(out)
217215
},
218216
}
219217
update.Flags().String(urlFlagName, "", "")
220-
update.Flags().Int32(versionFlagName, 0, "")
218+
update.Flags().Int32(versionFlagName, 1, "")
221219
update.Flags().StringArray(filterTypesFlagName, []string{}, "")
222220
update.Flags().Int32(rateLimitFlagName, 0, "Rate Limit of the endpoint (optional)")
223221
update.Flags().Bool(disabledFlagName, false, "")
@@ -237,7 +235,7 @@ Example Schema:
237235
utils.Confirm(fmt.Sprintf("Are you sure you want to delete the the endpoint with id: %s", endpointID))
238236

239237
svixClient := getSvixClientOrExit()
240-
err := svixClient.Endpoint.Delete(appID, endpointID)
238+
err := svixClient.Endpoint.Delete(cmd.Context(), appID, endpointID)
241239
printer.CheckErr(err)
242240

243241
fmt.Printf("Endpoint \"%s\" Deleted!\n", endpointID)
@@ -257,7 +255,7 @@ Example Schema:
257255
endpointID := args[1]
258256

259257
svixClient := getSvixClientOrExit()
260-
out, err := svixClient.Endpoint.GetSecret(appID, endpointID)
258+
out, err := svixClient.Endpoint.GetSecret(cmd.Context(), appID, endpointID)
261259
printer.CheckErr(err)
262260

263261
printer.Print(out)
@@ -277,7 +275,7 @@ Example Schema:
277275
endpointID := args[1]
278276

279277
svixClient := getSvixClientOrExit()
280-
out, err := svixClient.Endpoint.GetHeaders(appID, endpointID)
278+
out, err := svixClient.Endpoint.GetHeaders(cmd.Context(), appID, endpointID)
281279
printer.CheckErr(err)
282280

283281
printer.Print(out)
@@ -311,7 +309,7 @@ Example Schema:
311309
}
312310

313311
svixClient := getSvixClientOrExit()
314-
err := svixClient.Endpoint.UpdateHeaders(appID, endpointID, &headersIn)
312+
err := svixClient.Endpoint.UpdateHeaders(cmd.Context(), appID, endpointID, &headersIn)
315313
printer.CheckErr(err)
316314
},
317315
}
@@ -343,7 +341,7 @@ Example Schema:
343341
}
344342

345343
svixClient := getSvixClientOrExit()
346-
err := svixClient.Endpoint.PatchHeaders(appID, endpointID, &headersIn)
344+
err := svixClient.Endpoint.PatchHeaders(cmd.Context(), appID, endpointID, &headersIn)
347345
printer.CheckErr(err)
348346
},
349347
}

‎cmd/event.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func newEventTypeCmd() *eventTypeCmd {
3030
printer := pretty.NewPrinter(getPrinterOptions(cmd))
3131

3232
svixClient := getSvixClientOrExit()
33-
l, err := svixClient.EventType.List(getEventListOptions(cmd))
33+
l, err := svixClient.EventType.List(cmd.Context(), getEventListOptions(cmd))
3434
printer.CheckErr(err)
3535

3636
printer.Print(l)
@@ -84,7 +84,7 @@ Example Schema:
8484
}
8585

8686
svixClient := getSvixClientOrExit()
87-
out, err := svixClient.EventType.Create(&et)
87+
out, err := svixClient.EventType.Create(cmd.Context(), &et)
8888
printer.CheckErr(err)
8989

9090
printer.Print(out)
@@ -133,7 +133,7 @@ Example Schema:
133133
}
134134

135135
svixClient := getSvixClientOrExit()
136-
out, err := svixClient.EventType.Update(eventName, &et)
136+
out, err := svixClient.EventType.Update(cmd.Context(), eventName, &et)
137137
printer.CheckErr(err)
138138

139139
printer.Print(out)
@@ -155,7 +155,7 @@ Example Schema:
155155
utils.Confirm(fmt.Sprintf("Are you sure you want to delete the the event with id: %s", eventID))
156156

157157
svixClient := getSvixClientOrExit()
158-
err := svixClient.EventType.Delete(eventID)
158+
err := svixClient.EventType.Delete(cmd.Context(), eventID)
159159
printer.CheckErr(err)
160160

161161
fmt.Printf("Event Type \"%s\" Deleted!\n", eventID)

‎cmd/export.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cmd
22

33
import (
4+
"context"
45
"encoding/json"
56
"flag"
67
"io"
@@ -40,7 +41,7 @@ Json Format:
4041
printer := pretty.NewPrinter(getPrinterOptions(cmd))
4142
svixClient := getSvixClientOrExit()
4243

43-
eventTypes, err := inout.GetAllEventTypes(svixClient)
44+
eventTypes, err := inout.GetAllEventTypes(context.Background(), svixClient)
4445
printer.CheckErr(err)
4546

4647
var outStream io.Writer = printer

‎cmd/import.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cmd
22

33
import (
4+
"context"
45
"flag"
56
"fmt"
67
"io"
@@ -67,10 +68,10 @@ Json Format:
6768
fileType := getOrInferFileType(fileName)
6869
switch fileType {
6970
case "csv":
70-
err := inout.ImportEventTypesCsv(svixClient, reader, force)
71+
err := inout.ImportEventTypesCsv(context.Background(), svixClient, reader, force)
7172
printer.CheckErr(err)
7273
default:
73-
err := inout.ImportEventTypesJson(svixClient, reader, force)
74+
err := inout.ImportEventTypesJson(context.Background(), svixClient, reader, force)
7475
printer.CheckErr(err)
7576
}
7677
},

‎cmd/integration.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func newIntegrationCmd() *integrationCmd {
3434

3535
appID := args[0]
3636

37-
l, err := svixClient.Integration.List(appID, getIntegrationListOptions(cmd))
37+
l, err := svixClient.Integration.List(cmd.Context(), appID, getIntegrationListOptions(cmd))
3838
printer.CheckErr(err)
3939

4040
printer.Print(l)
@@ -89,7 +89,7 @@ Example Schema:
8989
}
9090

9191
svixClient := getSvixClientOrExit()
92-
out, err := svixClient.Integration.Create(appID, &integration)
92+
out, err := svixClient.Integration.Create(cmd.Context(), appID, &integration)
9393
printer.CheckErr(err)
9494

9595
printer.Print(out)
@@ -110,7 +110,7 @@ Example Schema:
110110
appID := args[0]
111111
integrationID := args[1]
112112

113-
l, err := svixClient.Integration.Get(appID, integrationID)
113+
l, err := svixClient.Integration.Get(cmd.Context(), appID, integrationID)
114114
printer.CheckErr(err)
115115

116116
printer.Print(l)
@@ -164,7 +164,7 @@ Example Schema:
164164
}
165165

166166
svixClient := getSvixClientOrExit()
167-
out, err := svixClient.Integration.Update(appID, integrationID, &integration)
167+
out, err := svixClient.Integration.Update(cmd.Context(), appID, integrationID, &integration)
168168
printer.CheckErr(err)
169169

170170
printer.Print(out)
@@ -185,7 +185,7 @@ Example Schema:
185185
appID := args[0]
186186
integrationID := args[1]
187187

188-
err := svixClient.Integration.Delete(appID, integrationID)
188+
err := svixClient.Integration.Delete(cmd.Context(), appID, integrationID)
189189
printer.CheckErr(err)
190190
},
191191
}
@@ -203,7 +203,7 @@ Example Schema:
203203
appID := args[0]
204204
integrationID := args[1]
205205

206-
l, err := svixClient.Integration.GetKey(appID, integrationID)
206+
l, err := svixClient.Integration.GetKey(cmd.Context(), appID, integrationID)
207207
printer.CheckErr(err)
208208

209209
printer.Print(l)
@@ -223,7 +223,7 @@ Example Schema:
223223
appID := args[0]
224224
integrationID := args[1]
225225

226-
l, err := svixClient.Integration.RotateKey(appID, integrationID)
226+
l, err := svixClient.Integration.RotateKey(cmd.Context(), appID, integrationID)
227227
printer.CheckErr(err)
228228

229229
printer.Print(l)

‎cmd/message.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func newMessageCmd() *messageCmd {
3737

3838
opts, err := getMessageFilterFlags(cmd)
3939
printer.CheckErr(err)
40-
l, err := svixClient.Message.List(appID, opts)
40+
l, err := svixClient.Message.List(cmd.Context(), appID, opts)
4141
printer.CheckErr(err)
4242

4343
printer.Print(l)
@@ -109,7 +109,7 @@ Example Schema:
109109
}
110110

111111
svixClient := getSvixClientOrExit()
112-
out, err := svixClient.Message.Create(appID, &msg)
112+
out, err := svixClient.Message.Create(cmd.Context(), appID, &msg)
113113
printer.CheckErr(err)
114114

115115
printer.Print(out)
@@ -131,7 +131,7 @@ Example Schema:
131131
msgID := args[1]
132132

133133
svixClient := getSvixClientOrExit()
134-
out, err := svixClient.Message.Get(appID, msgID)
134+
out, err := svixClient.Message.Get(cmd.Context(), appID, msgID)
135135
printer.CheckErr(err)
136136

137137
printer.Print(out)

0 commit comments

Comments
 (0)