Address feature flag timeout issues (#3221)

Author: sgagniere

cmd/docs/main.go

@@ -6,11 +6,13 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"testing"
 
 	"github.com/confluentinc/cli/v4/internal"
 	"github.com/confluentinc/cli/v4/pkg/config"
 	"github.com/confluentinc/cli/v4/pkg/docs"
 	pversion "github.com/confluentinc/cli/v4/pkg/version"
+	testserver "github.com/confluentinc/cli/v4/test/test-server"
 )
 
 // Auto-generate documentation files for all CLI commands. Documentation uses reStructured Text (ReST) format, and is
@@ -19,6 +21,10 @@ import (
 // This code is adapted from https://github.com/spf13/cobra/blob/master/doc/rest_docs.md
 
 func main() {
+	// Set up test server for feature flags called by the code
+	testBackend := testserver.StartTestCloudServer(&testing.T{}, true)
+	defer testBackend.Close()
+
 	// Prevent printing the user's $HOME in docs when generating confluent local services kafka
 	home, err := os.UserHomeDir()
 	if err != nil {

cmd/lint/main.go

@@ -5,13 +5,15 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"testing"
 
 	"github.com/client9/gospell"
 
 	"github.com/confluentinc/cli/v4/internal"
 	"github.com/confluentinc/cli/v4/pkg/config"
 	"github.com/confluentinc/cli/v4/pkg/linter"
 	pversion "github.com/confluentinc/cli/v4/pkg/version"
+	testserver "github.com/confluentinc/cli/v4/test/test-server"
 )
 
 var commandRules = []linter.CommandRule{
@@ -367,6 +369,10 @@ func init() {
 }
 
 func main() {
+	// Set up test server for feature flags called by the code
+	testBackend := testserver.StartTestCloudServer(&testing.T{}, true)
+	defer testBackend.Close()
+
 	flag.Parse()
 
 	vocab, err := gospell.NewGoSpell(affFile, dicFile)

pkg/featureflags/feature_flags.go

@@ -27,6 +27,7 @@ import (
 const (
 	baseURL  = "%s/ldapi/sdk/eval/%s/"
 	userPath = "users/%s"
+	timeout  = 15 * time.Second
 )
 
 const (
@@ -46,16 +47,15 @@ const (
 var Manager launchDarklyManager
 
 type launchDarklyManager struct {
-	cliClient             *sling.Sling
-	ccloudClient          *sling.Sling
-	Command               *cobra.Command
-	flags                 []string
-	hideTimeoutWarning    bool
-	isDisabled            bool
-	timeoutWarningPrinted bool
-	version               *version.Version
-	latestCliFlags        map[string]any
-	latestCCloudFlags     map[string]any
+	cliClient         *sling.Sling
+	ccloudClient      *sling.Sling
+	Command           *cobra.Command
+	flags             []string
+	isDisabled        bool
+	isTest            bool
+	version           *version.Version
+	latestCliFlags    map[string]any
+	latestCCloudFlags map[string]any
 }
 
 func Init(cfg *config.Config) {
@@ -76,12 +76,11 @@ func Init(cfg *config.Config) {
 	}
 
 	Manager = launchDarklyManager{
-		cliClient:             sling.New().Base(cliBasePath),
-		ccloudClient:          sling.New().Base(ccloudBasePath),
-		hideTimeoutWarning:    cfg.IsTest,
-		isDisabled:            cfg.DisableFeatureFlags,
-		timeoutWarningPrinted: false,
-		version:               cfg.Version,
+		cliClient:    sling.New().Client(&http.Client{Timeout: timeout}).Base(cliBasePath),
+		ccloudClient: sling.New().Client(&http.Client{Timeout: timeout}).Base(ccloudBasePath),
+		isDisabled:   cfg.DisableFeatureFlags || !cfg.IsCloudLogin(),
+		isTest:       cfg.IsTest,
+		version:      cfg.Version,
 	}
 }
 
@@ -155,7 +154,7 @@ func (ld *launchDarklyManager) generalVariation(key string, ctx *config.Context,
 	} else if ld.areCurrentFlagsAvailable(client, key) { // if the flag is not cached but we've already retrieved the newest flag values for the current user, check those maps first
 		flagVals = ld.getCurrentFlags(client)
 		if shouldCache {
-			writeFlagsToConfig(ctx, key, flagVals, user, client)
+			ld.writeFlagsToConfig(ctx, key, flagVals, user, client)
 		}
 	} else {
 		flagVals, err = ld.fetchFlags(user, client)
@@ -164,7 +163,7 @@ func (ld *launchDarklyManager) generalVariation(key string, ctx *config.Context,
 			return defaultVal
 		}
 		if shouldCache {
-			writeFlagsToConfig(ctx, key, flagVals, user, client)
+			ld.writeFlagsToConfig(ctx, key, flagVals, user, client)
 		}
 	}
 	if _, ok := flagVals[key]; ok {
@@ -197,11 +196,9 @@ func (ld *launchDarklyManager) fetchFlags(user lduser.User, client config.Launch
 	}
 	if err != nil {
 		log.CliLogger.Debug(resp)
-		if !ld.hideTimeoutWarning && !ld.timeoutWarningPrinted {
-			output.ErrPrintln(false, "[WARN] Failed to fetch feature flags.")
-			output.ErrPrintln(false, errors.ComposeSuggestionsMessage("Check connectivity to https://confluent.cloud or disable feature flags using `confluent configuration update disable_feature_flags true`."))
-			ld.timeoutWarningPrinted = true
-		}
+		output.ErrPrintln(false, "[WARN] Failed to fetch feature flags.")
+		output.ErrPrintln(false, errors.ComposeSuggestionsMessage("Check connectivity to https://confluent.cloud or disable feature flags using `confluent configuration update disable_feature_flags true`."))
+		ld.isDisabled = true // disable flags for the rest of the command if any request times out
 
 		return flagVals, fmt.Errorf("error fetching feature flags: %w", err)
 	}
@@ -296,8 +293,8 @@ func (ld *launchDarklyManager) contextToLDUser(ctx *config.Context) lduser.User
 	return userBuilder.Build()
 }
 
-func writeFlagsToConfig(ctx *config.Context, key string, vals map[string]any, user lduser.User, client config.LaunchDarklyClient) {
-	if ctx == nil {
+func (ld *launchDarklyManager) writeFlagsToConfig(ctx *config.Context, key string, vals map[string]any, user lduser.User, client config.LaunchDarklyClient) {
+	if ctx == nil || ld.isTest {
 		return
 	}