Revise the codes

cmd/yorkie/server.go

@@ -299,29 +299,29 @@ func init() {
 		server.DefaultSnapshotDisableGC,
 		"Whether to disable garbage collection of snapshots.",
 	)
+	cmd.Flags().DurationVar(
+		&authWebhookRequestTimeout,
+		"auth-webhook-request-timeout",
+		server.DefaultAuthWebhookRequestTimeout,
+		"Timeout for each authorization webhook request.",
+	)
 	cmd.Flags().Uint64Var(
 		&conf.Backend.AuthWebhookMaxRetries,
 		"auth-webhook-max-retries",
 		server.DefaultAuthWebhookMaxRetries,
-		"Maximum number of retries for an authorization webhook.",
-	)
-	cmd.Flags().DurationVar(
-		&authWebhookMaxWaitInterval,
-		"auth-webhook-max-wait-interval",
-		server.DefaultAuthWebhookMaxWaitInterval,
-		"Maximum wait interval for authorization webhook.",
+		"Maximum number of retries for authorization webhook.",
 	)
 	cmd.Flags().DurationVar(
 		&authWebhookMinWaitInterval,
 		"auth-webhook-min-wait-interval",
 		server.DefaultAuthWebhookMinWaitInterval,
-		"Minimum wait interval for authorization webhook.",
+		"Minimum wait interval between retries(exponential backoff).",
 	)
 	cmd.Flags().DurationVar(
-		&authWebhookRequestTimeout,
-		"auth-webhook-request-timeout",
-		server.DefaultAuthWebhookRequestTimeout,
-		"Maximum wait time per authorization webhook request.",
+		&authWebhookMaxWaitInterval,
+		"auth-webhook-max-wait-interval",
+		server.DefaultAuthWebhookMaxWaitInterval,
+		"Maximum wait interval between retries(exponential backoff).",
 	)
 	cmd.Flags().IntVar(
 		&conf.Backend.AuthWebhookCacheSize,

pkg/webhook/client.go

@@ -47,10 +47,10 @@ var (
 
 // Options are the options for the webhook httpClient.
 type Options struct {
+	RequestTimeout  time.Duration
 	MaxRetries      uint64
 	MinWaitInterval time.Duration
 	MaxWaitInterval time.Duration
-	RequestTimeout  time.Duration
 }
 
 // Client is a httpClient for the webhook.

pkg/webhook/client_test.go

@@ -161,7 +161,7 @@ func TestHMAC(t *testing.T) {
 	})
 }
 
