Skip to content

fix: retry bulk update endpoint on error #3492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sweatybridge merged 1 commit into from
Apr 27, 2025
Merged

fix: retry bulk update endpoint on error #3492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions pkg/function/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,15 @@ OUTER:
policy.Reset()
}
if len(toUpdate) > 1 {
if resp, err := s.client.V1BulkUpdateFunctionsWithResponse(ctx, s.project, toUpdate); err != nil {
return errors.Errorf("failed to bulk update: %w", err)
} else if resp.JSON200 == nil {
return errors.Errorf("unexpected bulk update status %d: %s", resp.StatusCode(), string(resp.Body))
if err := backoff.Retry(func() error {
if resp, err := s.client.V1BulkUpdateFunctionsWithResponse(ctx, s.project, toUpdate); err != nil {
return errors.Errorf("failed to bulk update: %w", err)
} else if resp.JSON200 == nil {
return errors.Errorf("unexpected bulk update status %d: %s", resp.StatusCode(), string(resp.Body))
}
return nil
}, policy); err != nil {
return err
}
}
return nil
Expand Down
61 changes: 61 additions & 0 deletions pkg/function/batch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,65 @@ func TestUpsertFunctions(t *testing.T) {
era.eszip = &MockBundler{}
})

t.Run("deploys with bulk update", func(t *testing.T) {
// Setup mock api
defer gock.OffAll()
gock.New(mockApiHost).
Get("/v1/projects/" + mockProject + "/functions").
Reply(http.StatusOK).
JSON([]api.FunctionResponse{{Slug: "test-a"}})
gock.New(mockApiHost).
Patch("/v1/projects/" + mockProject + "/functions/test-a").
Reply(http.StatusOK).
JSON(api.FunctionResponse{Slug: "test-a"})
gock.New(mockApiHost).
Post("/v1/projects/" + mockProject + "/functions/test-b").
Reply(http.StatusOK).
JSON(api.FunctionResponse{Slug: "test-b"})
gock.New(mockApiHost).
Put("/v1/projects/" + mockProject + "/functions").
ReplyError(errors.New("network error"))
gock.New(mockApiHost).
Put("/v1/projects/" + mockProject + "/functions").
Reply(http.StatusServiceUnavailable)
gock.New(mockApiHost).
Put("/v1/projects/" + mockProject + "/functions").
Reply(http.StatusOK).
JSON(api.V1BulkUpdateFunctionsResponse{})
// Run test
err := client.UpsertFunctions(context.Background(), config.FunctionConfig{
"test-a": {},
"test-b": {},
})
// Check error
assert.NoError(t, err)
assert.Empty(t, apitest.ListUnmatchedRequests())
})

t.Run("handles concurrent deploy", func(t *testing.T) {
// Setup mock api
defer gock.OffAll()
gock.New(mockApiHost).
Get("/v1/projects/" + mockProject + "/functions").
Reply(http.StatusOK).
JSON([]api.FunctionResponse{})
gock.New(mockApiHost).
Post("/v1/projects/" + mockProject + "/functions").
Reply(http.StatusBadRequest).
BodyString("Duplicated function slug")
gock.New(mockApiHost).
Patch("/v1/projects/" + mockProject + "/functions/test").
Reply(http.StatusOK).
JSON(api.FunctionResponse{Slug: "test"})
// Run test
err := client.UpsertFunctions(context.Background(), config.FunctionConfig{
"test": {},
})
// Check error
assert.NoError(t, err)
assert.Empty(t, apitest.ListUnmatchedRequests())
})

t.Run("retries on network failure", func(t *testing.T) {
// Setup mock api
defer gock.OffAll()
Expand Down Expand Up @@ -84,6 +143,7 @@ func TestUpsertFunctions(t *testing.T) {
})
// Check error
assert.NoError(t, err)
assert.Empty(t, apitest.ListUnmatchedRequests())
})

t.Run("retries on update failure", func(t *testing.T) {
Expand All @@ -109,5 +169,6 @@ func TestUpsertFunctions(t *testing.T) {
})
// Check error
assert.NoError(t, err)
assert.Empty(t, apitest.ListUnmatchedRequests())
})
}