mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 18:53:35 +00:00
rebase: update K8s packages to v0.32.1
Update K8s packages in go.mod to v0.32.1 Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
44
vendor/k8s.io/client-go/transport/websocket/roundtripper.go
generated
vendored
44
vendor/k8s.io/client-go/transport/websocket/roundtripper.go
generated
vendored
@ -20,11 +20,17 @@ import (
|
||||
"crypto/tls"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
gwebsocket "github.com/gorilla/websocket"
|
||||
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/serializer"
|
||||
"k8s.io/apimachinery/pkg/util/httpstream"
|
||||
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
|
||||
utilnet "k8s.io/apimachinery/pkg/util/net"
|
||||
@ -37,6 +43,17 @@ var (
|
||||
_ http.RoundTripper = &RoundTripper{}
|
||||
)
|
||||
|
||||
var (
|
||||
statusScheme = runtime.NewScheme()
|
||||
statusCodecs = serializer.NewCodecFactory(statusScheme)
|
||||
)
|
||||
|
||||
func init() {
|
||||
statusScheme.AddUnversionedTypes(metav1.SchemeGroupVersion,
|
||||
&metav1.Status{},
|
||||
)
|
||||
}
|
||||
|
||||
// ConnectionHolder defines functions for structure providing
|
||||
// access to the websocket connection.
|
||||
type ConnectionHolder interface {
|
||||
@ -110,12 +127,33 @@ func (rt *RoundTripper) RoundTrip(request *http.Request) (retResp *http.Response
|
||||
}
|
||||
wsConn, resp, err := dialer.DialContext(request.Context(), request.URL.String(), request.Header)
|
||||
if err != nil {
|
||||
// BadHandshake error becomes an "UpgradeFailureError" (used for streaming fallback).
|
||||
if errors.Is(err, gwebsocket.ErrBadHandshake) {
|
||||
// Enhance the error message with the response status if possible.
|
||||
cause := err
|
||||
// Enhance the error message with the error response if possible.
|
||||
if resp != nil && len(resp.Status) > 0 {
|
||||
err = fmt.Errorf("%w (%s)", err, resp.Status)
|
||||
defer resp.Body.Close() //nolint:errcheck
|
||||
cause = fmt.Errorf("%w (%s)", err, resp.Status) // Always add the response status
|
||||
responseError := ""
|
||||
responseErrorBytes, readErr := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
|
||||
if readErr != nil {
|
||||
cause = fmt.Errorf("%w: unable to read error from server response", cause)
|
||||
} else {
|
||||
// If returned error can be decoded as "metav1.Status", return a "StatusError".
|
||||
responseError = strings.TrimSpace(string(responseErrorBytes))
|
||||
if len(responseError) > 0 {
|
||||
if obj, _, decodeErr := statusCodecs.UniversalDecoder().Decode(responseErrorBytes, nil, &metav1.Status{}); decodeErr == nil {
|
||||
if status, ok := obj.(*metav1.Status); ok {
|
||||
cause = &apierrors.StatusError{ErrStatus: *status}
|
||||
}
|
||||
} else {
|
||||
// Otherwise, append the responseError string.
|
||||
cause = fmt.Errorf("%w: %s", cause, responseError)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil, &httpstream.UpgradeFailureError{Cause: err}
|
||||
return nil, &httpstream.UpgradeFailureError{Cause: cause}
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user