root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 266 Packages Projects Releases Wiki Activity

Cloud migrations: return errutil.Error in http responses (#87448)

This commit is contained in:
Bruno 2024-05-13 01:22:46 -03:00 committed by GitHub
parent 6a3ab71d77
commit 14ccf7f6d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/services/cloudmigration/api/api.go
View File

@ -69,7 +69,7 @@ func (cma *CloudMigrationAPI) CreateToken(c *contextmodel.ReqContext) response.R
resp, err := cma.cloudMigrationService.CreateToken(ctx) resp, err := cma.cloudMigrationService.CreateToken(ctx)
if err != nil { if err != nil {
logger.Error("creating gcom access token", "err", err.Error()) logger.Error("creating gcom access token", "err", err.Error())
return response.Error(http.StatusInternalServerError, "creating gcom access token", err) return response.ErrOrFallback(http.StatusInternalServerError, "creating gcom access token", err)
} }
return response.JSON(http.StatusOK, CreateAccessTokenResponseDTO(resp)) return response.JSON(http.StatusOK, CreateAccessTokenResponseDTO(resp))
@ -90,7 +90,7 @@ func (cma *CloudMigrationAPI) GetMigrationList(c *contextmodel.ReqContext) respo
cloudMigrations, err := cma.cloudMigrationService.GetMigrationList(ctx) cloudMigrations, err := cma.cloudMigrationService.GetMigrationList(ctx)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "migration list error", err) return response.ErrOrFallback(http.StatusInternalServerError, "migration list error", err)
} }
return response.JSON(http.StatusOK, cloudMigrations) return response.JSON(http.StatusOK, cloudMigrations)
@ -118,7 +118,7 @@ func (cma *CloudMigrationAPI) GetMigration(c *contextmodel.ReqContext) response.
cloudMigration, err := cma.cloudMigrationService.GetMigration(ctx, uid) cloudMigration, err := cma.cloudMigrationService.GetMigration(ctx, uid)
if err != nil { if err != nil {
return response.Error(http.StatusNotFound, "migration not found", err) return response.ErrOrFallback(http.StatusNotFound, "migration not found", err)
} }
return response.JSON(http.StatusOK, cloudMigration) return response.JSON(http.StatusOK, cloudMigration)
} }
@ -146,11 +146,11 @@ func (cma *CloudMigrationAPI) CreateMigration(c *contextmodel.ReqContext) respon
cmd := cloudmigration.CloudMigrationRequest{} cmd := cloudmigration.CloudMigrationRequest{}
if err := web.Bind(c.Req, &cmd); err != nil { if err := web.Bind(c.Req, &cmd); err != nil {
return response.Error(http.StatusBadRequest, "bad request data", err) return response.ErrOrFallback(http.StatusBadRequest, "bad request data", err)
} }
cloudMigration, err := cma.cloudMigrationService.CreateMigration(ctx, cmd) cloudMigration, err := cma.cloudMigrationService.CreateMigration(ctx, cmd)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "migration creation error", err) return response.ErrOrFallback(http.StatusInternalServerError, "migration creation error", err)
} }
return response.JSON(http.StatusOK, cloudMigration) return response.JSON(http.StatusOK, cloudMigration)
} }
@ -172,12 +172,12 @@ func (cma *CloudMigrationAPI) RunMigration(c *contextmodel.ReqContext) response.
uid := web.Params(c.Req)[":uid"] uid := web.Params(c.Req)[":uid"]
if err := util.ValidateUID(uid); err != nil { if err := util.ValidateUID(uid); err != nil {
return response.Error(http.StatusBadRequest, "invalid migration uid", err) return response.ErrOrFallback(http.StatusBadRequest, "invalid migration uid", err)
} }
result, err := cma.cloudMigrationService.RunMigration(ctx, uid) result, err := cma.cloudMigrationService.RunMigration(ctx, uid)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "migration run error", err) return response.ErrOrFallback(http.StatusInternalServerError, "migration run error", err)
} }
return response.JSON(http.StatusOK, result) return response.JSON(http.StatusOK, result)
@ -206,12 +206,12 @@ func (cma *CloudMigrationAPI) GetMigrationRun(c *contextmodel.ReqContext) respon
runUid := web.Params(c.Req)[":runUID"] runUid := web.Params(c.Req)[":runUID"]
if err := util.ValidateUID(runUid); err != nil { if err := util.ValidateUID(runUid); err != nil {
return response.Error(http.StatusBadRequest, "invalid runUID", err) return response.ErrOrFallback(http.StatusBadRequest, "invalid runUID", err)
} }
migrationStatus, err := cma.cloudMigrationService.GetMigrationStatus(ctx, runUid) migrationStatus, err := cma.cloudMigrationService.GetMigrationStatus(ctx, runUid)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "migration status error", err) return response.ErrOrFallback(http.StatusInternalServerError, "migration status error", err)
} }
runResponse, err := migrationStatus.ToResponse() runResponse, err := migrationStatus.ToResponse()
@ -246,12 +246,12 @@ func (cma *CloudMigrationAPI) GetMigrationRunList(c *contextmodel.ReqContext) re
uid := web.Params(c.Req)[":uid"] uid := web.Params(c.Req)[":uid"]
if err := util.ValidateUID(uid); err != nil { if err := util.ValidateUID(uid); err != nil {
return response.Error(http.StatusBadRequest, "invalid migration uid", err) return response.ErrOrFallback(http.StatusBadRequest, "invalid migration uid", err)
} }
runList, err := cma.cloudMigrationService.GetMigrationRunList(ctx, uid) runList, err := cma.cloudMigrationService.GetMigrationRunList(ctx, uid)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "list migration status error", err) return response.ErrOrFallback(http.StatusInternalServerError, "list migration status error", err)
} }
return response.JSON(http.StatusOK, runList) return response.JSON(http.StatusOK, runList)
@ -280,12 +280,12 @@ func (cma *CloudMigrationAPI) DeleteMigration(c *contextmodel.ReqContext) respon
uid := web.Params(c.Req)[":uid"] uid := web.Params(c.Req)[":uid"]
if err := util.ValidateUID(uid); err != nil { if err := util.ValidateUID(uid); err != nil {
return response.Error(http.StatusBadRequest, "invalid migration uid", err) return response.ErrOrFallback(http.StatusBadRequest, "invalid migration uid", err)
} }
_, err := cma.cloudMigrationService.DeleteMigration(ctx, uid) _, err := cma.cloudMigrationService.DeleteMigration(ctx, uid)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "migration delete error", err) return response.ErrOrFallback(http.StatusInternalServerError, "migration delete error", err)
} }
return response.Empty(http.StatusOK) return response.Empty(http.StatusOK)
} }

