move DefaultEndpointConfigured to be attr on struct

Author: burmudar

cmd/src/login.go

@@ -66,7 +66,7 @@ Examples:
 
 			if hasEndpointURLConflict {
 				// If the default is configured it means SRC_ENDPOINT is not set
-				if DefaultEndpointConfigured(cfg) {
+				if cfg.usingDefaultEndpoint {
 					fmt.Fprintf(os.Stderr, "⚠️  Warning: No SRC_ENDPOINT is configured in the environment. Logging in using %q.\n", loginEndpointURL)
 					fmt.Fprintf(os.Stderr, "\n💡 Tip: To use this endpoint in your shell, run:\n\n   export SRC_ENDPOINT=%s\n\nNOTE: By default src will use %q if SRC_ENDPOINT is not set.\n", loginEndpointURL, SGDotComEndpoint)
 				} else {

cmd/src/main.go

@@ -143,13 +143,14 @@ var cfg *config
 
 // config holds the resolved configuration used at runtime.
 type config struct {
-	accessToken       string
-	additionalHeaders map[string]string
-	proxyURL          *url.URL
-	proxyPath         string
-	configFilePath    string
-	endpointURL       *url.URL // always non-nil; defaults to https://sourcegraph.com via readConfig
-	inCI              bool
+	accessToken          string
+	additionalHeaders    map[string]string
+	proxyURL             *url.URL
+	proxyPath            string
+	configFilePath       string
+	endpointURL          *url.URL // always non-nil; defaults to https://sourcegraph.com via readConfig
+	usingDefaultEndpoint bool
+	inCI                 bool
 }
 
 // configFromFile holds the config as read from the config file,
@@ -273,6 +274,7 @@ func readConfig() (*config, error) {
 	}
 	if endpointStr == "" {
 		endpointStr = SGDotComEndpoint
+		cfg.usingDefaultEndpoint = true
 	}
 	if envProxy != "" {
 		proxyStr = envProxy
@@ -350,15 +352,6 @@ func isCI() bool {
 	return ok && value != ""
 }
 
-func DefaultEndpointConfigured(cfg *config) bool {
-	_, ok := os.LookupEnv("SRC_ENDPOINT")
-	if ok {
-		return false
-	}
-	return cfg.endpointURL != nil && cfg.endpointURL.String() == SGDotComEndpoint
-
-}
-
 // isValidUnixSocket checks if the given path is a valid Unix socket.
 //
 // Parameters: