Browse Source

Bump version

DarthSim 3 years ago
parent
commit
7709b74a5e
75 changed files with 202 additions and 202 deletions
  1. 3 3
      bufpool/bufpool.go
  2. 1 1
      bufreader/bufreader.go
  3. 3 3
      config/config.go
  4. 1 1
      config/configurators/configurators.go
  5. 1 1
      errorreport/airbrake/airbrake.go
  6. 1 1
      errorreport/bugsnag/bugsnag.go
  7. 4 4
      errorreport/errorreport.go
  8. 1 1
      errorreport/honeybadger/honeybadger.go
  9. 1 1
      errorreport/sentry/sentry.go
  10. 3 3
      etag/etag.go
  11. 2 2
      etag/etag_test.go
  12. 2 2
      go.mod
  13. 2 2
      healthcheck.go
  14. 6 6
      imagedata/download.go
  15. 3 3
      imagedata/image_data.go
  16. 6 6
      imagedata/read.go
  17. 1 1
      imagemeta/bmp.go
  18. 1 1
      imagemeta/gif.go
  19. 1 1
      imagemeta/heif.go
  20. 1 1
      imagemeta/ico.go
  21. 1 1
      imagemeta/image_meta.go
  22. 1 1
      imagemeta/jpeg.go
  23. 1 1
      imagemeta/png.go
  24. 1 1
      imagemeta/svg.go
  25. 1 1
      imagemeta/tiff.go
  26. 1 1
      imagemeta/webp.go
  27. 1 1
      logger/log.go
  28. 1 1
      logger/syslog.go
  29. 10 10
      main.go
  30. 1 1
      memory/stats.go
  31. 2 2
      metrics/datadog/datadog.go
  32. 3 3
      metrics/metrics.go
  33. 1 1
      metrics/newrelic/newrelic.go
  34. 2 2
      metrics/prometheus/prometheus.go
  35. 1 1
      options/presets_test.go
  36. 5 5
      options/processing_options.go
  37. 2 2
      options/processing_options_test.go
  38. 1 1
      options/url.go
  39. 4 4
      processing/apply_filters.go
  40. 2 2
      processing/calc_position.go
  41. 2 2
      processing/copy_and_check_timeout.go
  42. 4 4
      processing/crop.go
  43. 3 3
      processing/export_color_profile.go
  44. 4 4
      processing/extend.go
  45. 3 3
      processing/finalize.go
  46. 5 5
      processing/fix_webp_size.go
  47. 3 3
      processing/flatten.go
  48. 4 4
      processing/import_color_profile.go
  49. 4 4
      processing/padding.go
  50. 4 4
      processing/pipeline.go
  51. 5 5
      processing/prepare.go
  52. 8 8
      processing/processing.go
  53. 3 3
      processing/rotate_and_flip.go
  54. 3 3
      processing/scale.go
  55. 6 6
      processing/scale_on_load.go
  56. 3 3
      processing/trim.go
  57. 5 5
      processing/watermark.go
  58. 12 12
      processing_handler.go
  59. 7 7
      processing_handler_test.go
  60. 1 1
      reuseport/listen_reuseport.go
  61. 1 1
      router/logging.go
  62. 2 2
      router/timer.go
  63. 2 2
      security/image_size.go
  64. 1 1
      security/signature.go
  65. 1 1
      security/signature_test.go
  66. 1 1
      security/source.go
  67. 5 5
      server.go
  68. 1 1
      transport/azure/azuret.go
  69. 1 1
      transport/fs/fs.go
  70. 1 1
      transport/gcs/gcs.go
  71. 1 1
      transport/s3/s3.go
  72. 1 1
      version/version.go
  73. 3 3
      vips/ico.go
  74. 1 1
      vips/testing_helpers.go
  75. 5 5
      vips/vips.go

+ 3 - 3
bufpool/bufpool.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/metrics/prometheus"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/metrics/prometheus"
 )
 
 type intSlice []int

