fixup! feat(config): Add fields for controller rate limit configuration

hashicorp · Oct 11, 2023 · 4aa4d74 · 4aa4d74
1 parent 79042e3
commit 4aa4d74
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go
@@ -216,7 +216,7 @@ type Controller struct {
 	SchedulerRunJobInterval time.Duration `hcl:"-"`
 
 	ApiRateLimits            ratelimit.Configs `hcl:"-"`
-	ApiRateLimiterMaxEntires int               `hcl:"api_rate_limit_max_entries"`
+	ApiRateLimiterMaxEntries int               `hcl:"api_rate_limit_max_entries"`
 
 	// License is the license used by HCP builds
 	License string `hcl:"license"`
@@ -692,8 +692,8 @@ func Parse(d string) (*Config, error) {
 			return nil, err
 		}
 
-		if result.Controller.ApiRateLimiterMaxEntires <= 0 {
-			result.Controller.ApiRateLimiterMaxEntires = ratelimit.DefaultLimiterMaxEntries
+		if result.Controller.ApiRateLimiterMaxEntries <= 0 {
+			result.Controller.ApiRateLimiterMaxEntries = ratelimit.DefaultLimiterMaxEntries
 		}
 	}
 

diff --git a/internal/cmd/config/config_load_test.go b/internal/cmd/config/config_load_test.go
@@ -419,7 +419,7 @@ func TestLoad(t *testing.T) {
 					WorkerStatusGracePeriodDuration: 0,
 					LivenessTimeToStaleDuration:     0,
 					ApiRateLimits:                   make(ratelimit.Configs, 0),
-					ApiRateLimiterMaxEntires:        ratelimit.DefaultLimiterMaxEntries,
+					ApiRateLimiterMaxEntries:        ratelimit.DefaultLimiterMaxEntries,
 				},
 				DevController:           false,
 				DevUiPassthroughDir:     "",
@@ -844,7 +844,7 @@ func TestLoad(t *testing.T) {
 					WorkerStatusGracePeriodDuration: 0,
 					LivenessTimeToStaleDuration:     0,
 					ApiRateLimits:                   make(ratelimit.Configs, 0),
-					ApiRateLimiterMaxEntires:        ratelimit.DefaultLimiterMaxEntries,
+					ApiRateLimiterMaxEntries:        ratelimit.DefaultLimiterMaxEntries,
 				},
 				DevController:           false,
 				DevUiPassthroughDir:     "",
@@ -1283,7 +1283,7 @@ func TestLoad(t *testing.T) {
 							Unlimited: false,
 						},
 					},
-					ApiRateLimiterMaxEntires: ratelimit.DefaultLimiterMaxEntries,
+					ApiRateLimiterMaxEntries: ratelimit.DefaultLimiterMaxEntries,
 				},
 				DevController:           false,
 				DevUiPassthroughDir:     "",
@@ -1703,7 +1703,7 @@ func TestLoad(t *testing.T) {
 					WorkerStatusGracePeriodDuration: 0,
 					LivenessTimeToStaleDuration:     0,
 					ApiRateLimits:                   make(ratelimit.Configs, 0),
-					ApiRateLimiterMaxEntires:        ratelimit.DefaultLimiterMaxEntries,
+					ApiRateLimiterMaxEntries:        ratelimit.DefaultLimiterMaxEntries,
 				},
 				DevController:           false,
 				DevUiPassthroughDir:     "",
@@ -1794,7 +1794,7 @@ func TestLoad(t *testing.T) {
 					WorkerStatusGracePeriodDuration: 0,
 					LivenessTimeToStaleDuration:     0,
 					ApiRateLimits:                   make(ratelimit.Configs, 0),
-					ApiRateLimiterMaxEntires:        ratelimit.DefaultLimiterMaxEntries,
+					ApiRateLimiterMaxEntries:        ratelimit.DefaultLimiterMaxEntries,
 				},
 				DevController:           false,
 				DevUiPassthroughDir:     "",

diff --git a/internal/cmd/config/config_test.go b/internal/cmd/config/config_test.go
@@ -112,7 +112,7 @@ func TestDevController(t *testing.T) {
 			Name:                     "dev-controller",
 			Description:              "A default controller created in dev mode",
 			ApiRateLimits:            make(ratelimit.Configs, 0),
-			ApiRateLimiterMaxEntires: ratelimit.DefaultLimiterMaxEntries,
+			ApiRateLimiterMaxEntries: ratelimit.DefaultLimiterMaxEntries,
 		},
 		DevController: true,
 	}
@@ -487,7 +487,7 @@ func TestDevCombined(t *testing.T) {
 			Name:                     "dev-controller",
 			Description:              "A default controller created in dev mode",
 			ApiRateLimits:            make(ratelimit.Configs, 0),
-			ApiRateLimiterMaxEntires: ratelimit.DefaultLimiterMaxEntries,
+			ApiRateLimiterMaxEntries: ratelimit.DefaultLimiterMaxEntries,
 		},
 		DevController: true,
 		Worker: &Worker{