tests: Remove MetricsURLScheme field
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>dependabot/go_modules/go.uber.org/atomic-1.10.0
parent
cff96fe3a4
commit
67e3c784ba
|
@ -63,7 +63,7 @@ func metricsTest(cx ctlCtx) {
|
|||
if err := ctlV3Watch(cx, []string{"k", "--rev", "1"}, []kvExec{{key: "k", val: "v"}}...); err != nil {
|
||||
cx.t.Fatal(err)
|
||||
}
|
||||
if err := e2e.CURLGet(cx.epc, e2e.CURLReq{Endpoint: test.endpoint, Expected: test.expected, MetricsURLScheme: cx.cfg.MetricsURLScheme}); err != nil {
|
||||
if err := e2e.CURLGet(cx.epc, e2e.CURLReq{Endpoint: test.endpoint, Expected: test.expected}); err != nil {
|
||||
cx.t.Fatalf("failed get with curl (%v)", err)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -50,7 +50,6 @@ func cipherSuiteTestValid(cx ctlCtx) {
|
|||
if err := e2e.CURLGet(cx.epc, e2e.CURLReq{
|
||||
Endpoint: "/metrics",
|
||||
Expected: fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version),
|
||||
MetricsURLScheme: cx.cfg.MetricsURLScheme,
|
||||
Ciphers: "ECDHE-RSA-AES128-GCM-SHA256", // TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
|
||||
}); err != nil {
|
||||
require.ErrorContains(cx.t, err, fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version))
|
||||
|
@ -61,7 +60,6 @@ func cipherSuiteTestMismatch(cx ctlCtx) {
|
|||
err := e2e.CURLGet(cx.epc, e2e.CURLReq{
|
||||
Endpoint: "/metrics",
|
||||
Expected: "failed setting cipher list",
|
||||
MetricsURLScheme: cx.cfg.MetricsURLScheme,
|
||||
Ciphers: "ECDHE-RSA-DES-CBC3-SHA", // TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
|
||||
})
|
||||
require.ErrorContains(cx.t, err, "curl: (59) failed setting cipher list")
|
||||
|
|
|
@ -35,8 +35,6 @@ type CURLReq struct {
|
|||
Expected string
|
||||
Header string
|
||||
|
||||
MetricsURLScheme string
|
||||
|
||||
Ciphers string
|
||||
}
|
||||
|
||||
|
@ -56,7 +54,6 @@ func CURLPrefixArgs(cfg *EtcdProcessClusterConfig, member EtcdProcess, method st
|
|||
cmdArgs = []string{"curl"}
|
||||
acurl = member.Config().ClientURL
|
||||
)
|
||||
if req.MetricsURLScheme != "https" {
|
||||
if req.IsTLS {
|
||||
if cfg.Client.ConnectionType != ClientTLSAndNonTLS {
|
||||
panic("should not use cURLPrefixArgsUseTLS when serving only TLS or non-TLS")
|
||||
|
@ -70,10 +67,6 @@ func CURLPrefixArgs(cfg *EtcdProcessClusterConfig, member EtcdProcess, method st
|
|||
cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath3, "--key", PrivateKeyPath3)
|
||||
}
|
||||
}
|
||||
}
|
||||
if req.MetricsURLScheme != "" {
|
||||
acurl = member.EndpointsMetrics()[0]
|
||||
}
|
||||
ep := acurl + req.Endpoint
|
||||
|
||||
if req.Username != "" || req.Password != "" {
|
||||
|
|
Loading…
Reference in New Issue