style: rename Url to URL

agravelot · May 5, 2021 · 7b11924 · 7b11924
1 parent 839f551
commit 7b11924
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/cache/factory_test.go b/cache/factory_test.go
@@ -36,7 +36,7 @@ func TestNew(t *testing.T) {
 			args: args{
 				config.Config{
 					Processor: "imaginary",
-					Imaginary: config.ImaginaryProcessorConfig{Url: "http://localhost"},
+					Imaginary: config.ImaginaryProcessorConfig{URL: "http://localhost"},
 					Cache:     "unsupported",
 				},
 			},

diff --git a/config/config.go b/config/config.go
@@ -1,13 +1,17 @@
+// Package config provide configurations structs for imageopti middleware.
 package config
 
+// ImaginaryProcessorConfig define imaginary image processor configurations.
 type ImaginaryProcessorConfig struct {
-	Url string `json:"url" yaml:"url" toml:"url"`
+	URL string `json:"url" yaml:"url" toml:"url"`
 }
 
+// RedisCacheConfig define redis cache system configurations.
 type RedisCacheConfig struct {
-	Url string `json:"url" yaml:"url" toml:"url"`
+	URL string `json:"url" yaml:"url" toml:"url"`
 }
 
+// FileCacheConfig define file cache system configurations.
 type FileCacheConfig struct {
 	Path string `json:"path" yaml:"path" toml:"path"`
 }

diff --git a/image_optimizer.go b/image_optimizer.go
@@ -28,8 +28,8 @@ func CreateConfig() *Config {
 		config.Config{
 			Processor: "",
 			Cache:     "",
-			Imaginary: config.ImaginaryProcessorConfig{Url: ""},
-			Redis:     config.RedisCacheConfig{Url: ""},
+			Imaginary: config.ImaginaryProcessorConfig{URL: ""},
+			Redis:     config.RedisCacheConfig{URL: ""},
 			File:      config.FileCacheConfig{Path: ""},
 		},
 	}

diff --git a/image_optimizer_test.go b/image_optimizer_test.go
@@ -31,9 +31,9 @@ func TestImageOptimizer_ServeHTTP(t *testing.T) {
 			args: args{
 				config: config.Config{
 					Processor: "imaginary",
-					Imaginary: config.ImaginaryProcessorConfig{Url: "http://localhost"},
+					Imaginary: config.ImaginaryProcessorConfig{URL: "http://localhost"},
 					Cache:     "none",
-					Redis:     config.RedisCacheConfig{Url: ""},
+					Redis:     config.RedisCacheConfig{URL: ""},
 					File:      config.FileCacheConfig{Path: ""},
 				},
 			},
@@ -51,9 +51,9 @@ func TestImageOptimizer_ServeHTTP(t *testing.T) {
 				config: config.Config{
 					Processor: "",
 					Cache:     "",
-					Redis:     config.RedisCacheConfig{Url: ""},
+					Redis:     config.RedisCacheConfig{URL: ""},
 					File:      config.FileCacheConfig{Path: ""},
-					Imaginary: config.ImaginaryProcessorConfig{Url: ""},
+					Imaginary: config.ImaginaryProcessorConfig{URL: ""},
 				},
 			},
 			want:                      false,
@@ -82,9 +82,9 @@ func TestImageOptimizer_ServeHTTP(t *testing.T) {
 				config: config.Config{
 					Processor: "local",
 					Cache:     "memory",
-					Redis:     config.RedisCacheConfig{Url: ""},
+					Redis:     config.RedisCacheConfig{URL: ""},
 					File:      config.FileCacheConfig{Path: ""},
-					Imaginary: config.ImaginaryProcessorConfig{Url: ""},
+					Imaginary: config.ImaginaryProcessorConfig{URL: ""},
 				},
 			},
 			want:                      false,
@@ -101,9 +101,9 @@ func TestImageOptimizer_ServeHTTP(t *testing.T) {
 				config: config.Config{
 					Processor: "none",
 					Cache:     "",
-					Redis:     config.RedisCacheConfig{Url: ""},
+					Redis:     config.RedisCacheConfig{URL: ""},
 					File:      config.FileCacheConfig{Path: ""},
-					Imaginary: config.ImaginaryProcessorConfig{Url: ""},
+					Imaginary: config.ImaginaryProcessorConfig{URL: ""},
 				},
 			},
 			want:                      false,

diff --git a/processor/factory_test.go b/processor/factory_test.go
@@ -27,9 +27,9 @@ func TestNew(t *testing.T) {
 			args: args{
 				config.Config{
 					Processor: "imaginary",
-					Imaginary: config.ImaginaryProcessorConfig{Url: "http://localhost"},
+					Imaginary: config.ImaginaryProcessorConfig{URL: "http://localhost"},
 					Cache:     "none",
-					Redis:     config.RedisCacheConfig{Url: ""},
+					Redis:     config.RedisCacheConfig{URL: ""},
 					File:      config.FileCacheConfig{Path: ""},
 				},
 			},
@@ -38,7 +38,7 @@ func TestNew(t *testing.T) {
 		},
 		{
 			name:    "should not be able to init imaginary without valid url",
-			args:    args{config.Config{Processor: "imaginary", Imaginary: config.ImaginaryProcessorConfig{Url: "localhost"}}},
+			args:    args{config.Config{Processor: "imaginary", Imaginary: config.ImaginaryProcessorConfig{URL: "localhost"}}},
 			want:    nil,
 			wantErr: true,
 		},
@@ -47,7 +47,7 @@ func TestNew(t *testing.T) {
 			args: args{
 				config.Config{
 					Processor: "imaginary",
-					Imaginary: config.ImaginaryProcessorConfig{Url: "htt://localhost"},
+					Imaginary: config.ImaginaryProcessorConfig{URL: "htt://localhost"},
 				},
 			},
 			want:    nil,

diff --git a/processor/imaginary.go b/processor/imaginary.go
@@ -58,7 +58,7 @@ func isValidURL(s string) error {
 
 // NewImaginary instantiate a new imaginary instance with given config.
 func NewImaginary(conf config.Config) (*ImaginaryProcessor, error) {
-	err := isValidURL(conf.Imaginary.Url)
+	err := isValidURL(conf.Imaginary.URL)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +67,7 @@ func NewImaginary(conf config.Config) (*ImaginaryProcessor, error) {
 		client: http.Client{
 			Timeout: httpTimeout,
 		},
-		URL: conf.Imaginary.Url,
+		URL: conf.Imaginary.URL,
 	}, nil
 }
 

diff --git a/processor/local.go b/processor/local.go
@@ -9,6 +9,5 @@ func (lp *LocalProcessor) Optimize(media []byte, of string, tf string, q, w int)
 	// if err != nil {
 	// 	return nil, err
 	// }
-
 	return media, tf, nil
 }