Browse Source

chore: Changing fmt.Errorf to errors.New when there is no formatting required (#1044)

Co-authored-by: Sergey Alexandrovich <DarthSim@users.noreply.github.com>
Sasha Melentyev 2 năm trước cách đây
mục cha
commit
4685e4e222
3 tập tin đã thay đổi với 15 bổ sung14 xóa
  1. 12 11
      config/config.go
  2. 2 1
      metrics/otel/otel.go
  3. 1 2
      vips/vips.go

+ 12 - 11
config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"math"
@@ -571,7 +572,7 @@ func Configure() error {
 	}
 
 	if len(Bind) == 0 {
-		return fmt.Errorf("Bind address is not defined")
+		return errors.New("Bind address is not defined")
 	}
 
 	if ReadTimeout <= 0 {
@@ -639,7 +640,7 @@ func Configure() error {
 	}
 
 	if len(PreferredFormats) == 0 {
-		return fmt.Errorf("At least one preferred format should be specified")
+		return errors.New("At least one preferred format should be specified")
 	}
 
 	if IgnoreSslVerification {
@@ -654,7 +655,7 @@ func Configure() error {
 		}
 
 		if !stat.IsDir() {
-			return fmt.Errorf("Cannot use local directory: not a directory")
+			return errors.New("Cannot use local directory: not a directory")
 		}
 
 		if LocalFileSystemRoot == "/" {
@@ -668,35 +669,35 @@ func Configure() error {
 	}
 
 	if WatermarkOpacity <= 0 {
-		return fmt.Errorf("Watermark opacity should be greater than 0")
+		return errors.New("Watermark opacity should be greater than 0")
 	} else if WatermarkOpacity > 1 {
-		return fmt.Errorf("Watermark opacity should be less than or equal to 1")
+		return errors.New("Watermark opacity should be less than or equal to 1")
 	}
 
 	if FallbackImageHTTPCode < 100 || FallbackImageHTTPCode > 599 {
-		return fmt.Errorf("Fallback image HTTP code should be between 100 and 599")
+		return errors.New("Fallback image HTTP code should be between 100 and 599")
 	}
 
 	if len(PrometheusBind) > 0 && PrometheusBind == Bind {
-		return fmt.Errorf("Can't use the same binding for the main server and Prometheus")
+		return errors.New("Can't use the same binding for the main server and Prometheus")
 	}
 
 	if OpenTelemetryConnectionTimeout < 1 {
-		return fmt.Errorf("OpenTelemetry connection timeout should be greater than zero")
+		return errors.New("OpenTelemetry connection timeout should be greater than zero")
 	}
 
 	if FreeMemoryInterval <= 0 {
-		return fmt.Errorf("Free memory interval should be greater than zero")
+		return errors.New("Free memory interval should be greater than zero")
 	}
 
 	if DownloadBufferSize < 0 {
-		return fmt.Errorf("Download buffer size should be greater than or equal to 0")
+		return errors.New("Download buffer size should be greater than or equal to 0")
 	} else if DownloadBufferSize > math.MaxInt32 {
 		return fmt.Errorf("Download buffer size can't be greater than %d", math.MaxInt32)
 	}
 
 	if BufferPoolCalibrationThreshold < 64 {
-		return fmt.Errorf("Buffer pool calibration threshold should be greater than or equal to 64")
+		return errors.New("Buffer pool calibration threshold should be greater than or equal to 64")
 	}
 
 	return nil

+ 2 - 1
metrics/otel/otel.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -288,7 +289,7 @@ func buildTLSConfig() (*tls.Config, error) {
 
 	certPool := x509.NewCertPool()
 	if !certPool.AppendCertsFromPEM(prepareKeyCert(config.OpenTelemetryServerCert)) {
-		return nil, fmt.Errorf("Can't load OpenTelemetry server cert")
+		return nil, errors.New("Can't load OpenTelemetry server cert")
 	}
 
 	tlsConf := tls.Config{RootCAs: certPool}

+ 1 - 2
vips/vips.go

@@ -8,7 +8,6 @@ package vips
 import "C"
 import (
 	"errors"
-	"fmt"
 	"math"
 	"os"
 	"runtime"
@@ -53,7 +52,7 @@ func Init() error {
 
 	if err := C.vips_initialize(); err != 0 {
 		C.vips_shutdown()
-		return fmt.Errorf("unable to start vips!")
+		return errors.New("unable to start vips!")
 	}
 
 	// Disable libvips cache. Since processing pipeline is fine tuned, we won't get much profit from it.