use same timeout value for http client & graphql

api/header/global.go

@@ -1,5 +1,7 @@
 package header
 
+import "time"
+
 // When the CLI is initialized, we set this to a string of the current CLI subcommand
 // (e.g. `circleci orb list`) with no args or flags, so we include it as a header in API requests.
 var cliCommandStr string = ""
@@ -11,3 +13,9 @@ func SetCommandStr(commandStr string) {
 func GetCommandStr() string {
 	return cliCommandStr
 }
+
+const defaultTimeout = 60 * time.Second
+
+func GetDefaultTimeout() time.Duration {
+	return defaultTimeout
+}

api/rest/client.go

@@ -17,8 +17,6 @@ import (
 	"github.com/CircleCI-Public/circleci-cli/version"
 )
 
-const defaultTimeout = 10 * time.Second
-
 type Client struct {
 	BaseURL     *url.URL
 	circleToken string
@@ -41,7 +39,7 @@ func NewFromConfig(host string, config *settings.Config) *Client {
 	}
 
 	baseURL, _ := url.Parse(host)
-	timeout := defaultTimeout
+	timeout := header.GetDefaultTimeout()
 	if timeoutEnv, ok := os.LookupEnv("CIRCLECI_CLI_TIMEOUT"); ok {
 		if parsedTimeout, err := time.ParseDuration(timeoutEnv); err == nil {
 			timeout = parsedTimeout

settings/settings.go

@@ -16,6 +16,7 @@ import (
 
 	yaml "gopkg.in/yaml.v3"
 
+	"github.com/CircleCI-Public/circleci-cli/api/header"
 	"github.com/CircleCI-Public/circleci-cli/data"
 	"github.com/spf13/afero"
 )
@@ -287,7 +288,7 @@ func (cfg *Config) WithHTTPClient() error {
 	customTransport.TLSClientConfig = tlsConfig
 
 	cfg.HTTPClient = &http.Client{
-		Timeout:   60 * time.Second,
+		Timeout:   header.GetDefaultTimeout(),
 		Transport: customTransport,
 	}