From 595590e611a09aebb11f5653bef256698b2d4230 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Fri, 5 Apr 2019 16:33:00 +0200 Subject: [PATCH] api: use httpError helper everywhere --- internal/services/configstore/api/org.go | 14 ++--- internal/services/configstore/api/project.go | 9 ++-- .../services/configstore/api/projectgroup.go | 27 ++++++---- .../services/configstore/api/remotesource.go | 21 +++++--- internal/services/configstore/api/secret.go | 15 ++++-- internal/services/configstore/api/user.go | 26 +++++----- internal/services/configstore/api/variable.go | 9 ++-- internal/services/gateway/api/oauth2.go | 3 +- internal/services/gateway/api/org.go | 30 +++++++---- internal/services/gateway/api/project.go | 12 ++--- internal/services/gateway/api/projectgroup.go | 14 ++--- internal/services/gateway/api/remotesource.go | 15 ++++-- internal/services/gateway/api/repos.go | 9 ++-- internal/services/gateway/api/run.go | 27 ++++++---- internal/services/gateway/api/secret.go | 9 ++-- internal/services/gateway/api/user.go | 52 ++++++++++++------- internal/services/gateway/api/variable.go | 10 ++-- 17 files changed, 190 insertions(+), 112 deletions(-) diff --git a/internal/services/configstore/api/org.go b/internal/services/configstore/api/org.go index 41e1a80..783cfec 100644 --- a/internal/services/configstore/api/org.go +++ b/internal/services/configstore/api/org.go @@ -49,7 +49,7 @@ func (h *OrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { }) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -60,7 +60,7 @@ func (h *OrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := json.NewEncoder(w).Encode(org); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -86,7 +86,7 @@ func (h *OrgByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { }) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -97,7 +97,7 @@ func (h *OrgByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := json.NewEncoder(w).Encode(org); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -129,7 +129,7 @@ func (h *CreateOrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := json.NewEncoder(w).Encode(org); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -205,13 +205,13 @@ func (h *OrgsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { }) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } if err := json.NewEncoder(w).Encode(orgs); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } diff --git a/internal/services/configstore/api/project.go b/internal/services/configstore/api/project.go index 80dcca1..5ebc943 100644 --- a/internal/services/configstore/api/project.go +++ b/internal/services/configstore/api/project.go @@ -64,7 +64,8 @@ func (h *ProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -74,7 +75,8 @@ func (h *ProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(project); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -106,7 +108,8 @@ func (h *CreateProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(project); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/configstore/api/projectgroup.go b/internal/services/configstore/api/projectgroup.go index a371c52..a1a13bb 100644 --- a/internal/services/configstore/api/projectgroup.go +++ b/internal/services/configstore/api/projectgroup.go @@ -52,7 +52,8 @@ func (h *ProjectGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -62,7 +63,8 @@ func (h *ProjectGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(projectGroup); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -90,7 +92,8 @@ func (h *ProjectGroupProjectsHandler) ServeHTTP(w http.ResponseWriter, r *http.R return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -106,12 +109,14 @@ func (h *ProjectGroupProjectsHandler) ServeHTTP(w http.ResponseWriter, r *http.R return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } if err := json.NewEncoder(w).Encode(projects); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -139,7 +144,8 @@ func (h *ProjectGroupSubgroupsHandler) ServeHTTP(w http.ResponseWriter, r *http. return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -155,12 +161,14 @@ func (h *ProjectGroupSubgroupsHandler) ServeHTTP(w http.ResponseWriter, r *http. return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } if err := json.NewEncoder(w).Encode(projectGroups); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -192,7 +200,8 @@ func (h *CreateProjectGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Req } if err := json.NewEncoder(w).Encode(projectGroup); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/configstore/api/remotesource.go b/internal/services/configstore/api/remotesource.go index 61254f0..a916bd8 100644 --- a/internal/services/configstore/api/remotesource.go +++ b/internal/services/configstore/api/remotesource.go @@ -48,7 +48,8 @@ func (h *RemoteSourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -58,7 +59,8 @@ func (h *RemoteSourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(remoteSource); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -83,7 +85,8 @@ func (h *RemoteSourceByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Req return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -93,7 +96,8 @@ func (h *RemoteSourceByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Req } if err := json.NewEncoder(w).Encode(remoteSource); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -125,7 +129,8 @@ func (h *CreateRemoteSourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Req } if err := json.NewEncoder(w).Encode(remoteSource); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -194,12 +199,14 @@ func (h *RemoteSourcesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) remoteSources, err := h.readDB.GetRemoteSources(start, limit, asc) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } if err := json.NewEncoder(w).Encode(remoteSources); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/configstore/api/secret.go b/internal/services/configstore/api/secret.go index 15a22a3..e535c42 100644 --- a/internal/services/configstore/api/secret.go +++ b/internal/services/configstore/api/secret.go @@ -47,7 +47,8 @@ func (h *SecretHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -57,7 +58,8 @@ func (h *SecretHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(secret); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -104,12 +106,14 @@ func (h *SecretsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } if err := json.NewEncoder(w).Encode(secrets); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -149,7 +153,8 @@ func (h *CreateSecretHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(secret); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/configstore/api/user.go b/internal/services/configstore/api/user.go index 2d5d7d7..c76e7c7 100644 --- a/internal/services/configstore/api/user.go +++ b/internal/services/configstore/api/user.go @@ -50,7 +50,7 @@ func (h *UserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { }) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -61,7 +61,7 @@ func (h *UserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := json.NewEncoder(w).Encode(user); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -87,7 +87,7 @@ func (h *UserByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { }) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -98,7 +98,7 @@ func (h *UserByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := json.NewEncoder(w).Encode(user); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -150,7 +150,7 @@ func (h *CreateUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if err := json.NewEncoder(w).Encode(user); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -234,7 +234,7 @@ func (h *UsersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { h.log.Infof("user: %s", util.Dump(user)) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } if user == nil { @@ -253,7 +253,7 @@ func (h *UsersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { h.log.Infof("user: %s", util.Dump(user)) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } if user == nil { @@ -273,7 +273,7 @@ func (h *UsersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { h.log.Infof("user: %s", util.Dump(user)) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } if user == nil { @@ -290,14 +290,14 @@ func (h *UsersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { }) if err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } if err := json.NewEncoder(w).Encode(users); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -349,7 +349,7 @@ func (h *CreateUserLAHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) if err := json.NewEncoder(w).Encode(user); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -422,7 +422,7 @@ func (h *UpdateUserLAHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) if err := json.NewEncoder(w).Encode(user); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -467,7 +467,7 @@ func (h *CreateUserTokenHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques } if err := json.NewEncoder(w).Encode(resp); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } diff --git a/internal/services/configstore/api/variable.go b/internal/services/configstore/api/variable.go index ab45c4c..6ed0557 100644 --- a/internal/services/configstore/api/variable.go +++ b/internal/services/configstore/api/variable.go @@ -70,12 +70,14 @@ func (h *VariablesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return err }) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } if err := json.NewEncoder(w).Encode(variables); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -117,7 +119,8 @@ func (h *CreateVariableHandler) ServeHTTP(w http.ResponseWriter, r *http.Request } if err := json.NewEncoder(w).Encode(variable); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/oauth2.go b/internal/services/gateway/api/oauth2.go index 9f04b02..235897a 100644 --- a/internal/services/gateway/api/oauth2.go +++ b/internal/services/gateway/api/oauth2.go @@ -83,7 +83,8 @@ func (h *OAuth2CallbackHandler) ServeHTTP(w http.ResponseWriter, r *http.Request Response: response, } if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/org.go b/internal/services/gateway/api/org.go index 4122496..68eebd9 100644 --- a/internal/services/gateway/api/org.go +++ b/internal/services/gateway/api/org.go @@ -60,7 +60,8 @@ func (h *CreateOrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(org); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -106,7 +107,8 @@ func (h *DeleteOrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -136,13 +138,15 @@ func (h *CurrentOrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createOrgResponse(org) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -167,13 +171,15 @@ func (h *OrgHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createOrgResponse(org) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -198,13 +204,15 @@ func (h *OrgByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createOrgResponse(org) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -270,7 +278,8 @@ func (h *OrgsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -283,7 +292,8 @@ func (h *OrgsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(orgsResponse); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/project.go b/internal/services/gateway/api/project.go index 854b590..bb12050 100644 --- a/internal/services/gateway/api/project.go +++ b/internal/services/gateway/api/project.go @@ -84,7 +84,7 @@ func (h *CreateProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) res := createProjectResponse(project) if err := json.NewEncoder(w).Encode(res); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -111,7 +111,7 @@ func (h *ProjectReconfigHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques if err := h.ch.ReconfigProject(ctx, projectID); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -141,7 +141,7 @@ func (h *DeleteProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) return } h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -152,7 +152,7 @@ func (h *DeleteProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) return } h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -182,14 +182,14 @@ func (h *ProjectHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } res := createProjectResponse(project) if err := json.NewEncoder(w).Encode(res); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/projectgroup.go b/internal/services/gateway/api/projectgroup.go index aa85d1a..b46dd80 100644 --- a/internal/services/gateway/api/projectgroup.go +++ b/internal/services/gateway/api/projectgroup.go @@ -76,7 +76,7 @@ func (h *CreateProjectGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Req if err := json.NewEncoder(w).Encode(projectGroup); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -107,14 +107,14 @@ func (h *ProjectGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) return } h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } res := createProjectGroupResponse(projectGroup) if err := json.NewEncoder(w).Encode(res); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -145,7 +145,7 @@ func (h *ProjectGroupProjectsHandler) ServeHTTP(w http.ResponseWriter, r *http.R return } h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -156,7 +156,7 @@ func (h *ProjectGroupProjectsHandler) ServeHTTP(w http.ResponseWriter, r *http.R if err := json.NewEncoder(w).Encode(projects); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } @@ -187,7 +187,7 @@ func (h *ProjectGroupSubgroupsHandler) ServeHTTP(w http.ResponseWriter, r *http. return } h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } @@ -198,7 +198,7 @@ func (h *ProjectGroupSubgroupsHandler) ServeHTTP(w http.ResponseWriter, r *http. if err := json.NewEncoder(w).Encode(subgroups); err != nil { h.log.Errorf("err: %+v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/remotesource.go b/internal/services/gateway/api/remotesource.go index 0f20cf1..d5457c0 100644 --- a/internal/services/gateway/api/remotesource.go +++ b/internal/services/gateway/api/remotesource.go @@ -66,7 +66,8 @@ func (h *CreateRemoteSourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Req res := createRemoteSourceResponse(rs) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -158,13 +159,15 @@ func (h *RemoteSourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createRemoteSourceResponse(rs) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -213,7 +216,8 @@ func (h *RemoteSourcesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -223,7 +227,8 @@ func (h *RemoteSourcesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(remoteSources); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/repos.go b/internal/services/gateway/api/repos.go index ff1f168..2574df6 100644 --- a/internal/services/gateway/api/repos.go +++ b/internal/services/gateway/api/repos.go @@ -42,7 +42,8 @@ func (h *ReposHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { u, err := url.Parse(h.gitServerURL) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } u.Path = path @@ -69,7 +70,8 @@ func (h *ReposHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { resp, err := http.DefaultClient.Do(req) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -85,7 +87,8 @@ func (h *ReposHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { defer resp.Body.Close() // copy response body if _, err := io.Copy(w, resp.Body); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/run.go b/internal/services/gateway/api/run.go index c1fd3c2..9f9419b 100644 --- a/internal/services/gateway/api/run.go +++ b/internal/services/gateway/api/run.go @@ -207,13 +207,15 @@ func (h *RunHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createRunResponse(runResp.Run, runResp.RunConfig) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -239,7 +241,8 @@ func (h *RuntaskHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -256,7 +259,8 @@ func (h *RuntaskHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { res := createRunTaskResponse(rt, rct) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -340,7 +344,8 @@ func (h *RunsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -350,7 +355,8 @@ func (h *RunsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(runs); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -403,7 +409,8 @@ func (h *RunActionsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -418,7 +425,8 @@ func (h *RunActionsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -488,7 +496,8 @@ func (h *LogsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, "", http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } diff --git a/internal/services/gateway/api/secret.go b/internal/services/gateway/api/secret.go index 66dd4d2..8d023cf 100644 --- a/internal/services/gateway/api/secret.go +++ b/internal/services/gateway/api/secret.go @@ -79,7 +79,8 @@ func (h *SecretHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(secrets); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -149,7 +150,8 @@ func (h *CreateSecretHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) res := createSecretResponse(s) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -187,7 +189,8 @@ func (h *DeleteSecretHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } diff --git a/internal/services/gateway/api/user.go b/internal/services/gateway/api/user.go index 19f2ff4..fb8ee90 100644 --- a/internal/services/gateway/api/user.go +++ b/internal/services/gateway/api/user.go @@ -66,7 +66,8 @@ func (h *CreateUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { res := createUserResponse(u) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -91,7 +92,8 @@ func (h *DeleteUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -121,13 +123,15 @@ func (h *CurrentUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createUserResponse(user) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -152,13 +156,15 @@ func (h *UserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createUserResponse(user) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -183,13 +189,15 @@ func (h *UserByNameHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } res := createUserResponse(user) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -258,7 +266,8 @@ func (h *UsersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -268,7 +277,8 @@ func (h *UsersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(users); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -313,7 +323,8 @@ func (h *CreateUserLAHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -361,7 +372,8 @@ func (h *DeleteUserLAHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) _, err := h.configstoreClient.DeleteUserLA(ctx, userName, laID) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -410,7 +422,8 @@ func (h *CreateUserTokenHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques Token: token, } if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -433,7 +446,8 @@ func (h *DeleteUserTokenHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques h.log.Infof("deleting user %q token %q", userName, tokenName) _, err := h.configstoreClient.DeleteUserToken(ctx, userName, tokenName) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -474,10 +488,10 @@ func (h *RegisterUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) } if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } - } func (h *RegisterUserHandler) registerUser(ctx context.Context, req *RegisterUserRequest) (*RegisterUserResponse, error) { @@ -534,7 +548,8 @@ func (h *AuthorizeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } @@ -602,7 +617,8 @@ func (h *LoginUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } diff --git a/internal/services/gateway/api/variable.go b/internal/services/gateway/api/variable.go index f5bd077..ea35cfa 100644 --- a/internal/services/gateway/api/variable.go +++ b/internal/services/gateway/api/variable.go @@ -133,7 +133,8 @@ func (h *VariableHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if err := json.NewEncoder(w).Encode(variables); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -219,7 +220,8 @@ func (h *CreateVariableHandler) ServeHTTP(w http.ResponseWriter, r *http.Request res := createVariableResponse(v, cssecrets) if err := json.NewEncoder(w).Encode(res); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } } @@ -240,6 +242,7 @@ func (h *DeleteVariableHandler) ServeHTTP(w http.ResponseWriter, r *http.Request parentType, parentRef, err := GetConfigTypeRef(r) if httpError(w, err) { + h.log.Errorf("err: %+v", err) return } @@ -257,7 +260,8 @@ func (h *DeleteVariableHandler) ServeHTTP(w http.ResponseWriter, r *http.Request http.Error(w, err.Error(), http.StatusNotFound) return } - http.Error(w, err.Error(), http.StatusInternalServerError) + h.log.Errorf("err: %+v", err) + httpError(w, err) return } }