Skip to content

Commit 455ed27

Browse files
authored
Trust: return meaningful status codes and hide internal DB errors (#24)
* Trust: return meaningful status codes and hide internal DB errors * sourcery review updates
1 parent 4466a78 commit 455ed27

File tree

2 files changed

+99
-79
lines changed

2 files changed

+99
-79
lines changed

internal/api/handlers.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,53 +105,53 @@ func (h *Handler) GetApiV1ArtifactsArtifactPolicies(w http.ResponseWriter, r *ht
105105

106106
func (h *Handler) GetApiV1TrustConfig(w http.ResponseWriter, r *http.Request) {
107107
tufRepoUrl := os.Getenv("TUF_REPO_URL")
108-
resp, err := h.trustService.GetTrustConfig(r.Context(), tufRepoUrl)
108+
resp, err, statusCode := h.trustService.GetTrustConfig(r.Context(), tufRepoUrl)
109109
if err != nil {
110-
writeError(w, http.StatusInternalServerError, err.Error())
110+
writeError(w, statusCode, err.Error())
111111
return
112112
}
113-
writeJSON(w, http.StatusOK, resp)
113+
writeJSON(w, statusCode, resp)
114114
}
115115

116116
func (h *Handler) GetApiV1TrustRootMetadata(w http.ResponseWriter, r *http.Request) {
117117
tufRepoUrl := os.Getenv("TUF_REPO_URL")
118-
resp, err := h.trustService.GetTrustRootMetadataInfo(tufRepoUrl)
118+
resp, err, statusCode := h.trustService.GetTrustRootMetadataInfo(tufRepoUrl)
119119
if err != nil {
120-
writeError(w, http.StatusInternalServerError, err.Error())
120+
writeError(w, statusCode, err.Error())
121121
return
122122
}
123-
writeJSON(w, http.StatusOK, resp)
123+
writeJSON(w, statusCode, resp)
124124
}
125125

126126
func (h *Handler) GetApiV1TrustTargets(w http.ResponseWriter, r *http.Request) {
127127
tufRepoUrl := os.Getenv("TUF_REPO_URL")
128-
resp, err := h.trustService.GetAllTargets(r.Context(), tufRepoUrl)
128+
resp, err, statusCode := h.trustService.GetAllTargets(r.Context(), tufRepoUrl)
129129
if err != nil {
130-
writeError(w, http.StatusInternalServerError, err.Error())
130+
writeError(w, statusCode, err.Error())
131131
return
132132
}
133-
writeJSON(w, http.StatusOK, resp)
133+
writeJSON(w, statusCode, resp)
134134
}
135135

136136
func (h *Handler) GetApiV1TrustTarget(w http.ResponseWriter, r *http.Request) {
137137
tufRepoUrl := os.Getenv("TUF_REPO_URL")
138138
target := r.URL.Query().Get("target")
139-
resp, err := h.trustService.GetTarget(r.Context(), tufRepoUrl, target)
139+
resp, err, statusCode := h.trustService.GetTarget(r.Context(), tufRepoUrl, target)
140140
if err != nil {
141-
writeError(w, http.StatusInternalServerError, err.Error())
141+
writeError(w, statusCode, err.Error())
142142
return
143143
}
144-
writeJSON(w, http.StatusOK, resp)
144+
writeJSON(w, statusCode, resp)
145145
}
146146

147147
func (h *Handler) GetApiV1TrustTargetsCertificates(w http.ResponseWriter, r *http.Request) {
148148
tufRepoUrl := os.Getenv("TUF_REPO_URL")
149-
resp, err := h.trustService.GetCertificatesInfo(r.Context(), tufRepoUrl)
149+
resp, err, statusCode := h.trustService.GetCertificatesInfo(r.Context(), tufRepoUrl)
150150
if err != nil {
151-
writeError(w, http.StatusInternalServerError, err.Error())
151+
writeError(w, statusCode, err.Error())
152152
return
153153
}
154-
writeJSON(w, http.StatusOK, resp)
154+
writeJSON(w, statusCode, resp)
155155
}
156156

157157
func (h *Handler) ServeSwaggerUI(w http.ResponseWriter, r *http.Request) {

0 commit comments

Comments
 (0)