Rename Spec -> ProcessSpec, fix failing tests due to the renaming stuff

internal/handler/image_test.go

@@ -64,7 +64,7 @@ func (s *ImageHandlerTestSuite) TestImageHandlerWithQueryParameters() {
 	params["w"] = "100"
 	params["h"] = "100"
 	s.storage.On("Get", mock.Anything, "/image-valid").Return([]byte("validData"), http.StatusOK, nil)
-	s.manipulator.On("Process", mock.AnythingOfType("service.spec")).Return([]byte("processedData"), nil)
+	s.manipulator.On("Process", mock.AnythingOfType("service.processSpec")).Return([]byte("processedData"), nil)
 
 	ImageHandler(s.deps).ServeHTTP(rr, r)
 
@@ -80,7 +80,7 @@ func (s *ImageHandlerTestSuite) TestImageHandlerWithQueryParametersAndProcessing
 	params["w"] = "100"
 	params["h"] = "100"
 	s.storage.On("Get", mock.Anything, "/image-valid").Return([]byte("validData"), http.StatusOK, nil)
-	s.manipulator.On("Process", mock.AnythingOfType("service.spec")).Return([]byte(nil), errors.New("error"))
+	s.manipulator.On("Process", mock.AnythingOfType("service.processSpec")).Return([]byte(nil), errors.New("error"))
 
 	ImageHandler(s.deps).ServeHTTP(rr, r)
 

pkg/router/routes_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func TestNewRouter(t *testing.T) {
-	router := NewRouter(&service.Dependencies{Storage: &mockStorage{}, Manipulator: &mockManipulator{}})
+	router := NewRouter(&service.Dependencies{Storage: &mockStorage{}, Manipulator: &service.MockManipulator{}})
 	assert.NotNil(t, router)
 }
 
@@ -21,7 +21,7 @@ func TestNewRouterInDebugMode(t *testing.T) {
 	v.Set("debug", "true")
 	config.Update()
 
-	router := NewRouter(&service.Dependencies{Storage: &mockStorage{}, Manipulator: &mockManipulator{}})
+	router := NewRouter(&service.Dependencies{Storage: &mockStorage{}, Manipulator: &service.MockManipulator{}})
 	assert.NotNil(t, router)
 }
 
@@ -31,7 +31,7 @@ func TestNewRouterWithPathPrefix(t *testing.T) {
 	v.Set("source.pathPrefix", "/path/to/folder")
 	config.Update()
 
-	router := NewRouter(&service.Dependencies{Storage: &mockStorage{}, Manipulator: &mockManipulator{}})
+	router := NewRouter(&service.Dependencies{Storage: &mockStorage{}, Manipulator: &service.MockManipulator{}})
 	assert.NotNil(t, router)
 }
 
@@ -41,10 +41,3 @@ type mockStorage struct {
 func (m *mockStorage) Get(ctx context.Context, path string) storage.IResponse {
 	return storage.NewResponse([]byte(nil), http.StatusOK, nil)
 }
-
-type mockManipulator struct {
-}
-
-func (m *mockManipulator) Process(spec service.ProcessSpec) ([]byte, error) {
-	return nil, nil
-}

pkg/service/manipulator.go

@@ -41,7 +41,7 @@ const (
 // Manipulator interface sets the contract on the implementation for common processing support in darkroom
 type Manipulator interface {
 	// Process takes ProcessSpec as an argument and returns []byte, error
-	Process(spec spec) ([]byte, error)
+	Process(spec processSpec) ([]byte, error)
 }
 
 type manipulator struct {
@@ -50,7 +50,7 @@ type manipulator struct {
 
 // Process takes ProcessSpec as an argument and returns []byte, error
 // This manipulator uses bild to do the actual image manipulations
-func (m *manipulator) Process(spec spec) ([]byte, error) {
+func (m *manipulator) Process(spec processSpec) ([]byte, error) {
 	params := spec.Params
 	var err error
 	t := time.Now()
@@ -155,7 +155,7 @@ func GetCropPoint(input string) processor.CropPoint {
 	}
 }
 
-func trackDuration(name string, start time.Time, spec spec) *metrics.UpdateOption {
+func trackDuration(name string, start time.Time, spec processSpec) *metrics.UpdateOption {
 	ext := strings.Split(http.DetectContentType(spec.ImageData), "/")[1]
 	updateOption := metrics.UpdateOption{
 		Name:     fmt.Sprintf("%s.%s.%s", name, metrics.GetImageSizeCluster(spec.ImageData), ext),

pkg/service/mock.go

@@ -8,7 +8,7 @@ type MockManipulator struct {
 	mock.Mock
 }
 
-func (m *MockManipulator) Process(spec spec) ([]byte, error) {
+func (m *MockManipulator) Process(spec processSpec) ([]byte, error) {
 	args := m.Called(spec)
 	return args.Get(0).([]byte), args.Error(1)
 }

pkg/service/spec.go

@@ -1,11 +1,11 @@
 package service
 
-type Spec interface {
+type ProcessSpec interface {
 	// IsWebPSupported() will tell if WebP is supported based on the accepted formats
 	IsWebPSupported() bool
 }
 
-type spec struct {
+type processSpec struct {
 	// Scope defines a scope for the image manipulation job, it can be used for logging/mertrics collection purposes
 	Scope string
 	// ImageData holds the actual image contents to processed
@@ -16,8 +16,8 @@ type spec struct {
 	formats []string
 }
 
-func (s *spec) IsWebPSupported() bool {
-	for _, f := range s.formats {
+func (ps *processSpec) IsWebPSupported() bool {
+	for _, f := range ps.formats {
 		if f == "image/webp" {
 			return true
 		}
@@ -30,7 +30,7 @@ type SpecBuilder interface {
 	WithImageData(img []byte) SpecBuilder
 	WithParams(params map[string]string) SpecBuilder
 	WithFormats(formats []string) SpecBuilder
-	Build() spec
+	Build() processSpec
 }
 
 type specBuilder struct {
@@ -60,8 +60,8 @@ func (sb *specBuilder) WithFormats(formats []string) SpecBuilder {
 	return sb
 }
 
-func (sb *specBuilder) Build() spec {
-	return spec{
+func (sb *specBuilder) Build() processSpec {
+	return processSpec{
 		Scope:     sb.scope,
 		ImageData: sb.imageData,
 		Params:    sb.params,