standardize not found error

canonical · Apr 18, 2024 · d211910 · d211910
1 parent ffbee9a
commit d211910
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/internal/api/handlers.go b/internal/api/handlers.go
@@ -83,7 +83,7 @@ func GetCertificateRequest(env *Environment) http.HandlerFunc {
 		id := r.PathValue("id")
 		cert, err := env.DB.Retrieve(id)
 		if err != nil {
-			if err.Error() == "sql: no rows in result set" {
+			if err.Error() == "csr id not found" {
 				logError(err.Error(), http.StatusBadRequest, w)
 				return
 			}
@@ -127,6 +127,14 @@ func PostCertificate(env *Environment) http.HandlerFunc {
 		id := r.PathValue("id")
 		insertId, err := env.DB.Update(id, string(cert))
 		if err != nil {
+			if err.Error() == "csr id not found" {
+				logError(err.Error(), http.StatusBadRequest, w)
+				return
+			}
+			if err.Error() == "certificate does not match CSR" {
+				logError(err.Error(), http.StatusBadRequest, w)
+				return
+			}
 			logError(err.Error(), http.StatusInternalServerError, w)
 			return
 		}

diff --git a/internal/api/handlers_test.go b/internal/api/handlers_test.go
@@ -195,7 +195,7 @@ func TestGoCertRouter(t *testing.T) {
 			method:   "GET",
 			path:     "/api/v1/certificate_requests/1",
 			data:     "",
-			response: "error: sql: no rows in result set",
+			response: "error: csr id not found",
 			status:   http.StatusBadRequest,
 		},
 		{

diff --git a/internal/certdb/certdb.go b/internal/certdb/certdb.go
@@ -56,6 +56,9 @@ func (db *CertificateRequestsRepository) Retrieve(id string) (CertificateRequest
 	var newCSR CertificateRequest
 	row := db.conn.QueryRow(fmt.Sprintf(queryGetCSR, db.table), id)
 	if err := row.Scan(&newCSR.ID, &newCSR.CSR, &newCSR.Certificate); err != nil {
+		if err.Error() == "sql: no rows in result set" {
+			return newCSR, errors.New("csr id not found")
+		}
 		return newCSR, err
 	}
 	return newCSR, nil
@@ -86,7 +89,7 @@ func (db *CertificateRequestsRepository) Update(id string, cert string) (int64,
 	}
 	csr, err := db.Retrieve(id)
 	if err != nil {
-		return 0, nil
+		return 0, err
 	}
 	if err := CertificateMatchesCSR(cert, csr.CSR); err != nil {
 		return 0, err
@@ -99,9 +102,6 @@ func (db *CertificateRequestsRepository) Update(id string, cert string) (int64,
 	if err != nil {
 		return 0, err
 	}
-	if insertId == 0 {
-		return 0, errors.New("column not found")
-	}
 	return insertId, nil
 }