diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index 68bef7b2d..5a6199323 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -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) } } diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go index 539a41618..0b342f0f4 100644 --- a/tests/e2e/v3_cipher_suite_test.go +++ b/tests/e2e/v3_cipher_suite_test.go @@ -48,10 +48,9 @@ func testV3CurlCipherSuites(t *testing.T, valid bool) { 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 + Endpoint: "/metrics", + Expected: fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version), + 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)) } @@ -59,10 +58,9 @@ func cipherSuiteTestValid(cx ctlCtx) { 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 + Endpoint: "/metrics", + Expected: "failed setting cipher list", + 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") } diff --git a/tests/framework/e2e/curl.go b/tests/framework/e2e/curl.go index 20bf111ee..e32cacd21 100644 --- a/tests/framework/e2e/curl.go +++ b/tests/framework/e2e/curl.go @@ -35,8 +35,6 @@ type CURLReq struct { Expected string Header string - MetricsURLScheme string - Ciphers string } @@ -56,23 +54,18 @@ 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") - } - cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath, "--key", PrivateKeyPath) - acurl = ToTLS(member.Config().ClientURL) - } else if cfg.Client.ConnectionType == ClientTLS { - if cfg.CN { - cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath, "--key", PrivateKeyPath) - } else { - cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath3, "--key", PrivateKeyPath3) - } + if req.IsTLS { + if cfg.Client.ConnectionType != ClientTLSAndNonTLS { + panic("should not use cURLPrefixArgsUseTLS when serving only TLS or non-TLS") + } + cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath, "--key", PrivateKeyPath) + acurl = ToTLS(member.Config().ClientURL) + } else if cfg.Client.ConnectionType == ClientTLS { + if cfg.CN { + cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath, "--key", PrivateKeyPath) + } else { + cmdArgs = append(cmdArgs, "--cacert", CaPath, "--cert", CertPath3, "--key", PrivateKeyPath3) } - } - if req.MetricsURLScheme != "" { - acurl = member.EndpointsMetrics()[0] } ep := acurl + req.Endpoint