refactor: MaxHeaderBytes -> MaxRequestHeaderBytes

Rename the config property in preparation for the new response header
limit. The YAML property retains its name to stay compatible with any
existing configurations.

config/config.go

@@ -460,7 +460,7 @@ type Config struct {
 	DisableKeepAlives            bool `yaml:"disable_keep_alives"`
 	MaxIdleConns                 int  `yaml:"max_idle_conns,omitempty"`
 	MaxIdleConnsPerHost          int  `yaml:"max_idle_conns_per_host,omitempty"`
-	MaxHeaderBytes               int  `yaml:"max_header_bytes"`
+	MaxRequestHeaderBytes        int  `yaml:"max_request_header_bytes"`
 	KeepAlive100ContinueRequests bool `yaml:"keep_alive_100_continue_requests"`
 
 	HTTPRewrite HTTPRewrite `yaml:"http_rewrite,omitempty"`

config/config_test.go

@@ -213,13 +213,13 @@ status:
 		})
 		It("sets MaxHeaderBytes", func() {
 			var b = []byte(`
-max_header_bytes: 10
+max_request_header_bytes: 10
 `)
 
 			err := config.Initialize(b)
 			Expect(err).ToNot(HaveOccurred())
 
-			Expect(config.MaxHeaderBytes).To(Equal(10))
+			Expect(config.MaxRequestHeaderBytes).To(Equal(10))
 		})
 
 		It("sets prometheus endpoint config", func() {

handlers/max_request_size.go

@@ -21,7 +21,7 @@ const ONE_MB = 1024 * 1024 // bytes * kb
 // NewAccessLog creates a new handler that handles logging requests to the
 // access log
 func NewMaxRequestSize(cfg *config.Config, logger *slog.Logger) *MaxRequestSize {
-	maxSize := cfg.MaxHeaderBytes
+	maxSize := cfg.MaxRequestHeaderBytes
 
 	if maxSize < 1 {
 		maxSize = ONE_MB

handlers/max_request_size_test.go

@@ -63,7 +63,7 @@ var _ = Describe("MaxRequestSize", func() {
 
 	BeforeEach(func() {
 		cfg = &config.Config{
-			MaxHeaderBytes:           89,
+			MaxRequestHeaderBytes:    89,
 			LoadBalance:              config.LOAD_BALANCE_RR,
 			StickySessionCookieNames: config.StringSet{"blarg": struct{}{}},
 		}
@@ -216,7 +216,7 @@ var _ = Describe("MaxRequestSize", func() {
 	Describe("NewMaxRequestSize()", func() {
 		Context("when using a custom MaxHeaderBytes", func() {
 			BeforeEach(func() {
-				cfg.MaxHeaderBytes = 1234
+				cfg.MaxRequestHeaderBytes = 1234
 			})
 			It("returns a new requestSizeHandler using the provided size", func() {
 				Expect(rh.MaxSize).To(Equal(1234))
@@ -225,15 +225,15 @@ var _ = Describe("MaxRequestSize", func() {
 
 		Context("when using a negative MaxHeaderBytes", func() {
 			BeforeEach(func() {
-				cfg.MaxHeaderBytes = -1
+				cfg.MaxRequestHeaderBytes = -1
 			})
 			It("defaults to 1mb", func() {
 				Expect(rh.MaxSize).To(Equal(1024 * 1024))
 			})
 		})
 		Context("when using a zero-value MaxHeaderBytes", func() {
 			BeforeEach(func() {
-				cfg.MaxHeaderBytes = 0
+				cfg.MaxRequestHeaderBytes = 0
 			})
 			It("defaults to 1mb", func() {
 				Expect(rh.MaxSize).To(Equal(1024 * 1024))
@@ -242,7 +242,7 @@ var _ = Describe("MaxRequestSize", func() {
 
 		Context("when using a >1mb MaxHeaderBytes", func() {
 			BeforeEach(func() {
-				cfg.MaxHeaderBytes = handlers.ONE_MB * 2
+				cfg.MaxRequestHeaderBytes = handlers.ONE_MB * 2
 			})
 			It("defaults  to 1mb if the provided size", func() {
 				Expect(rh.MaxSize).To(Equal(1024 * 1024))

integration/common_integration_test.go

@@ -137,7 +137,7 @@ func NewTestState() *testState {
 	}
 	cfg.OAuth.TokenEndpoint, cfg.OAuth.Port = hostnameAndPort(oauthServer.Addr())
 
-	cfg.MaxHeaderBytes = 48 * 1024 //1kb
+	cfg.MaxRequestHeaderBytes = 48 * 1024 //1kb
 
 	return &testState{
 		cfg: cfg,

integration/large_request_test.go

@@ -25,7 +25,7 @@ var _ = Describe("Large requests", func() {
 		testState = NewTestState()
 		testState.EnableAccessLog()
 		testState.EnableMetron()
-		testState.cfg.MaxHeaderBytes = 1 * 1024 // 1kb
+		testState.cfg.MaxRequestHeaderBytes = 1 * 1024 // 1kb
 		testState.StartGorouterOrFail()
 
 		appURL = "echo-app." + test_util.LocalhostDNS