-func TestRetryRequest(t *testing.T) {
+func TestBackoff(t *testing.T) {
 	replyAfter := 4
 	reachableRetries := replyAfter - 1
 	unreachableRetries := replyAfter - 2
@@ -170,17 +170,17 @@ func TestRetryRequest(t *testing.T) {
 	defer server.Close()
 
 	reachableClient := webhook.NewClient[testRequest, testResponse](webhook.Options{
+		RequestTimeout:  10 * time.Millisecond,
 		MaxRetries:      uint64(reachableRetries),
 		MinWaitInterval: 1 * time.Millisecond,
 		MaxWaitInterval: 5 * time.Millisecond,
-		RequestTimeout:  10 * time.Millisecond,
 	})
 
 	unreachableClient := webhook.NewClient[testRequest, testResponse](webhook.Options{
+		RequestTimeout:  10 * time.Millisecond,
 		MaxRetries:      uint64(unreachableRetries),
 		MinWaitInterval: 1 * time.Millisecond,
 		MaxWaitInterval: 5 * time.Millisecond,
-		RequestTimeout:  10 * time.Millisecond,
 	})
 
 	t.Run("retry fail test", func(t *testing.T) {
@@ -215,17 +215,17 @@ func TestRequestTimeout(t *testing.T) {
 	defer server.Close()
 
 	reachableClient := webhook.NewClient[testRequest, testResponse](webhook.Options{
+		RequestTimeout:  15 * time.Millisecond,
 		MaxRetries:      0,
 		MinWaitInterval: 0,
 		MaxWaitInterval: 0,
-		RequestTimeout:  15 * time.Millisecond,
 	})
 
 	unreachableClient := webhook.NewClient[testRequest, testResponse](webhook.Options{
+		RequestTimeout:  5 * time.Millisecond,
 		MaxRetries:      0,
 		MinWaitInterval: 0,
 		MaxWaitInterval: 0,
-		RequestTimeout:  5 * time.Millisecond,
 	})
 
 	t.Run("request succeed after timeout", func(t *testing.T) {
@@ -258,10 +258,10 @@ func TestErrorHandling(t *testing.T) {
 	defer server.Close()
 
 	unreachableClient := webhook.NewClient[testRequest, testResponse](webhook.Options{
+		RequestTimeout:  50 * time.Millisecond,
 		MaxRetries:      0,
 		MinWaitInterval: 0,
 		MaxWaitInterval: 0,
-		RequestTimeout:  50 * time.Millisecond,
 	})
 
 	t.Run("request fails with context done test", func(t *testing.T) {

server/backend/backend.go

@@ -86,11 +86,11 @@ func New(
 		conf.Hostname = hostname
 	}
 
-	// 02. Create auth webhook client and cache.
-	cache := cache.NewLRUExpireCache[string, pkgtypes.Pair[int, *types.AuthWebhookResponse]](
+	// 02. Create the webhook webhookCache and client.
+	webhookCache := cache.NewLRUExpireCache[string, pkgtypes.Pair[int, *types.AuthWebhookResponse]](
 		conf.AuthWebhookCacheSize,
 	)
-	auth := webhook.NewClient[types.AuthWebhookRequest, types.AuthWebhookResponse](
+	webhookClient := webhook.NewClient[types.AuthWebhookRequest, types.AuthWebhookResponse](
 		webhook.Options{
 			MaxRetries:      conf.AuthWebhookMaxRetries,
 			MinWaitInterval: conf.ParseAuthWebhookMinWaitInterval(),
@@ -155,11 +155,13 @@ func New(
 	)
 
 	return &Backend{
-		Config:        conf,
-		WebhookCache:  cache,
-		WebhookClient: auth,
-		Locker:        locker,
-		PubSub:        pubsub,
+		Config: conf,
+
+		WebhookCache:  webhookCache,
+		WebhookClient: webhookClient,
+
+		Locker: locker,
+		PubSub: pubsub,
 
 		Metrics:      metrics,
 		DB:           db,

server/config.go

@@ -60,10 +60,10 @@ const (
 	DefaultSnapshotWithPurgingChanges = false
 	DefaultSnapshotDisableGC          = false
 
+	DefaultAuthWebhookRequestTimeout  = 3 * time.Second
 	DefaultAuthWebhookMaxRetries      = 10
 	DefaultAuthWebhookMaxWaitInterval = 3000 * time.Millisecond
 	DefaultAuthWebhookMinWaitInterval = 100 * time.Millisecond
-	DefaultAuthWebhookRequestTimeout  = 10 * time.Second
 	DefaultAuthWebhookCacheSize       = 5000
 	DefaultAuthWebhookCacheTTL        = 10 * time.Second
 	DefaultProjectCacheSize           = 256

server/config.sample.yml

@@ -65,17 +65,17 @@ Backend:
   # AuthWebhookMethods is the list of methods to use for authorization.
   AuthWebhookMethods: []
 
-  # AuthWebhookMaxRetries is the max count that retries the authorization webhook.
-  AuthWebhookMaxRetries: 10
+  # AuthWebhookRequestTimeout is the timeout for each authorization webhook request.
+  AuthWebhookRequestTimeout: "3s"
 
-  # AuthWebhookMaxWaitInterval is the max interval that waits before retrying the authorization webhook.
-  AuthWebhookMaxWaitInterval: "3s"
+  # AuthWebhookMaxRetries is the max number of retries for the authorization webhook.
+  AuthWebhookMaxRetries: 10
 
-  # AuthWebhookMinWaitInterval is the min interval that waits before retrying the authorization webhook.
+  # AuthWebhookMinWaitInterval is the minimum wait interval between retries(exponential backoff).
   AuthWebhookMinWaitInterval: "100ms"
 
-  # AuthWebhookRequestTimeout is the max waiting time per authorization webhook request.
-  AuthWebhookRequestTimeout: "10s"
+  # AuthWebhookMaxWaitInterval is the maximum wait interval between retries(exponential backoff).
+  AuthWebhookMaxWaitInterval: "3s"
 
   # AuthWebhookCacheTTL is the TTL value to set when caching the authorized result.
   AuthWebhookCacheTTL: "10s"