+ 1 - 1
bufreader/bufreader.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imath"
+	"github.com/imgproxy/imgproxy/v3/imath"
 )
 
 type Reader struct {

+ 3 - 3
config/config.go

@@ -10,9 +10,9 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config/configurators"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/version"
+	"github.com/imgproxy/imgproxy/v3/config/configurators"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/version"
 )
 
 var (

+ 1 - 1
config/configurators/configurators.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 func Int(i *int, name string) {

+ 1 - 1
errorreport/airbrake/airbrake.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/airbrake/gobrake/v5"
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 var notifier *gobrake.Notifier

+ 1 - 1
errorreport/bugsnag/bugsnag.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/bugsnag/bugsnag-go/v2"
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 var enabled bool

+ 4 - 4
errorreport/errorreport.go

@@ -3,10 +3,10 @@ package errorreport
 import (
 	"net/http"
 
-	"github.com/imgproxy/imgproxy/v2/errorreport/airbrake"
-	"github.com/imgproxy/imgproxy/v2/errorreport/bugsnag"
-	"github.com/imgproxy/imgproxy/v2/errorreport/honeybadger"
-	"github.com/imgproxy/imgproxy/v2/errorreport/sentry"
+	"github.com/imgproxy/imgproxy/v3/errorreport/airbrake"
+	"github.com/imgproxy/imgproxy/v3/errorreport/bugsnag"
+	"github.com/imgproxy/imgproxy/v3/errorreport/honeybadger"
+	"github.com/imgproxy/imgproxy/v3/errorreport/sentry"
 )
 
 func Init() {

+ 1 - 1
errorreport/honeybadger/honeybadger.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/honeybadger-io/honeybadger-go"
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 var (

+ 1 - 1
errorreport/sentry/sentry.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 var (

+ 3 - 3
etag/etag.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/version"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/version"
 )
 
 type eTagCalc struct {

+ 2 - 2
etag/etag_test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"

+ 2 - 2
go.mod

@@ -1,6 +1,6 @@
-module github.com/imgproxy/imgproxy/v2
+module github.com/imgproxy/imgproxy/v3
 
-go 1.13
+go 1.15
 
 require (
 	cloud.google.com/go/storage v1.15.0

+ 2 - 2
healthcheck.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/config/configurators"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/config/configurators"
 )
 
 func healthcheck() int {

+ 6 - 6
imagedata/download.go

@@ -9,13 +9,13 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
 
-	azureTransport "github.com/imgproxy/imgproxy/v2/transport/azure"
-	fsTransport "github.com/imgproxy/imgproxy/v2/transport/fs"
-	gcsTransport "github.com/imgproxy/imgproxy/v2/transport/gcs"
-	s3Transport "github.com/imgproxy/imgproxy/v2/transport/s3"
+	azureTransport "github.com/imgproxy/imgproxy/v3/transport/azure"
+	fsTransport "github.com/imgproxy/imgproxy/v3/transport/fs"
+	gcsTransport "github.com/imgproxy/imgproxy/v3/transport/gcs"
+	s3Transport "github.com/imgproxy/imgproxy/v3/transport/s3"
 )
 
 var (

+ 3 - 3
imagedata/image_data.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 var (

+ 6 - 6
imagedata/read.go

@@ -3,12 +3,12 @@ package imagedata
 import (
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/bufpool"
-	"github.com/imgproxy/imgproxy/v2/bufreader"
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/imagemeta"
-	"github.com/imgproxy/imgproxy/v2/security"
+	"github.com/imgproxy/imgproxy/v3/bufpool"
+	"github.com/imgproxy/imgproxy/v3/bufreader"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/imagemeta"
+	"github.com/imgproxy/imgproxy/v3/security"
 )
 
 var (

+ 1 - 1
imagemeta/bmp.go

@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 var bmpMagick = []byte("BM")

+ 1 - 1
imagemeta/gif.go

@@ -3,7 +3,7 @@ package imagemeta
 import (
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 func DecodeGifMeta(r io.Reader) (Meta, error) {

+ 1 - 1
imagemeta/heif.go

@@ -8,7 +8,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 const heifBoxHeaderSize = int64(8)

+ 1 - 1
imagemeta/ico.go

@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 type IcoMeta struct {

+ 1 - 1
imagemeta/image_meta.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 type Meta interface {

+ 1 - 1
imagemeta/jpeg.go

@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 const (

+ 1 - 1
imagemeta/png.go

@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 var pngMagick = []byte("\x89PNG\r\n\x1a\n")

+ 1 - 1
imagemeta/svg.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 	"golang.org/x/text/encoding/charmap"
 )
 

+ 1 - 1
imagemeta/tiff.go

@@ -6,7 +6,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 var (

+ 1 - 1
imagemeta/webp.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 	"golang.org/x/image/riff"
 	"golang.org/x/image/vp8"
 	"golang.org/x/image/vp8l"

+ 1 - 1
logger/log.go

@@ -7,7 +7,7 @@ import (
 
 	logrus "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config/configurators"
+	"github.com/imgproxy/imgproxy/v3/config/configurators"
 )
 
 func Init() error {

+ 1 - 1
logger/syslog.go

@@ -5,7 +5,7 @@ import (
 	"log/syslog"
 	"os"
 
-	"github.com/imgproxy/imgproxy/v2/config/configurators"
+	"github.com/imgproxy/imgproxy/v3/config/configurators"
 	"github.com/sirupsen/logrus"
 )
 

+ 10 - 10
main.go

@@ -10,16 +10,16 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/errorreport"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/logger"
-	"github.com/imgproxy/imgproxy/v2/memory"
-	"github.com/imgproxy/imgproxy/v2/metrics"
-	"github.com/imgproxy/imgproxy/v2/metrics/prometheus"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/version"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/errorreport"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/logger"
+	"github.com/imgproxy/imgproxy/v3/memory"
+	"github.com/imgproxy/imgproxy/v3/metrics"
+	"github.com/imgproxy/imgproxy/v3/metrics/prometheus"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/version"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func initialize() error {

+ 1 - 1
memory/stats.go

@@ -5,7 +5,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func LogStats() {

+ 2 - 2
metrics/datadog/datadog.go

@@ -11,8 +11,8 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/version"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/version"
 )
 
 type spanCtxKey struct{}

+ 3 - 3
metrics/metrics.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/imgproxy/imgproxy/v2/metrics/datadog"
-	"github.com/imgproxy/imgproxy/v2/metrics/newrelic"
-	"github.com/imgproxy/imgproxy/v2/metrics/prometheus"
+	"github.com/imgproxy/imgproxy/v3/metrics/datadog"
+	"github.com/imgproxy/imgproxy/v3/metrics/newrelic"
+	"github.com/imgproxy/imgproxy/v3/metrics/prometheus"
 )
 
 func Init() error {

+ 1 - 1
metrics/newrelic/newrelic.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 	"github.com/newrelic/go-agent/v3/newrelic"
 )
 

+ 2 - 2
metrics/prometheus/prometheus.go

@@ -10,8 +10,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/reuseport"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/reuseport"
 )
 
 var (

+ 1 - 1
options/presets_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"

+ 5 - 5
options/processing_options.go

@@ -11,11 +11,11 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/structdiff"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/structdiff"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 const maxClientHintDPR = 8

+ 2 - 2
options/processing_options_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 type ProcessingOptionsTestSuite struct{ suite.Suite }

+ 1 - 1
options/url.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 const urlTokenPlain = "plain"

+ 4 - 4
processing/apply_filters.go

@@ -1,10 +1,10 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func applyFilters(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 2 - 2
processing/calc_position.go

@@ -1,8 +1,8 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
 )
 
 func calcPosition(width, height, innerWidth, innerHeight int, gravity *options.GravityOptions, allowOverflow bool) (left, top int) {

+ 2 - 2
processing/copy_and_check_timeout.go

@@ -3,8 +3,8 @@ package processing
 import (
 	"context"
 
-	"github.com/imgproxy/imgproxy/v2/router"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/router"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func copyMemoryAndCheckTimeout(ctx context.Context, img *vips.Image) error {

+ 4 - 4
processing/crop.go

@@ -1,10 +1,10 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func cropImage(img *vips.Image, cropWidth, cropHeight int, gravity *options.GravityOptions) error {

+ 3 - 3
processing/export_color_profile.go

@@ -1,9 +1,9 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func exportColorProfile(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 4 - 4
processing/extend.go

@@ -1,10 +1,10 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func extend(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 3 - 3
processing/finalize.go

@@ -1,9 +1,9 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func finalize(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 5 - 5
processing/fix_webp_size.go

@@ -1,11 +1,11 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 	log "github.com/sirupsen/logrus"
 )
 

+ 3 - 3
processing/flatten.go

@@ -1,9 +1,9 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func flatten(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 4 - 4
processing/import_color_profile.go

@@ -1,10 +1,10 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func importColorProfile(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 4 - 4
processing/padding.go

@@ -1,10 +1,10 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func padding(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 4 - 4
processing/pipeline.go

@@ -3,10 +3,10 @@ package processing
 import (
 	"context"
 
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 type pipelineContext struct {

+ 5 - 5
processing/prepare.go

@@ -3,11 +3,11 @@ package processing
 import (
 	"math"
 
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func extractMeta(img *vips.Image, baseAngle int, useOrientation bool) (int, int, int, bool) {

+ 8 - 8
processing/processing.go

@@ -7,14 +7,14 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/router"
-	"github.com/imgproxy/imgproxy/v2/security"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/router"
+	"github.com/imgproxy/imgproxy/v3/security"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 var mainPipeline = pipeline{

+ 3 - 3
processing/rotate_and_flip.go

@@ -1,9 +1,9 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func rotateAndFlip(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 3 - 3
processing/scale.go

@@ -1,9 +1,9 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func scale(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 6 - 6
processing/scale_on_load.go

@@ -3,12 +3,12 @@ package processing
 import (
 	"math"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func canScaleOnLoad(imgtype imagetype.Type, scale float64) bool {

+ 3 - 3
processing/trim.go

@@ -1,9 +1,9 @@
 package processing
 
 import (
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 func trim(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {

+ 5 - 5
processing/watermark.go

@@ -3,11 +3,11 @@ package processing
 import (
 	"context"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imath"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imath"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 var watermarkPipeline = pipeline{

+ 12 - 12
processing_handler.go

@@ -10,18 +10,18 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/errorreport"
-	"github.com/imgproxy/imgproxy/v2/etag"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/metrics"
-	"github.com/imgproxy/imgproxy/v2/options"
-	"github.com/imgproxy/imgproxy/v2/processing"
-	"github.com/imgproxy/imgproxy/v2/router"
-	"github.com/imgproxy/imgproxy/v2/security"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/errorreport"
+	"github.com/imgproxy/imgproxy/v3/etag"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/metrics"
+	"github.com/imgproxy/imgproxy/v3/options"
+	"github.com/imgproxy/imgproxy/v3/processing"
+	"github.com/imgproxy/imgproxy/v3/router"
+	"github.com/imgproxy/imgproxy/v3/security"
+	"github.com/imgproxy/imgproxy/v3/vips"
 )
 
 var (

+ 7 - 7
processing_handler_test.go

@@ -10,13 +10,13 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/config/configurators"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagemeta"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/router"
-	"github.com/imgproxy/imgproxy/v2/vips"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/config/configurators"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagemeta"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/router"
+	"github.com/imgproxy/imgproxy/v3/vips"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"

+ 1 - 1
reuseport/listen_reuseport.go

@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 func Listen(network, address string) (net.Listener, error) {

+ 1 - 1
router/logging.go

@@ -3,7 +3,7 @@ package router
 import (
 	"net/http"
 
-	"github.com/imgproxy/imgproxy/v2/ierrors"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
 	log "github.com/sirupsen/logrus"
 )
 

+ 2 - 2
router/timer.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/metrics"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/metrics"
 )
 
 type timerSinceCtxKey = struct{}

+ 2 - 2
security/image_size.go

@@ -1,8 +1,8 @@
 package security
 
 import (
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
 )
 
 var ErrSourceResolutionTooBig = ierrors.New(422, "Source image resolution is too big", "Invalid source image")

+ 1 - 1
security/signature.go

@@ -6,7 +6,7 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 var (

+ 1 - 1
security/signature_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 type SignatureTestSuite struct {

+ 1 - 1
security/source.go

@@ -1,7 +1,7 @@
 package security
 
 import (
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 func VerifySourceURL(imageURL string) bool {

+ 5 - 5
server.go

@@ -10,11 +10,11 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/netutil"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/errorreport"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/reuseport"
-	"github.com/imgproxy/imgproxy/v2/router"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/errorreport"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/reuseport"
+	"github.com/imgproxy/imgproxy/v3/router"
 )
 
 var (

+ 1 - 1
transport/azure/azuret.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/Azure/azure-storage-blob-go/azblob"
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 type transport struct {

+ 1 - 1
transport/fs/fs.go

@@ -7,7 +7,7 @@ import (
 	"io/fs"
 	"net/http"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 type transport struct {

+ 1 - 1
transport/gcs/gcs.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"cloud.google.com/go/storage"
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 	"google.golang.org/api/option"
 )
 

+ 1 - 1
transport/s3/s3.go

@@ -8,7 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 
-	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v3/config"
 )
 
 // transport implements RoundTripper for the 's3' protocol.

+ 1 - 1
version/version.go

@@ -1,6 +1,6 @@
 package version
 
-const version = "2.16.5"
+const version = "3.0.0.beta1"
 
 func Version() string {
 	return version

+ 3 - 3
vips/ico.go

@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagemeta"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagemeta"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
 )
 
 func (img *Image) loadIco(data []byte, shrink int, scale float64, pages int) error {

+ 1 - 1
vips/testing_helpers.go

@@ -1,6 +1,6 @@
 package vips
 
-import "github.com/imgproxy/imgproxy/v2/imagetype"
+import "github.com/imgproxy/imgproxy/v3/imagetype"
 
 func DisableLoadSupport(it imagetype.Type) {
 	typeSupportLoad[it] = false

+ 5 - 5
vips/vips.go

@@ -17,11 +17,11 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/imgproxy/imgproxy/v2/config"
-	"github.com/imgproxy/imgproxy/v2/ierrors"
-	"github.com/imgproxy/imgproxy/v2/imagedata"
-	"github.com/imgproxy/imgproxy/v2/imagetype"
-	"github.com/imgproxy/imgproxy/v2/metrics/prometheus"
+	"github.com/imgproxy/imgproxy/v3/config"
+	"github.com/imgproxy/imgproxy/v3/ierrors"
+	"github.com/imgproxy/imgproxy/v3/imagedata"
+	"github.com/imgproxy/imgproxy/v3/imagetype"
+	"github.com/imgproxy/imgproxy/v3/metrics/prometheus"
 )
 
 type Image struct {