From 301c92c0c3aa6fa912eed16402965074b70aaa18 Mon Sep 17 00:00:00 2001
From: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
Date: Wed, 15 Jan 2025 08:11:19 -0600
Subject: [PATCH] Fix how we generate the query serving error documentation
 (#17516)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 go/vt/vterrors/code.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/go/vt/vterrors/code.go b/go/vt/vterrors/code.go
index 0ca275b71fc..df19fcbd408 100644
--- a/go/vt/vterrors/code.go
+++ b/go/vt/vterrors/code.go
@@ -243,8 +243,15 @@ func errorWithoutState(id string, code vtrpcpb.Code, short, long string) func(ar
 
 func errorWithState(id string, code vtrpcpb.Code, state State, short, long string) func(args ...any) *VitessError {
 	return func(args ...any) *VitessError {
+		var err error
+		if len(args) != 0 {
+			err = NewErrorf(code, state, id+": "+short, args...)
+		} else {
+			err = NewError(code, state, id+": "+short)
+		}
+
 		return &VitessError{
-			Err:         NewErrorf(code, state, id+": "+short, args...),
+			Err:         err,
 			Description: long,
 			ID:          id,
 			State:       state,