close tikv#4490: fix transport and change component key

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
CabinfeverB · Dec 28, 2021 · 118c5f6 · 118c5f6
1 parent dd588bb
commit 118c5f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/apiutil/apiutil.go b/pkg/apiutil/apiutil.go
@@ -37,7 +37,7 @@ var (
 =======
 	// ComponentSignatureKey is used for http request header key
 	// to identify component signature
-	ComponentSignatureKey = "ti-component"
+	ComponentSignatureKey = "component"
 	// ComponentAnonymousValue identify anonymous request source
 	ComponentAnonymousValue = "anonymous"
 >>>>>>> baa5163b (close #4490: add teset)

diff --git a/tools/pd-ctl/pdctl/command/global.go b/tools/pd-ctl/pdctl/command/global.go
@@ -37,9 +37,17 @@ import (
 )
 
 var (
+<<<<<<< HEAD
 	pdControllerComponentName = "pdctl"
 	dialClient                = &http.Client{
 		Transport: apiutil.NewComponentSignatureRoundTripper(http.DefaultTransport, &pdControllerComponentName),
+=======
+	dialClient = &http.Client{
+		Transport: &apiutil.UserSignatureRoundTripper{
+			Component: "pdctl",
+			Proxied:   http.DefaultTransport,
+		},
+>>>>>>> 377c854c (close #4490: fix transport and change component key)
 	}
 	pingPrefix = "pd/api/v1/ping"
 )