diff --git a/internal/getproviders/registry_client.go b/internal/getproviders/registry_client.go index d6114791e5c3..7608fb806aee 100644 --- a/internal/getproviders/registry_client.go +++ b/internal/getproviders/registry_client.go @@ -52,7 +52,7 @@ var ( func init() { configureDiscoveryRetry() - ConfigureProviderRequestTimeout() + configureRequestTimeout() } var SupportedPluginProtocols = MustParseVersionConstraints("~> 5") @@ -492,9 +492,9 @@ func maxRetryErrorHandler(resp *http.Response, err error, numTries int) (*http.R return resp, fmt.Errorf("the request failed, please try again later%s", errMsg) } -// ConfigureProviderRequestTimeout configures the registry client request timeout from +// configureRequestTimeout configures the registry client request timeout from // environment variables -func ConfigureProviderRequestTimeout() { +func configureRequestTimeout() { requestTimeout = defaultRequestTimeout if v := os.Getenv(registryClientTimeoutEnvName); v != "" { diff --git a/internal/getproviders/registry_client_test.go b/internal/getproviders/registry_client_test.go index 941bf58ae1a3..e294fb3af890 100644 --- a/internal/getproviders/registry_client_test.go +++ b/internal/getproviders/registry_client_test.go @@ -75,7 +75,7 @@ func TestConfigureRegistryClientTimeout(t *testing.T) { }(os.Getenv(registryClientTimeoutEnvName)) os.Setenv(registryClientTimeoutEnvName, "20") - ConfigureProviderRequestTimeout() + configureRequestTimeout() expected := 20 * time.Second if requestTimeout != expected { t.Fatalf("expected timeout %q, got %q", diff --git a/registry/client.go b/registry/client.go index 13d4f0219d4b..03e6f7c9690c 100644 --- a/registry/client.go +++ b/registry/client.go @@ -54,7 +54,7 @@ var ( func init() { configureDiscoveryRetry() - ConfigureProviderRequestTimeout() + configureRequestTimeout() } // Client provides methods to query Terraform Registries. @@ -309,9 +309,9 @@ func maxRetryErrorHandler(resp *http.Response, err error, numTries int) (*http.R return resp, fmt.Errorf("the request failed, please try again later%s", errMsg) } -// ConfigureProviderRequestTimeout configures the registry client request timeout from +// configureRequestTimeout configures the registry client request timeout from // environment variables -func ConfigureProviderRequestTimeout() { +func configureRequestTimeout() { requestTimeout = defaultRequestTimeout if v := os.Getenv(registryClientTimeoutEnvName); v != "" { diff --git a/registry/client_test.go b/registry/client_test.go index 1ad3e185cadc..ad5270fa1eab 100644 --- a/registry/client_test.go +++ b/registry/client_test.go @@ -72,7 +72,7 @@ func TestConfigureRegistryClientTimeout(t *testing.T) { }(os.Getenv(registryClientTimeoutEnvName)) os.Setenv(registryClientTimeoutEnvName, "20") - ConfigureProviderRequestTimeout() + configureRequestTimeout() expected := 20 * time.Second if requestTimeout != expected { t.Fatalf("expected timeout %q, got %q",