Revert "Add HTTP request burst management (#162)" (#164)

This reverts commit 2962c1c.
firehydrant · Oct 16, 2024 · cca0384 · cca0384
1 parent a1e6e5f
commit cca0384
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.12.1
+
+REVERTED:
+* Reverted the client-side rate limiting and burst control ([#164](https://github.com/firehydrant/terraform-provider-firehydrant/pull/164))
+
 ## 0.12.0
 
 ENHANCEMENTS:

diff --git a/firehydrant/client.go b/firehydrant/client.go
@@ -37,7 +37,6 @@ type APIClient struct {
 	baseURL         string
 	token           string
 	userAgentSuffix string
-	doer            *RateLimitedHTTPDoer
 }
 
 const (
@@ -115,16 +114,13 @@ func NewRestClient(token string, opts ...OptFunc) (*APIClient, error) {
 		}
 	}
 
-	c.doer = NewRateLimitedHTTPDoer()
-
 	return c, nil
 }
 
 func (c *APIClient) client() *sling.Sling {
 	bi := GetBuildInfo()
 
 	return sling.New().Base(c.baseURL).
-		Doer(c.doer).
 		Set(
 			"User-Agent",
 			fmt.Sprintf(

diff --git a/firehydrant/client_test.go b/firehydrant/client_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/bxcodec/faker/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/time/rate"
 )
 
 var (
@@ -76,9 +75,6 @@ func setupClient(requestPath string, mockedResponse interface{}, requestTests ..
 		return nil, nil, fmt.Errorf("could not generate rest client: %w", err)
 	}
 
-	// Don't perform client-side rate limiting in tests.
-	c.doer.WithLimiter(rate.NewLimiter(rate.Inf, 0))
-
 	teardown := func() {
 		ts.Close()
 	}

diff --git a/firehydrant/httpclient.go b/firehydrant/httpclient.go
diff --git a/firehydrant/httpclient_test.go b/firehydrant/httpclient_test.go
diff --git a/go.mod b/go.mod
@@ -4,21 +4,20 @@ go 1.22.1
 
 require (
 	github.com/bxcodec/faker/v3 v3.5.0
-	github.com/davecgh/go-spew v1.1.1
 	github.com/dghubble/sling v1.4.0
 	github.com/google/go-querystring v1.1.0
 	github.com/hashicorp/terraform-plugin-log v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	github.com/pkg/errors v0.9.1
 	github.com/senseyeio/duration v0.0.0-20180430131211-7c2a214ada46
 	github.com/stretchr/testify v1.7.2
-	golang.org/x/time v0.7.0
 )
 
 require (
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect