refactor

mercari · Feb 23, 2025 · 6821b33 · 6821b33
1 parent bc52978
commit 6821b33
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 28 deletions.
diff --git a/_examples/02_simple/main_test.go b/_examples/02_simple/main_test.go
@@ -173,6 +173,8 @@ func TestFederation(t *testing.T) {
 	userClient = user.NewUserServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
 	}))
@@ -183,6 +185,7 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	user.RegisterUserServiceServer(grpcServer, &UserServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
@@ -356,5 +359,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/03_custom_resolver/main_test.go b/_examples/03_custom_resolver/main_test.go
@@ -201,6 +201,7 @@ func TestFederation(t *testing.T) {
 	userClient = user.NewUserServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -229,6 +230,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationV2DevService(ctx, federationServer)
+
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	user.RegisterUserServiceServer(grpcServer, &UserServer{})
 	federation.RegisterFederationV2DevServiceServer(grpcServer, federationServer)
@@ -267,5 +270,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/04_timeout/main_test.go b/_examples/04_timeout/main_test.go
@@ -103,6 +103,7 @@ func TestFederation(t *testing.T) {
 	postClient = post.NewPostServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -114,6 +115,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -147,6 +150,5 @@ func TestFederation(t *testing.T) {
 		}
 	})
 	blockCh <- struct{}{}
-	time.Sleep(500 * time.Millisecond)
-	grpcServer.GracefulStop()
+	time.Sleep(100 * time.Millisecond)
 }
diff --git a/_examples/05_async/main_test.go b/_examples/05_async/main_test.go
@@ -67,6 +67,7 @@ func TestFederation(t *testing.T) {
 	defer conn.Close()
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -77,6 +78,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
 	go func() {
@@ -96,5 +99,4 @@ func TestFederation(t *testing.T) {
 	}, cmpopts.IgnoreUnexported(federation.GetResponse{})); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/06_alias/main_test.go b/_examples/06_alias/main_test.go
@@ -126,6 +126,7 @@ func TestFederation(t *testing.T) {
 	postv2Client = postv2.NewPostServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -137,6 +138,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	postv2.RegisterPostServiceServer(grpcServer, &PostV2Server{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
@@ -193,5 +196,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/07_autobind/main_test.go b/_examples/07_autobind/main_test.go
@@ -93,6 +93,7 @@ func TestFederation(t *testing.T) {
 	postClient = post.NewPostServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -104,6 +105,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -132,5 +135,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/08_literal/main_test.go b/_examples/08_literal/main_test.go
@@ -125,6 +125,7 @@ func TestFederation(t *testing.T) {
 	contentClient = content.NewContentServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -136,6 +137,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	content.RegisterContentServiceServer(grpcServer, &ContentServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -203,5 +206,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/09_multi_user/main_test.go b/_examples/09_multi_user/main_test.go
@@ -104,6 +104,7 @@ func TestFederation(t *testing.T) {
 	userClient = user.NewUserServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -116,6 +117,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	user.RegisterUserServiceServer(grpcServer, &UserServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -145,5 +148,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/10_oneof/main_test.go b/_examples/10_oneof/main_test.go
@@ -91,6 +91,7 @@ func TestFederation(t *testing.T) {
 	userClient = user.NewUserServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -102,6 +103,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	user.RegisterUserServiceServer(grpcServer, &UserServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -139,7 +142,6 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
 
 func TestFederation_NoValue(t *testing.T) {
@@ -178,6 +180,7 @@ func TestFederation_NoValue(t *testing.T) {
 	userClient = user.NewUserServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -189,6 +192,8 @@ func TestFederation_NoValue(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	user.RegisterUserServiceServer(grpcServer, &UserServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -207,5 +212,4 @@ func TestFederation_NoValue(t *testing.T) {
 	if diff := cmp.Diff(err.Error(), expectedErr.Err().Error()); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-	grpcServer.Stop()
 }
diff --git a/_examples/11_multi_service/main_test.go b/_examples/11_multi_service/main_test.go
@@ -103,6 +103,8 @@ func TestFederation(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		defer federation.CleanupFederationService(ctx, svc)
+
 		gotGetPostResp, err := svc.GetPost(ctx, &federation.GetPostRequest{Id: requestID})
 		if err != nil {
 			t.Fatal(err)
@@ -147,6 +149,8 @@ func TestFederation(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		defer federation.CleanupDebugService(ctx, svc)
+
 		got, err := svc.GetStatus(ctx, &federation.GetStatusRequest{})
 		if err != nil {
 			t.Fatal(err)
@@ -169,6 +173,8 @@ func TestFederation(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		defer federation.CleanupPrivateService(ctx, svc)
+
 		got, err := svc.GetName(ctx, &federation.GetNameRequest{})
 		if err != nil {
 			t.Fatal(err)
@@ -191,6 +197,8 @@ func TestFederation(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		defer federation.CleanupOtherService(ctx, svc)
+
 		got, err := svc.Get(ctx, &federation.GetRequest{})
 		if err != nil {
 			t.Fatal(err)

diff --git a/_examples/12_validation/main_test.go b/_examples/12_validation/main_test.go
@@ -45,6 +45,7 @@ func TestFederation(t *testing.T) {
 	defer conn.Close()
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
@@ -56,6 +57,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
 	go func() {
@@ -177,6 +180,4 @@ func TestFederation(t *testing.T) {
 			}
 		})
 	}
-
-	grpcServer.Stop()
 }
diff --git a/_examples/13_map/main_test.go b/_examples/13_map/main_test.go
@@ -120,6 +120,8 @@ func TestFederation(t *testing.T) {
 	userClient = user.NewUserServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
 	}))
@@ -130,6 +132,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	user.RegisterUserServiceServer(grpcServer, &UserServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
@@ -183,6 +187,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-
-	grpcServer.Stop()
 }
diff --git a/_examples/14_condition/main_test.go b/_examples/14_condition/main_test.go
@@ -96,6 +96,8 @@ func TestFederation(t *testing.T) {
 	postClient = post.NewPostServiceClient(conn)
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
 	}))
@@ -106,6 +108,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	post.RegisterPostServiceServer(grpcServer, &PostServer{})
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
@@ -137,6 +141,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-
-	grpcServer.Stop()
 }
diff --git a/_examples/15_cel_plugin/main_test.go b/_examples/15_cel_plugin/main_test.go
@@ -84,6 +84,8 @@ func TestFederation(t *testing.T) {
 	defer conn.Close()
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
 	}))
@@ -99,6 +101,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
 	go func() {
@@ -148,7 +152,4 @@ func TestFederation(t *testing.T) {
 			t.Errorf("(-got, +want)\n%s", diff)
 		}
 	})
-
-	federation.CleanupFederationService(ctx, federationServer)
-	grpcServer.GracefulStop()
 }
diff --git a/_examples/16_code_gen_plugin/main_test.go b/_examples/16_code_gen_plugin/main_test.go
@@ -74,6 +74,8 @@ func TestFederation(t *testing.T) {
 	defer conn.Close()
 
 	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
 	}))
@@ -84,6 +86,8 @@ func TestFederation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer federation.CleanupFederationService(ctx, federationServer)
+
 	federation.RegisterFederationServiceServer(grpcServer, federationServer)
 
 	go func() {
@@ -106,6 +110,4 @@ func TestFederation(t *testing.T) {
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}
-
-	grpcServer.Stop()
 }