Skip to content

Commit

Permalink
Fix CI?
Browse files Browse the repository at this point in the history
  • Loading branch information
Thijmen authored and Thijmen Stavenuiter committed Jul 13, 2023
1 parent e5c010c commit 4a33909
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
6 changes: 2 additions & 4 deletions demo.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
package traefikremovequeryparametersbyregex

import (
"context"
"errors"
"log"
"net/http"
Expand Down Expand Up @@ -37,7 +36,7 @@ type QueryParameterRemover struct {
}

// New creates a new instance of this plugin.
func New(ctx context.Context, next http.Handler, config *Config, name string) (http.Handler, error) {
func New(next http.Handler, config *Config, name string) (http.Handler, error) {
if !config.Type.isValid() {
return nil, errors.New("invalid modification type, expected deleteexcept")
}
Expand Down Expand Up @@ -91,14 +90,13 @@ func (q *QueryParameterRemover) ServeHTTP(rw http.ResponseWriter, req *http.Requ

regex := regexp.MustCompile(q.config.AllowedValuesRegex)

for param, _ := range req.URL.Query() {
for param := range req.URL.Query() {
if !regex.MatchString(param) {
qry.Del(param)
req.URL.RawQuery = qry.Encode()
log.Printf("Removed parameter: %s \n", param)
}
}

}

req.URL.RawQuery = qry.Encode()
Expand Down
13 changes: 6 additions & 7 deletions demo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package traefikremovequeryparametersbyregex_test

import (
"context"
traefikremovequeryparametersbyregex "github.com/Thijmen/traefik-remove-query-parameters-by-regex"
"net/http"
"net/http/httptest"
"testing"

traefikremovequeryparametersbyregex "github.com/Thijmen/traefik-remove-query-parameters-by-regex"
)

// region Delete
Expand Down Expand Up @@ -54,9 +55,8 @@ func TestDeleteQueryParamDoesntWorkOnProperDomainWithLongerPath(t *testing.T) {
func TestErrorInvalidType(t *testing.T) {
cfg := traefikremovequeryparametersbyregex.CreateConfig()
cfg.Type = "bla"
ctx := context.Background()
next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
_, err := traefikremovequeryparametersbyregex.New(ctx, next, cfg, "query-params-remover-plugin")
_, err := traefikremovequeryparametersbyregex.New(next, cfg, "query-params-remover-plugin")

if err == nil {
t.Error("expected error but err is nil")
Expand All @@ -66,9 +66,8 @@ func TestErrorInvalidType(t *testing.T) {
func TestErrorNoParam(t *testing.T) {
cfg := traefikremovequeryparametersbyregex.CreateConfig()
cfg.Type = "delete"
ctx := context.Background()
next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
_, err := traefikremovequeryparametersbyregex.New(ctx, next, cfg, "query-modification-plugin")
_, err := traefikremovequeryparametersbyregex.New(next, cfg, "query-modification-plugin")

if err == nil {
t.Error("expected error but err is nil")
Expand All @@ -78,7 +77,7 @@ func TestErrorNoParam(t *testing.T) {
func createReqAndRecorder(cfg *traefikremovequeryparametersbyregex.Config) (http.Handler, *httptest.ResponseRecorder, *http.Request, error) {
ctx := context.Background()
next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
handler, err := traefikremovequeryparametersbyregex.New(ctx, next, cfg, "query-modification-plugin")
handler, err := traefikremovequeryparametersbyregex.New(next, cfg, "query-modification-plugin")
if err != nil {
return nil, nil, nil, err
}
Expand All @@ -89,7 +88,7 @@ func createReqAndRecorder(cfg *traefikremovequeryparametersbyregex.Config) (http
return handler, recorder, req, err
}

func assertQueryModification(t *testing.T, cfg *traefikremovequeryparametersbyregex.Config, previous, expected string, uriPath string) {
func assertQueryModification(t *testing.T, cfg *traefikremovequeryparametersbyregex.Config, previous, expected, uriPath string) {
handler, recorder, req, err := createReqAndRecorder(cfg)
if err != nil {
t.Fatal(err)
Expand Down

0 comments on commit 4a33909

Please sign in to comment.