http: respondCommon to do common responses

http/handler.go

@@ -57,9 +57,18 @@ func respondError(w http.ResponseWriter, status int, err error) {
 	enc.Encode(resp)
 }
 
-func respondErrorResponse(w http.ResponseWriter, resp *logical.Response) {
+func respondCommon(w http.ResponseWriter, resp *logical.Response) bool {
-	err := fmt.Errorf("%s", resp.Data["error"].(string))
+	if resp == nil {
-	respondError(w, http.StatusBadRequest, err)
+		return false
+	}
+
+	if resp.IsError() {
+		err := fmt.Errorf("%s", resp.Data["error"].(string))
+		respondError(w, http.StatusBadRequest, err)
+		return true
+	}
+
+	return false
 }
 
 func respondOk(w http.ResponseWriter, body interface{}) {

http/logical.go

@@ -59,12 +59,11 @@ func handleLogical(core *vault.Core) http.Handler {
 			respondError(w, http.StatusInternalServerError, err)
 			return
 		}
-		if op == logical.ReadOperation && resp == nil {
+		if respondCommon(w, resp) {
-			respondError(w, http.StatusNotFound, nil)
 			return
 		}
-		if resp.IsError() {
+		if op == logical.ReadOperation && resp == nil {
-			respondErrorResponse(w, resp)
+			respondError(w, http.StatusNotFound, nil)
 			return
 		}
 

http/logical_test.go

@@ -26,7 +26,6 @@ func TestLogical(t *testing.T) {
 
 	var actual map[string]interface{}
 	expected := map[string]interface{}{
-		"vault_id":       "",
 		"renewable":      false,
 		"lease_duration": float64(0),
 		"data": map[string]interface{}{
@@ -35,6 +34,7 @@ func TestLogical(t *testing.T) {
 	}
 	testResponseStatus(t, resp, 200)
 	testResponseBody(t, resp, &actual)
+	delete(actual, "vault_id")
 	if !reflect.DeepEqual(actual, expected) {
 		t.Fatalf("bad: %#v", actual)
 	}