Update testing to match repo

http.go

@@ -51,9 +51,9 @@ type HTTP struct {
 
 	WebhookVerification *webhookVerification `json:"webhook_verification,omitempty"`
 
-	RequestHeader *httpHeaders `json:"request_header,omitempty"`
+	RequestHeader *httpRequestHeaders `json:"request_header,omitempty"`
 
-	ResponseHeader *httpHeaders `json:"header,omitempty"`
+	ResponseHeader *httpResponseHeaders `json:"header,omitempty"`
 
 	l *zap.Logger
 }
@@ -159,23 +159,23 @@ func (t *HTTP) provisionOpts(ctx caddy.Context) error {
 		if err != nil {
 			return fmt.Errorf("provisioning webhook_verification: %v", err)
 		}
-		t.opts = append(t.opts, t.WebhookVerification.WebhookVerificationOption)
+		t.opts = append(t.opts, t.WebhookVerification.opt)
 	}
 
 	if t.RequestHeader != nil {
-		requestHeaderOpts, err := t.RequestHeader.provisionRequestHeaders()
+		err := t.RequestHeader.Provision(ctx)
 		if err != nil {
 			return fmt.Errorf("provisioning request_header: %v", err)
 		}
-		t.opts = append(t.opts, requestHeaderOpts...)
+		t.opts = append(t.opts, t.RequestHeader.Opts...)
 	}
 
 	if t.ResponseHeader != nil {
-		responseHeaderOpts, err := t.ResponseHeader.provisionResponseHeaders()
+		err := t.ResponseHeader.Provision(ctx)
 		if err != nil {
 			return fmt.Errorf("provisioning header: %v", err)
 		}
-		t.opts = append(t.opts, responseHeaderOpts...)
+		t.opts = append(t.opts, t.ResponseHeader.Opts...)
 	}
 
 	return nil
@@ -458,8 +458,8 @@ func (t *HTTP) unmarshalWebhookVerification(d *caddyfile.Dispenser) error {
 }
 
 func (t *HTTP) unmarshalRequestHeader(d *caddyfile.Dispenser) error {
-	requestHeader := httpHeaders{}
-	err := requestHeader.unmarshalHeaders(d)
+	requestHeader := httpRequestHeaders{}
+	err := requestHeader.UnmarshalCaddyfile(d)
 	if err != nil {
 		return d.Errf(`parsing request_header %w`, err)
 	}
@@ -470,8 +470,8 @@ func (t *HTTP) unmarshalRequestHeader(d *caddyfile.Dispenser) error {
 }
 
 func (t *HTTP) unmarshalResponseHeader(d *caddyfile.Dispenser) error {
-	responseHeader := httpHeaders{}
-	err := responseHeader.unmarshalHeaders(d)
+	responseHeader := httpResponseHeaders{}
+	err := responseHeader.UnmarshalCaddyfile(d)
 	if err != nil {
 		return d.Errf(`parsing header %w`, err)
 	}

http_headers.go

@@ -10,39 +10,14 @@ import (
 )
 
 type httpHeaders struct {
-	opts []config.HTTPEndpointOption
+	Opts []config.HTTPEndpointOption
 
 	Added   map[string]string `json:"added,omitempty"`
 	Removed []string          `json:"removed,omitempty"`
 }
 
-func (h *httpHeaders) provisionRequestHeaders() ([]config.HTTPEndpointOption, error) {
-
-	for name, value := range h.Added {
-		h.opts = append(h.opts, config.WithRequestHeader(name, value))
-	}
-
-	for _, name := range h.Removed {
-		h.opts = append(h.opts, config.WithRemoveRequestHeader(name))
-	}
-
-	return h.opts, nil
-}
-
-func (h *httpHeaders) provisionResponseHeaders() ([]config.HTTPEndpointOption, error) {
-
-	for name, value := range h.Added {
-		h.opts = append(h.opts, config.WithResponseHeader(name, value))
-	}
-
-	for _, name := range h.Removed {
-		h.opts = append(h.opts, config.WithRemoveResponseHeader(name))
-	}
-
-	return h.opts, nil
-}
-
-func (h *httpHeaders) doReplace(repl *caddy.Replacer) error {
+func (h *httpHeaders) doReplace() {
+	repl := caddy.NewReplacer()
 
 	replacedAddedHeaders := make(map[string]string, len(h.Added))
 
@@ -66,20 +41,20 @@ func (h *httpHeaders) doReplace(repl *caddy.Replacer) error {
 
 	h.Removed = replacedRemovedHeaders
 
-	return nil
 }
 
-func (h *httpHeaders) unmarshalHeaders(d *caddyfile.Dispenser) error {
+func (h *httpHeaders) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 	for d.Next() {
 		// first see if headers are in the initial line
 		var hasArgs bool
 		if d.NextArg() {
 			hasArgs = true
 			field := d.Val()
 			var value string
-			if !d.AllArgs(&value) {
-				d.ArgErr() // Additional arg Would be replacement if ngrok handled that
+			if d.CountRemainingArgs() > 1 {
+				return d.ArgErr() // Additional arg Would be replacement if ngrok handled that
 			}
+			d.Args(&value)
 			err := h.applyHeaderOp(
 				field,
 				value,
@@ -102,9 +77,10 @@ func (h *httpHeaders) unmarshalHeaders(d *caddyfile.Dispenser) error {
 			field = strings.TrimSuffix(field, ":")
 
 			var value string
-			if !d.AllArgs(&value) {
-				d.ArgErr() // Additional arg Would be replacement if ngrok handled that
+			if d.CountRemainingArgs() > 1 {
+				return d.ArgErr() // Additional arg Would be replacement if ngrok handled that
 			}
+			d.Args(&value)
 			err := h.applyHeaderOp(
 				field,
 				value,

http_request_headers.go

@@ -0,0 +1,24 @@
+package ngroklistener
+
+import (
+	"github.com/caddyserver/caddy/v2"
+	"golang.ngrok.com/ngrok/config"
+)
+
+type httpRequestHeaders struct {
+	httpHeaders
+}
+
+func (h *httpRequestHeaders) Provision(caddy.Context) error {
+	h.doReplace()
+
+	for name, value := range h.Added {
+		h.Opts = append(h.Opts, config.WithRequestHeader(name, value))
+	}
+
+	for _, name := range h.Removed {
+		h.Opts = append(h.Opts, config.WithRemoveRequestHeader(name))
+	}
+
+	return nil
+}