default config cat client nil

Author: mustard-mh

components/common-go/experiments/types.go

@@ -49,10 +49,19 @@ func WithGitpodProxy(gitpodHost string) ClientOpt {
 	}
 }
 
+func WithDefaultClient(defaultClient Client) ClientOpt {
+	return func(o *options) {
+		o.defaultClient = defaultClient
+		o.hasDefaultClient = true
+	}
+}
+
 type options struct {
-	pollInterval time.Duration
-	baseURL      string
-	sdkKey       string
+	pollInterval     time.Duration
+	baseURL          string
+	sdkKey           string
+	defaultClient    Client
+	hasDefaultClient bool
 }
 
 // NewClient constructs a new experiments.Client. This is NOT A SINGLETON.
@@ -70,6 +79,9 @@ func NewClient(opts ...ClientOpt) Client {
 	}
 
 	if opt.sdkKey == "" {
+		if opt.hasDefaultClient {
+			return opt.defaultClient
+		}
 		return NewAlwaysReturningDefaultValueClient()
 	}
 	logger := log.Log.Dup()

components/service-waiter/cmd/component.go

@@ -148,8 +148,7 @@ func init() {
 func startWaitFeatureFlag(ctx context.Context, timeout time.Duration) {
 	featureFlagCtx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
-	client := experiments.NewClient()
-
+	client := experiments.NewClient(experiments.WithDefaultClient(nil))
 	defaultSkip := true
 	if client == nil {
 		log.Error("failed to create experiments client, skip immediately")