Merge pull request #60925 from aleksandra-malinowska/debug-curl-fix

Automatic merge from submit-queue (batch tested with PRs 60696, 60876, 60901, 60925, 60428). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Improve debug curl command

When logging debug curl command, add single quotes around URL and headers. This prevents quietly removing any parameters after '&' when running resulting command and improves formatting.

```release-note
NONE
```

Kubernetes-commit: de1a0e3249b67cd72c1a412a2688f693a0201b70
This commit is contained in:
Kubernetes Publisher 2018-03-20 13:36:21 -07:00
commit cc0ac3c0b2
2 changed files with 582 additions and 582 deletions

106
Godeps/Godeps.json generated
View File

@ -364,215 +364,215 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "fd252c3a3e1debf912ff5b80221a31a6a3c24493"
"Rev": "664546e0ebca14c11c581d6570ee4fa246efc58d"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -331,11 +331,11 @@ func (r *requestInfo) toCurl() string {
headers := ""
for key, values := range r.RequestHeaders {
for _, value := range values {
headers += fmt.Sprintf(` -H %q`, fmt.Sprintf("%s: %s", key, value))
headers += fmt.Sprintf(` -H %q`, fmt.Sprintf("%s: '%s'", key, value))
}
}
return fmt.Sprintf("curl -k -v -X%s %s %s", r.RequestVerb, headers, r.RequestURL)
return fmt.Sprintf("curl -k -v -X%s %s '%s'", r.RequestVerb, headers, r.RequestURL)
}
// debuggingRoundTripper will display information about the requests passing