Skip to content

Commit c2af491

Browse files
committed
fix after code review
1 parent 7b003f8 commit c2af491

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

internal/api/handlers/update.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func HandleCheckUpgradable(updater *update.Manager) http.HandlerFunc {
4343
pkgs, err := updater.ListUpgradablePackages(r.Context(), filterFunc)
4444
if err != nil {
4545
code := update.GetUpdateErrorCode(err)
46-
if code == update.OperationInProgress {
46+
if code == update.OperationInProgressCode {
4747
render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{
4848
Code: string(code),
4949
Details: err.Error(),
@@ -85,7 +85,7 @@ func HandleUpdateApply(updater *update.Manager) http.HandlerFunc {
8585
pkgs, err := updater.ListUpgradablePackages(r.Context(), filterFunc)
8686
if err != nil {
8787
code := update.GetUpdateErrorCode(err)
88-
if code == update.OperationInProgress {
88+
if code == update.OperationInProgressCode {
8989
render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{
9090
Code: string(code),
9191
Details: err.Error(),
@@ -107,7 +107,7 @@ func HandleUpdateApply(updater *update.Manager) http.HandlerFunc {
107107
err = updater.UpgradePackages(r.Context(), pkgs)
108108
if err != nil {
109109
code := update.GetUpdateErrorCode(err)
110-
if code == update.OperationInProgress {
110+
if code == update.OperationInProgressCode {
111111
render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{
112112
Code: string(code),
113113
Details: err.Error(),
@@ -148,7 +148,7 @@ func HandleUpdateEvents(updater *update.Manager) http.HandlerFunc {
148148
if event.Type == update.ErrorEvent {
149149
err := event.GetError()
150150
code := render.InternalServiceErr
151-
if c := update.GetUpdateErrorCode(err); c != update.UnknownError {
151+
if c := update.GetUpdateErrorCode(err); c != update.UnknownErrorCode {
152152
code = render.SSEErrCode(string(c))
153153
}
154154
sseStream.SendError(render.SSEErrorData{

internal/update/errors.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ const (
1313

1414
var (
1515
ErrOperationAlreadyInProgress = &UpdateError{
16-
Code: OperationInProgress,
16+
Code: OperationInProgressCode,
1717
Details: "an operation is already in progress",
1818
}
1919
ErrNoInternetConnection = &UpdateError{
20-
Code: NoInternetConnection,
20+
Code: NoInternetConnectionCode,
2121
Details: "no internet connection available",
2222
}
2323
)
@@ -51,5 +51,5 @@ func GetUpdateErrorCode(err error) ErrorCode {
5151
return updateError.Code
5252
}
5353
}
54-
return UnknownError
54+
return UnknownErrorCode
5555
}

internal/update/errors_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
func TestUpdateError(t *testing.T) {
1212
t.Run("known error", func(t *testing.T) {
1313
var err error = &UpdateError{
14-
Code: NoInternetConnection,
14+
Code: NoInternetConnectionCode,
1515
Details: "no internet connection available",
1616
}
1717
assert.Equal(t, "no internet connection available", err.Error())
1818
assert.Equal(t, "no internet connection available", fmt.Sprintf("%s", err))
19-
assert.Equal(t, NoInternetConnection, GetUpdateErrorCode(err))
19+
assert.Equal(t, NoInternetConnectionCode, GetUpdateErrorCode(err))
2020
})
2121

2222
t.Run("unknown error", func(t *testing.T) {
@@ -27,6 +27,6 @@ func TestUpdateError(t *testing.T) {
2727
assert.Equal(t, "underlying error", fmt.Sprintf("%s", updateErr))
2828
assert.Equal(t, underlyingErr, errors.Unwrap(updateErr))
2929
assert.True(t, errors.Is(updateErr, underlyingErr))
30-
assert.Equal(t, UnknownError, GetUpdateErrorCode(updateErr))
30+
assert.Equal(t, UnknownErrorCode, GetUpdateErrorCode(updateErr))
3131
})
3232
}

0 commit comments

Comments
 (0)