Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include webhook response in error message. #1516

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion authority/provisioner/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"strings"
"text/template"
"time"

Expand Down Expand Up @@ -219,7 +221,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{}
Expand Down
2 changes: 1 addition & 1 deletion authority/provisioner/webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ func TestWebhook_Do(t *testing.T) {
},
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 {
Expand Down
Loading