Merge branch 'healthcheck-disabled-error' into 'develop'

TwitterAPI: Return proper error when healthcheck is disabled

See merge request pleroma/pleroma!3953

changelog.d/healthcheck-disabled-error.fix

@@ -0,0 +1 @@
+TwitterAPI: Return proper error when healthcheck is disabled

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -345,13 +345,16 @@ def captcha(conn, _params) do
   end
 
   def healthcheck(conn, _params) do
-    with true <- Config.get([:instance, :healthcheck]),
+    with {:cfg, true} <- {:cfg, Config.get([:instance, :healthcheck])},
          %{healthy: true} = info <- Healthcheck.system_info() do
       json(conn, info)
     else
       %{healthy: false} = info ->
         service_unavailable(conn, info)
 
+      {:cfg, false} ->
+        service_unavailable(conn, %{"error" => "Healthcheck disabled"})
+
       _ ->
         service_unavailable(conn, %{})
     end

test/pleroma/web/twitter_api/util_controller_test.exs

@@ -106,7 +106,7 @@ test "returns 503 when healthcheck disabled", %{conn: conn} do
         |> get("/api/pleroma/healthcheck")
         |> json_response_and_validate_schema(503)
 
-      assert response == %{}
+      assert response == %{"error" => "Healthcheck disabled"}
     end
 
     test "returns 200 when healthcheck enabled and all ok", %{conn: conn} do