Fix not enough arguments (#8)

* Fix not enough arguments * Update go.mod * Fix Errf format
mholt · Apr 27, 2022 · 73efe0b · 73efe0b
1 parent cdde3c7
commit 73efe0b
Show file tree

Hide file tree

Showing 4 changed files with 1,185 additions and 346 deletions.
diff --git a/caddyfile.go b/caddyfile.go
@@ -69,7 +69,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 							return d.ArgErr()
 						}
 						if zone.Window != 0 {
-							return d.Errf("zone window already specified: %s", zone.Window)
+							return d.Errf("zone window already specified: %v", zone.Window)
 						}
 						window, err := caddy.ParseDuration(d.Val())
 						if err != nil {
@@ -82,7 +82,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 							return d.ArgErr()
 						}
 						if zone.MaxEvents != 0 {
-							return d.Errf("zone max events already specified: %s", zone.MaxEvents)
+							return d.Errf("zone max events already specified: %v", zone.MaxEvents)
 						}
 						maxEvents, err := strconv.Atoi(d.Val())
 						if err != nil {
@@ -110,7 +110,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 							return d.ArgErr()
 						}
 						if h.Distributed.ReadInterval != 0 {
-							return d.Errf("read interval already specified: %s", h.Distributed.ReadInterval)
+							return d.Errf("read interval already specified: %v", h.Distributed.ReadInterval)
 						}
 						interval, err := caddy.ParseDuration(d.Val())
 						if err != nil {
@@ -123,7 +123,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 							return d.ArgErr()
 						}
 						if h.Distributed.WriteInterval != 0 {
-							return d.Errf("write interval already specified: %s", h.Distributed.WriteInterval)
+							return d.Errf("write interval already specified: %v", h.Distributed.WriteInterval)
 						}
 						interval, err := caddy.ParseDuration(d.Val())
 						if err != nil {
@@ -153,7 +153,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 					return d.ArgErr()
 				}
 				if h.Jitter != 0 {
-					return d.Errf("jitter already specified: %s", h.Jitter)
+					return d.Errf("jitter already specified: %v", h.Jitter)
 				}
 				jitter, err := strconv.ParseFloat(d.Val(), 64)
 				if err != nil {
@@ -166,7 +166,7 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 					return d.ArgErr()
 				}
 				if h.SweepInterval != 0 {
-					return d.Errf("sweep interval already specified: %s", h.SweepInterval)
+					return d.Errf("sweep interval already specified: %v", h.SweepInterval)
 				}
 				interval, err := caddy.ParseDuration(d.Val())
 				if err != nil {

diff --git a/distributed.go b/distributed.go
@@ -103,7 +103,7 @@ func (h Handler) syncDistributedWrite(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	err = h.storage.Store(path.Join(storagePrefix, h.Distributed.instanceID+".rlstate"), buf.Bytes())
+	err = h.storage.Store(ctx, path.Join(storagePrefix, h.Distributed.instanceID+".rlstate"), buf.Bytes())
 	if err != nil {
 		return err
 	}
@@ -113,7 +113,7 @@ func (h Handler) syncDistributedWrite(ctx context.Context) error {
 
 // syncDistributedRead loads all rate limiter states from other instances.
 func (h Handler) syncDistributedRead(ctx context.Context) error {
-	instanceFiles, err := h.storage.List(storagePrefix, false)
+	instanceFiles, err := h.storage.List(ctx, storagePrefix, false)
 	if err != nil {
 		return err
 	}
@@ -129,7 +129,7 @@ func (h Handler) syncDistributedRead(ctx context.Context) error {
 			continue
 		}
 
-		encoded, err := h.storage.Load(instanceFile)
+		encoded, err := h.storage.Load(ctx, instanceFile)
 		if err != nil {
 			h.logger.Error("unable to load distributed rate limiter state",
 				zap.String("key", instanceFile),

diff --git a/go.mod b/go.mod
@@ -1,9 +1,112 @@
 module github.com/mholt/caddy-ratelimit
 
-go 1.16
+go 1.18
 
 require (
-	github.com/caddyserver/caddy/v2 v2.4.0-beta.1.0.20210401181228-7da9241fd7d1
-	github.com/caddyserver/certmagic v0.12.1-0.20210224184602-7550222c4a6a
-	go.uber.org/zap v1.16.0
+	github.com/caddyserver/caddy/v2 v2.5.0
+	github.com/caddyserver/certmagic v0.16.1
+	go.uber.org/zap v1.21.0
 )
+
+require (
+	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
+	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.1.1 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
+	github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f // indirect
+	github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/dgraph-io/badger v1.6.2 // indirect
+	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
+	github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd // indirect
+	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/go-kit/kit v0.10.0 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/cel-go v0.7.3 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.10.1 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.2.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/pgtype v1.9.0 // indirect
+	github.com/jackc/pgx/v4 v4.14.0 // indirect
+	github.com/klauspost/compress v1.15.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
+	github.com/libdns/libdns v0.2.1 // indirect
+	github.com/lucas-clemente/quic-go v0.27.0 // indirect
+	github.com/manifoldco/promptui v0.9.0 // indirect
+	github.com/marten-seemann/qpack v0.2.1 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.13 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/mholt/acmez v1.0.2 // indirect
+	github.com/micromdm/scep/v2 v2.1.0 // indirect
+	github.com/miekg/dns v1.1.48 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-ps v1.0.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.34.0 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/rs/xid v1.2.1 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/slackhq/nebula v1.5.2 // indirect
+	github.com/smallstep/certificates v0.19.0 // indirect
+	github.com/smallstep/cli v0.18.0 // indirect
+	github.com/smallstep/nosql v0.4.0 // indirect
+	github.com/smallstep/truststore v0.11.0 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
+	github.com/tailscale/tscert v0.0.0-20220125204807-4509a5fbaf74 // indirect
+	github.com/urfave/cli v1.22.5 // indirect
+	go.etcd.io/bbolt v1.3.6 // indirect
+	go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
+	go.step.sm/cli-utils v0.7.0 // indirect
+	go.step.sm/crypto v0.16.1 // indirect
+	go.step.sm/linkedca v0.15.0 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
+	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
+	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
+	golang.org/x/text v0.3.8-0.20211004125949-5bd84dd9b33b // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
+	google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect
+	google.golang.org/grpc v1.44.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	howett.net/plist v1.0.0 // indirect
+)
+
+replace github.com/lucas-clemente/quic-go => github.com/lucas-clemente/quic-go v0.26.0