Merge pull request #129 from zalando-stups/switching-to-modules

Switching to modules
zalando-stups · Dec 10, 2018 · 2a5c6d1 · 2a5c6d1
2 parents eb9afca + 520ab4d
commit 2a5c6d1
Show file tree

Hide file tree

Showing 42 changed files with 324 additions and 341 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,15 +30,14 @@ cache:
 env:
   global:
   - VIPS_VERSION=8.7.0
+  - GO111MODULE=on
   - secure: iOfz4tQ/0pV+BTnnzzh0cxVHJfw6cgO+O5Gc/48rZIt0LjjIZByvMnatUv2wWlWCM01RhFy0blMAeY7twDSNzqu39voJCZzt4HL1YW8JH9/o4veEMo6MdEpJRQczlJnHpLDRXyW+EcrSunHSE1BQwbEDCBqlISlWBnVuLrvI9en+kQIQjGylazADYkwt0Dljaz73OqEhqqW6obnz7tO4OnTtRZr+lAyQxOCRsEy7Drnc19HWIfORvsAsRnjDboof2WtDoNYYiDEnD89bpiu012OZYI+wik4p2g9fyCLUOpizTI+rLYU0a3M0D6JDmL3fehF+I/s27Hh2uh9QtU8YD2FZ4LthfqkeF1uUyuikMTWI6r1N2EZiKLhFcYezB9R8H+XcsLRwZoxWHHM6OVmkeX7v7LaJYzsNWzPU7YL3Ja1Upn+f9EsK4/mi7uupOLyNUxmOBLa6Anll+IMYor5qmo8S2ahzenREURPuBdZ1OgpheFYK9+9QkkjSCzXm1NjWp1B39a3VtQ1ZVldu7NE7PVRJSWPrfi3YBlcs8qxz54GoAo2yCyPTka12iissVULWQF+fr2NuE2YEPBBZdmi+wHTCZ18V7ts3W8ww7o9ZkAPT9vDKsWVzqe1RmR6Dv+0ocYNVIpyOyL0exHFqujRtbMg4STY6zPaaibcs3bafIq8=
 
 before_install:
 - "./packaging/install-vips.sh"
 
 install:
-- go get github.com/Masterminds/glide
 - go get github.com/wadey/gocovmerge
-- glide install
 
 script:
 - make ci-trigger

diff --git a/Dockerfile b/Dockerfile
@@ -12,9 +12,7 @@ RUN ./install-vips.sh
 ADD . /go/src/github.com/zalando-stups/skrop
 WORKDIR /go/src/github.com/zalando-stups/skrop
 
-RUN go get github.com/Masterminds/glide
-
-RUN glide install
+ENV GO111MODULE on
 
 RUN go build ./cmd/skrop
 

diff --git a/Makefile b/Makefile
@@ -8,10 +8,8 @@ VERSION           ?= $(CURRENT_VERSION)
 NEXT_PATCH         = $(shell go run packaging/version/version.go patch $(CURRENT_VERSION))
 COMMIT_HASH        = $(shell git rev-parse --short HEAD)
 
-glide:
-	glide install
 
-build: glide
+build:
 	go build ./cmd/skrop
 
 docker:
@@ -29,7 +27,6 @@ test-only:
 
 init-deps:
 	./packaging/build.sh
-	go get github.com/Masterminds/glide
 	go get ./cmd/skrop/
 
 all: init-deps build test

diff --git a/README.md b/README.md
@@ -47,15 +47,10 @@ run packaging/install-vips.sh
 
 #### GO dependencies
 
