Merge 6ee9035b17 into 07279dd248

authority/provisioner/webhook.go

@@ -9,8 +9,10 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"io"
 	"log"
 	"net/http"
+	"strings"
 	"text/template"
 	"time"
 
@@ -227,7 +229,11 @@ retry:
 		goto retry
 	}
 	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("Webhook server responded with %d", resp.StatusCode)
+		b, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return nil, fmt.Errorf("Webhook server responded with %d", resp.StatusCode)
+		}
+		return nil, fmt.Errorf("Webhook server responded with %d: %s", resp.StatusCode, strings.TrimSpace(string(b)))
 	}
 
 	respBody := &webhook.ResponseBody{}

authority/provisioner/webhook_test.go

@@ -507,7 +507,7 @@ func TestWebhook_Do(t *testing.T) {
 			requestID:     "reqID",
 			errStatusCode: 404,
 			serverErrMsg:  "item not found",
-			expectErr:     errors.New("Webhook server responded with 404"),
+			expectErr:     errors.New("Webhook server responded with 404: item not found"),
 		},
 	}
 	for name, tc := range tests {