tests: Remove MetricsURLScheme field

serathius · serathius · commit 67e3c784ba6e · 2023-03-14T16:35:43.000+01:00
Signed-off-by: Marek Siarkowicz &lt;siarkowicz@google.com&gt;
diff --git 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
@@ -48,21 +48,19 @@ 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))
 	}
 }
 
 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
@@ -35,8 +35,6 @@ type CURLReq struct {
 	Expected string
 	Header   string
 
-	MetricsURLScheme string
-
 	Ciphers string
 }
 
@@ -56,24 +54,19 @@ 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")
-			}
+	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)
-			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)
-			}
+		} else {
+			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 != "" {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func metricsTest(cx ctlCtx) {`
`63`	`63`	`if err := ctlV3Watch(cx, []string{"k", "--rev", "1"}, []kvExec{{key: "k", val: "v"}}...); err != nil {`
`64`	`64`	`cx.t.Fatal(err)`
`65`	`65`	`}`
`66`		`- if err := e2e.CURLGet(cx.epc, e2e.CURLReq{Endpoint: test.endpoint, Expected: test.expected, MetricsURLScheme: cx.cfg.MetricsURLScheme}); err != nil {`
	`66`	`+ if err := e2e.CURLGet(cx.epc, e2e.CURLReq{Endpoint: test.endpoint, Expected: test.expected}); err != nil {`
`67`	`67`	`cx.t.Fatalf("failed get with curl (%v)", err)`
`68`	`68`	`}`
`69`	`69`	`}`