-Only on macOS, you have to manually install _Glide_ using _Brew_.
-```bash
-brew install glide
-```
-
-Then, for all.
+Skrop uses [modules](https://github.com/golang/go/wiki/Modules), so make sure to have go 1.11+ and just run
 ```
+export GO111MODULE=on
 ./packaging/build.sh
-go get github.com/Masterminds/glide
 go get ./cmd/skrop/
 ```
 

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -8,14 +8,7 @@
 
 ```bash
 brew upgrade vips
-brew upgrade glide
 brew upgrade golang 
-glide update
-
-# to clear the cache in case glide update failes
-glide cc
-
-glide install
 
 make build-docker-vips
 ```
diff --git a/filters/addbackground.go b/filters/addbackground.go
@@ -1,10 +1,10 @@
 package filters
 
 import (
+	"github.com/h2non/bimg"
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
 )
 
 const (

diff --git a/filters/addbackground_test.go b/filters/addbackground_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"testing"
 )
 

diff --git a/filters/blur.go b/filters/blur.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 // BlurName is the name of the filter

diff --git a/filters/blur_test.go b/filters/blur_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"testing"
 )
 

diff --git a/filters/convertimagetype.go b/filters/convertimagetype.go
@@ -5,7 +5,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"strings"
 )
 

diff --git a/filters/convertimagetype_test.go b/filters/convertimagetype_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"testing"
 )
 

diff --git a/filters/crop.go b/filters/crop.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 // CropName is the name of the filter

diff --git a/filters/crop_test.go b/filters/crop_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"testing"
 )
 

diff --git a/filters/cropbyfocalpoint.go b/filters/cropbyfocalpoint.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"strconv"
 )
 

diff --git a/filters/cropbyheight.go b/filters/cropbyheight.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 // CropByHeightName is the name of the filter