2
pkg/services/cloudmigration/cloudmigrationimpl/xorm_store.go
View File

@ -110,7 +110,7 @@ func (ss *sqlStore) DeleteMigration(ctx context.Context, uid string) (*cloudmigr
ID: id, ID: id,
}) })
if affected == 0 { if affected == 0 {
return cloudmigration.ErrMigrationNotDeleted.Errorf("0 affected rows for id %d", id) return cloudmigration.ErrMigrationNotDeleted
} }
return err return err
}) })

10
pkg/services/cloudmigration/model.go
View File

@ -9,11 +9,11 @@ import (
) )
var ( var (
ErrInternalNotImplementedError = errutil.Internal("cloudmigrations.notImplemented", errutil.WithPublicMessage("Internal server error")) ErrInternalNotImplementedError = errutil.Internal("cloudmigrations.notImplemented").Errorf("Internal server error")
ErrFeatureDisabledError = errutil.Internal("cloudmigrations.disabled", errutil.WithPublicMessage("Cloud migrations are disabled on this instance")) ErrFeatureDisabledError = errutil.Internal("cloudmigrations.disabled").Errorf("Cloud migrations are disabled on this instance")
ErrMigrationNotFound = errutil.NotFound("cloudmigrations.migrationNotFound", errutil.WithPublicMessage("Migration not found")) ErrMigrationNotFound = errutil.NotFound("cloudmigrations.migrationNotFound").Errorf("Migration not found")
ErrMigrationRunNotFound = errutil.NotFound("cloudmigrations.migrationRunNotFound", errutil.WithPublicMessage("Migration run not found")) ErrMigrationRunNotFound = errutil.NotFound("cloudmigrations.migrationRunNotFound").Errorf("Migration run not found")
ErrMigrationNotDeleted = errutil.Internal("cloudmigrations.migrationNotDeleted", errutil.WithPublicMessage("Migration not deleted")) ErrMigrationNotDeleted = errutil.Internal("cloudmigrations.migrationNotDeleted").Errorf("Migration not deleted")
) )
// CloudMigration api dtos // CloudMigration api dtos