sync upstream

Author: yandex-cloud-bot

pkg/retry/v1/config.go

@@ -12,20 +12,19 @@ import (
 type RetryConfig struct {
 	mc              map[nameConfig]*methodConfig
 	retryThrottling *retryThrottling
-	waitForReady    bool
 }
 
 type RetryOption func(c *RetryConfig)
 
 type grpcRetryPolicy struct {
 	MethodConfig    []*methodConfig `json:"methodConfig"`
 	RetryThrottling retryThrottling `json:"retryThrottling"`
-	WaitForReady    bool            `json:"waitForReady"`
 }
 
 type methodConfig struct {
-	NameConfig  []nameConfig `json:"name"`
-	RetryPolicy retryPolicy  `json:"retryPolicy"`
+	NameConfig   []nameConfig `json:"name"`
+	RetryPolicy  retryPolicy  `json:"retryPolicy"`
+	WaitForReady bool         `json:"waitForReady"`
 }
 
 type nameConfig struct {

pkg/retry/v1/default.go

@@ -16,7 +16,6 @@ func defaultRetryConfig() *RetryConfig {
 			MaxTokens:  100,
 			TokenRatio: 0.1,
 		},
-		waitForReady: true,
 	}
 }
 
@@ -30,5 +29,6 @@ func defaultMethodConfig() *methodConfig {
 			BackoffMultiplier:    2,
 			RetryableStatusCodes: []string{"UNAVAILABLE"},
 		},
+		WaitForReady: true,
 	}
 }

pkg/retry/v1/dial_option.go

@@ -33,7 +33,7 @@ func RetryDialOption(opts ...RetryOption) (grpc.DialOption, error) {
 		mc = append(mc, v)
 	}
 
-	c, err := json.Marshal(&grpcRetryPolicy{MethodConfig: mc, RetryThrottling: *config.retryThrottling, WaitForReady: config.waitForReady})
+	c, err := json.Marshal(&grpcRetryPolicy{MethodConfig: mc, RetryThrottling: *config.retryThrottling})
 	if err != nil {
 		return nil, err
 	}