diff --git a/filters/cropbyheight_test.go b/filters/cropbyheight_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 func TestNewCropByHeight(t *testing.T) {

diff --git a/filters/cropbywidth.go b/filters/cropbywidth.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 // CropByWidthName is the name of the filter

diff --git a/filters/cropbywidth_test.go b/filters/cropbywidth_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 func TestNewCropByWidth(t *testing.T) {

diff --git a/filters/finalizeresponse_test.go b/filters/finalizeresponse_test.go
@@ -1,7 +1,7 @@
 package filters
 
 import (
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
 	"io/ioutil"

diff --git a/filters/imagefilter.go b/filters/imagefilter.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/messages"
 	"github.com/zalando/skipper/filters"

diff --git a/filters/imagefilter_test.go b/filters/imagefilter_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
 	"github.com/zalando/skipper/filters/filtertest"

diff --git a/filters/imagefiltertest/imagefiltertest.go b/filters/imagefiltertest/imagefiltertest.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 const (

diff --git a/filters/localfilecache_test.go b/filters/localfilecache_test.go
@@ -1,10 +1,6 @@
 package filters
 
 import (
-	"github.com/zalando-stups/skrop/cache"
-	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/zalando/skipper/filters"
-	"github.com/zalando/skipper/filters/filtertest"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -14,16 +10,22 @@ import (
 	"testing"
 	"time"
 
+	"github.com/zalando-stups/skrop/cache"
+	"github.com/zalando-stups/skrop/filters/imagefiltertest"
+	"github.com/zalando/skipper/filters"
+	"github.com/zalando/skipper/filters/filtertest"
+
 	"github.com/stretchr/testify/assert"
 )
 
-type metricsHandler struct{}
-
-var emptyMeta map[string]*string = make(map[string]*string)
+type noopMetricHandler struct{}
 
-func (f *metricsHandler) MeasureSince(key string, start time.Time) {}
+var emptyMeta = make(map[string]*string)
 
-func (f *metricsHandler) IncCounter(key string) {}
+func (f *noopMetricHandler) MeasureSince(key string, start time.Time)    {}
+func (f *noopMetricHandler) IncCounter(key string)                       {}
+func (f *noopMetricHandler) IncCounterBy(key string, value int64)        {}
+func (f *noopMetricHandler) IncFloatCounterBy(key string, value float64) {}
 
 func TestLocalFileCache_NewLocalFileCache(t *testing.T) {
 	cache := cache.NewFileSystemCache()
@@ -43,17 +45,17 @@ func TestLocalFileCache_CreateFilter(t *testing.T) {
 	cache := cache.NewFileSystemCache()
 	imagefiltertest.TestCreate(t, func() filters.Spec { return NewLocalFileCache(cache) },
 		[]imagefiltertest.CreateTestItem{{
-			"no args",
-			nil,
-			true,
+			Msg:  "no args",
+			Args: nil,
+			Err:  true,
 		}, {
-			"one arg",
-			[]interface{}{"/tmp"},
-			false,
+			Msg:  "one arg",
+			Args: []interface{}{"/tmp"},
+			Err:  false,
 		}, {
-			"two args",
-			[]interface{}{"/tmp", "hello"},
-			true,
+			Msg:  "two args",
+			Args: []interface{}{"/tmp", "hello"},
+			Err:  true,
 		}})
 }
 
@@ -86,7 +88,7 @@ func TestLocalFileCache_Request_NoCache(t *testing.T) {
 	f, _ := cacheFilter.CreateFilter([]interface{}{"/images"})
 	req, _ := http.NewRequest("GET", "http://www.example.org"+reqPath+"?refresh=true", nil)
 
-	ctx := &filtertest.Context{FRequest: req, FMetrics: &metricsHandler{}}
+	ctx := &filtertest.Context{FRequest: req, FMetrics: &noopMetricHandler{}}
 	f.Request(ctx)
 
 	assert.False(t, ctx.Served())
@@ -100,7 +102,7 @@ func TestLocalFileCache_Request_NotInCache(t *testing.T) {
 	f, _ := cacheFilter.CreateFilter([]interface{}{"/images"})
 	req, _ := http.NewRequest("GET", "http://www.example.org"+reqPath, nil)
 
-	ctx := &filtertest.Context{FRequest: req, FMetrics: &metricsHandler{}}
+	ctx := &filtertest.Context{FRequest: req, FMetrics: &noopMetricHandler{}}
 	f.Request(ctx)
 
 	assert.False(t, ctx.Served())
@@ -115,7 +117,7 @@ func TestLocalFileCache_Request_InCache(t *testing.T) {
 	f, _ := cacheFilter.CreateFilter([]interface{}{"../images"})
 	req, _ := http.NewRequest("GET", "http://www.example.org"+reqPath, nil)
 
-	ctx := &filtertest.Context{FRequest: req, FMetrics: &metricsHandler{}}
+	ctx := &filtertest.Context{FRequest: req, FMetrics: &noopMetricHandler{}}
 	f.Request(ctx)
 
 	assert.True(t, ctx.Served())
@@ -150,7 +152,7 @@ func TestLocalFileCache_Response(t *testing.T) {
 	req, _ := http.NewRequest("GET", "http://www.example.org"+reqPath, nil)
 	recorder := httptest.NewRecorder()
 
-	ctx := &filtertest.Context{FRequest: req, FMetrics: &metricsHandler{}, FResponse: recorder.Result()}
+	ctx := &filtertest.Context{FRequest: req, FMetrics: &noopMetricHandler{}, FResponse: recorder.Result()}
 	f.Response(ctx)
 
 	assert.Equal(t, "200 OK", ctx.Response().Status)

diff --git a/filters/longeredgeresize.go b/filters/longeredgeresize.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 // LongerEdgeResizeName is the name of the filter

diff --git a/filters/longeredgeresize_test.go b/filters/longeredgeresize_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 func TestNewLongerEdgeResize(t *testing.T) {

diff --git a/filters/overlayImage.go b/filters/overlayImage.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"io/ioutil"
 	"os"
 )

diff --git a/filters/overlayimage_test.go b/filters/overlayimage_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"testing"
 )
 

diff --git a/filters/quality.go b/filters/quality.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-stups/skrop/parse"
 	"github.com/zalando/skipper/filters"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 )
 
 // QualityName is the name of the filter

diff --git a/filters/quality_test.go b/filters/quality_test.go
@@ -3,7 +3,7 @@ package filters
 import (
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando-stups/skrop/filters/imagefiltertest"
-	"github.com/danpersa/bimg"
+	"github.com/h2non/bimg"
 	"testing"
 )