Merge pull request #29 from nimbolus/return-existing-lockinfo

fix: return existing lockinfo when already locked

pkg/server/handler.go

@@ -101,7 +101,15 @@ func Lock(w http.ResponseWriter, r *http.Request, state *terraform.State, body [
 		HTTPResponse(w, r, http.StatusInternalServerError, "")
 	} else if !ok {
 		log.Warnf("state with id %s is already locked by %s", state.ID, state.Lock)
-		HTTPResponse(w, r, http.StatusLocked, state.Lock.ID)
+
+		lockInfo, err := json.Marshal(state.Lock)
+		if err != nil {
+			log.Errorf("failed to marshal lock info: %v", err)
+			HTTPResponse(w, r, http.StatusInternalServerError, "")
+			return
+		}
+
+		HTTPResponse(w, r, http.StatusLocked, string(lockInfo))
 	} else {
 		log.Debugf("state with id %s was locked successfully", state.ID)
 		HTTPResponse(w, r, http.StatusOK, "")
@@ -123,8 +131,16 @@ func Unlock(w http.ResponseWriter, r *http.Request, state *terraform.State, body
 		log.Errorf("failed to unlock state with id %s: %v", state.ID, err)
 		HTTPResponse(w, r, http.StatusInternalServerError, "")
 	} else if !ok {
-		log.Warnf("failed to unlock state with id %s: %v", state.ID, err)
-		HTTPResponse(w, r, http.StatusBadRequest, state.Lock.ID)
+		log.Warnf("failed to unlock state with id %s: locks not equal", state.ID)
+
+		lockInfo, err := json.Marshal(state.Lock)
+		if err != nil {
+			log.Errorf("failed to marshal lock info: %v", err)
+			HTTPResponse(w, r, http.StatusInternalServerError, "")
+			return
+		}
+
+		HTTPResponse(w, r, http.StatusBadRequest, string(lockInfo))
 	} else {
 		log.Debugf("state with id %s was unlocked successfully", state.ID)
 		HTTPResponse(w, r, http.StatusOK, "")