From ddf7a69fbab7ddded8f673f09683024be1e9e4da Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <siarkowicz@google.com>
Date: Thu, 27 Jan 2022 18:25:39 +0100
Subject: [PATCH] server: Use named struct initialization in healthcheck test

Signed-off-by: Siyuan Zhang <sizhang@google.com>
---
 etcdserver/api/etcdhttp/metrics_test.go | 56 ++++++++++++-------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/etcdserver/api/etcdhttp/metrics_test.go b/etcdserver/api/etcdhttp/metrics_test.go
index 3468d9fd6..bd6f2b1de 100644
--- a/etcdserver/api/etcdhttp/metrics_test.go
+++ b/etcdserver/api/etcdhttp/metrics_test.go
@@ -68,46 +68,46 @@ func TestHealthHandler(t *testing.T) {
 		health         string
 	}{
 		{
-			[]*pb.AlarmMember{},
-			"/health",
-			http.StatusOK,
-			"true",
+			alarms:         []*pb.AlarmMember{},
+			healthCheckURL: "/health",
+			statusCode:     http.StatusOK,
+			health:         "true",
 		},
 		{
-			[]*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}},
-			"/health",
-			http.StatusServiceUnavailable,
-			"false",
+			alarms:         []*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}},
+			healthCheckURL: "/health",
+			statusCode:     http.StatusServiceUnavailable,
+			health:         "false",
 		},
 		{
-			[]*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}},
-			"/health?exclude=NOSPACE",
-			http.StatusOK,
-			"true",
+			alarms:         []*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}},
+			healthCheckURL: "/health?exclude=NOSPACE",
+			statusCode:     http.StatusOK,
+			health:         "true",
 		},
 		{
-			[]*pb.AlarmMember{},
-			"/health?exclude=NOSPACE",
-			http.StatusOK,
-			"true",
+			alarms:         []*pb.AlarmMember{},
+			healthCheckURL: "/health?exclude=NOSPACE",
+			statusCode:     http.StatusOK,
+			health:         "true",
 		},
 		{
-			[]*pb.AlarmMember{{MemberID: uint64(1), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(2), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(3), Alarm: pb.AlarmType_NOSPACE}},
-			"/health?exclude=NOSPACE",
-			http.StatusOK,
-			"true",
+			alarms:         []*pb.AlarmMember{{MemberID: uint64(1), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(2), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(3), Alarm: pb.AlarmType_NOSPACE}},
+			healthCheckURL: "/health?exclude=NOSPACE",
+			statusCode:     http.StatusOK,
+			health:         "true",
 		},
 		{
-			[]*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(1), Alarm: pb.AlarmType_CORRUPT}},
-			"/health?exclude=NOSPACE",
-			http.StatusServiceUnavailable,
-			"false",
+			alarms:         []*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(1), Alarm: pb.AlarmType_CORRUPT}},
+			healthCheckURL: "/health?exclude=NOSPACE",
+			statusCode:     http.StatusServiceUnavailable,
+			health:         "false",
 		},
 		{
-			[]*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(1), Alarm: pb.AlarmType_CORRUPT}},
-			"/health?exclude=NOSPACE&exclude=CORRUPT",
-			http.StatusOK,
-			"true",
+			alarms:         []*pb.AlarmMember{{MemberID: uint64(0), Alarm: pb.AlarmType_NOSPACE}, {MemberID: uint64(1), Alarm: pb.AlarmType_CORRUPT}},
+			healthCheckURL: "/health?exclude=NOSPACE&exclude=CORRUPT",
+			statusCode:     http.StatusOK,
+			health:         "true",
 		},
 	}