♻️ remove function when exported value returns a static error

Signed-off-by: vankichi <kyukawa315@gmail.com>

internal/db/nosql/cassandra/cassandra.go

@@ -379,7 +379,7 @@ func WrapErrorWithKeys(err error, keys ...string) error {
 	case ErrNotFound:
 		return errors.ErrCassandraNotFound(keys...)
 	case ErrUnavailable:
-		return errors.ErrCassandraUnavailable()
+		return errors.ErrCassandraUnavailable
 	case ErrUnsupported:
 		return err
 	case ErrTooManyStmts:

internal/db/nosql/cassandra/cassandra_test.go

@@ -2219,7 +2219,7 @@ func TestWrapErrorWithKeys(t *testing.T) {
 				err: ErrUnavailable,
 			},
 			want: want{
-				err: errors.ErrCassandraUnavailable(),
+				err: errors.ErrCassandraUnavailable,
 			},
 		},
 		{

internal/errors/cassandra.go

@@ -23,18 +23,14 @@ var (
 		return Errorf("consistetncy type %q is not defined", consistency)
 	}
 
-	// NewErrCassandraNotFoundIdentity represents a function to generate an error of cassandra entry not found.
-	NewErrCassandraNotFoundIdentity = func() error {
-		return &ErrCassandraNotFoundIdentity{
-			err: New("cassandra entry not found"),
-		}
+	// NewErrCassandraNotFoundIdentity generates an error of cassandra entry not found.
+	NewErrCassandraNotFoundIdentity = &ErrCassandraNotFoundIdentity{
+		err: New("cassandra entry not found"),
 	}
 
-	// NewErrCassandraUnavailableIdentity represents a function to generate an error of cassandra unavailable.
-	NewErrCassandraUnavailableIdentity = func() error {
-		return &ErrCassandraUnavailableIdentity{
-			err: New("cassandra unavailable"),
-		}
+	// NewErrCassandraUnavailableIdentity generates an error of cassandra unavailable.
+	NewErrCassandraUnavailableIdentity = &ErrCassandraUnavailableIdentity{
+		err: New("cassandra unavailable"),
 	}
 
 	// ErrCassandraUnavailable represents NewErrCassandraUnavailableIdentity.
@@ -44,9 +40,9 @@ var (
 	ErrCassandraNotFound = func(keys ...string) error {
 		switch {
 		case len(keys) == 1:
-			return Wrapf(NewErrCassandraNotFoundIdentity(), "cassandra key '%s' not found", keys[0])
+			return Wrapf(NewErrCassandraNotFoundIdentity, "cassandra key '%s' not found", keys[0])
 		case len(keys) > 1:
-			return Wrapf(NewErrCassandraNotFoundIdentity(), "cassandra keys '%v' not found", keys)
+			return Wrapf(NewErrCassandraNotFoundIdentity, "cassandra keys '%v' not found", keys)
 		default:
 			return nil
 		}

internal/errors/cassandra_test.go

@@ -130,7 +130,7 @@ func TestNewErrCassandraNotFoundIdentity(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrCassandraNotFoundIdentity()
+			got := NewErrCassandraNotFoundIdentity
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -180,7 +180,7 @@ func TestNewErrCassandraUnavailableIdentity(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrCassandraUnavailableIdentity()
+			got := NewErrCassandraUnavailableIdentity
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -230,7 +230,7 @@ func TestErrCassandraUnavailable(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := ErrCassandraUnavailable()
+			got := ErrCassandraUnavailable
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/compressor.go

@@ -40,13 +40,9 @@ var (
 	// ErrDecompressFailed returns an error of decompressing failed.
 	ErrDecompressFailed = New("decompress failed")
 
-	// ErrCompressorRegistererIsNotRunning represents a function to generate an error of compressor registerers is not running.
-	ErrCompressorRegistererIsNotRunning = func() error {
-		return New("compressor registerers is not running")
-	}
+	// ErrCompressorRegistererIsNotRunning generates an error of compressor registerers is not running.
+	ErrCompressorRegistererIsNotRunning = New("compressor registerers is not running")
 
-	// ErrCompressorRegistererChannelIsFull represents a function to generate an error that compressor registerer channel is full.
-	ErrCompressorRegistererChannelIsFull = func() error {
-		return New("compressor registerer channel is full")
-	}
+	// ErrCompressorRegistererChannelIsFull generates an error that compressor registerer channel is full.
+	ErrCompressorRegistererChannelIsFull = New("compressor registerer channel is full")
 )

internal/errors/compressor_test.go

@@ -204,7 +204,7 @@ func TestErrCompressorRegistererIsNotRunning(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := ErrCompressorRegistererIsNotRunning()
+			got := ErrCompressorRegistererIsNotRunning
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -252,7 +252,7 @@ func TestErrCompressorRegistererChannelIsFull(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := ErrCompressorRegistererChannelIsFull()
+			got := ErrCompressorRegistererChannelIsFull
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/info.go

@@ -20,7 +20,5 @@ var (
 	}
 
 	// ErrRuntimeFuncNil represents an error that the runtime function is nil.
-	ErrRuntimeFuncNil = func() error {
-		return New("runtime function is nil")
-	}
+	ErrRuntimeFuncNil = New("runtime function is nil")
 )

internal/errors/info_test.go

@@ -123,7 +123,7 @@ func TestErrRuntimeFuncNil(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := ErrRuntimeFuncNil()
+			got := ErrRuntimeFuncNil
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/io.go

@@ -19,17 +19,11 @@ package errors
 
 var (
 	// NewErrContextNotProvided represents a function to generate an error that the context is not provided.
-	NewErrContextNotProvided = func() error {
-		return New("context not provided")
-	}
+	NewErrContextNotProvided = New("context not provided")
 
 	// NewErrReaderNotProvided represents a function to generate an error that the io.Reader is not provided.
-	NewErrReaderNotProvided = func() error {
-		return New("io.Reader not provided")
-	}
+	NewErrReaderNotProvided = New("io.Reader not provided")
 
-	// NewErrWriterNotProvided represents a function to generate an error that the io.Writer is not provided.
-	NewErrWriterNotProvided = func() error {
-		return New("io.Writer not provided")
-	}
+	// NewErrWriterNotProvided represents an error that the io.Writer is not provided.
+	NewErrWriterNotProvided = New("io.Writer not provided")
 )

internal/errors/io_test.go

@@ -55,7 +55,7 @@ func TestNewErrContextNotProvided(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrContextNotProvided()
+			got := NewErrContextNotProvided
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -103,7 +103,7 @@ func TestNewErrReaderNotProvided(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrReaderNotProvided()
+			got := NewErrReaderNotProvided
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -151,7 +151,7 @@ func TestNewErrWriterNotProvided(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrWriterNotProvided()
+			got := NewErrWriterNotProvided
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/mysql.go

@@ -21,11 +21,9 @@ var (
 	// ErrMySQLConnectionPingFailed represents an error that the ping failed.
 	ErrMySQLConnectionPingFailed = New("error MySQL connection ping failed")
 
-	// NewErrMySQLNotFoundIdentity represents a function to generate an error that the element is not found.
-	NewErrMySQLNotFoundIdentity = func() error {
-		return &ErrMySQLNotFoundIdentity{
-			err: New("error mysql element not found"),
-		}
+	// NewErrMySQLNotFoundIdentity generates an error that the element is not found.
+	NewErrMySQLNotFoundIdentity = &ErrMySQLNotFoundIdentity{
+		err: New("error mysql element not found"),
 	}
 
 	// ErrMySQLConnectionClosed represents a function to generate an error that the connection closed.
@@ -36,19 +34,17 @@ var (
 
 	// ErrRequiredElementNotFoundByUUID represents a function to generate an error that the required element is not found.
 	ErrRequiredElementNotFoundByUUID = func(uuid string) error {
-		return Wrapf(NewErrMySQLNotFoundIdentity(), "error required element not found, uuid: %s", uuid)
+		return Wrapf(NewErrMySQLNotFoundIdentity, "error required element not found, uuid: %s", uuid)
 	}
 
-	// NewErrMySQLInvalidArgumentIdentity represents a function to generate an error that the argument is invalid.
-	NewErrMySQLInvalidArgumentIdentity = func() error {
-		return &ErrMySQLInvalidArgumentIdentity{
-			err: New("error mysql invalid argument"),
-		}
+	// NewErrMySQLInvalidArgumentIdentity generates an error that the argument is invalid.
+	NewErrMySQLInvalidArgumentIdentity = &ErrMySQLInvalidArgumentIdentity{
+		err: New("error mysql invalid argument"),
 	}
 
 	// ErrRequiredMemberNotFilled represents a function to generate an error that the required member is not filled.
 	ErrRequiredMemberNotFilled = func(member string) error {
-		return Wrapf(NewErrMySQLInvalidArgumentIdentity(), "error required member not filled (member: %s)", member)
+		return Wrapf(NewErrMySQLInvalidArgumentIdentity, "error required member not filled (member: %s)", member)
 	}
 
 	// ErrMySQLSessionNil represents a function to generate an error that the MySQL session is nil.

internal/errors/mysql_test.go

@@ -118,7 +118,7 @@ func TestNewErrMySQLNotFoundIdentity(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrMySQLNotFoundIdentity()
+			got := NewErrMySQLNotFoundIdentity
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -340,7 +340,7 @@ func TestNewErrMySQLInvalidArgumentIdentity(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrMySQLInvalidArgumentIdentity()
+			got := NewErrMySQLInvalidArgumentIdentity
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/observability.go

@@ -17,9 +17,7 @@
 // Package errors provides error types and function
 package errors
 
-// ErrCollectorNotFound represents a function to generate an error that the observability collector is not found.
+// ErrCollectorNotFound represents an error that the observability collector is not found.
 var (
-	ErrCollectorNotFound = func() error {
-		return New("observability.collector not found")
-	}
+	ErrCollectorNotFound = New("observability.collector not found")
 )

internal/errors/observability_test.go

@@ -61,7 +61,7 @@ func TestErrCollectorNotFound(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := ErrCollectorNotFound()
+			got := ErrCollectorNotFound
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/redis.go

@@ -24,16 +24,14 @@ var (
 		return Errorf("kv index and vk prefix must be defferent.\t(kv: %s,\tvk: %s)", kv, vk)
 	}
 
-	// NewErrRedisNotFoundIdentity represents a function to generate an ErrRedisNotFoundIdentity error.
-	NewErrRedisNotFoundIdentity = func() error {
-		return &ErrRedisNotFoundIdentity{
-			err: New("error redis entry not found"),
-		}
+	// NewErrRedisNotFoundIdentity generates an ErrRedisNotFoundIdentity error.
+	NewErrRedisNotFoundIdentity = &ErrRedisNotFoundIdentity{
+		err: New("error redis entry not found"),
 	}
 
 	// ErrRedisNotFound represents a function to wrap Redis key not found error and err.
 	ErrRedisNotFound = func(key string) error {
-		return Wrapf(NewErrRedisNotFoundIdentity(), "error redis key '%s' not found", key)
+		return Wrapf(NewErrRedisNotFoundIdentity, "error redis key '%s' not found", key)
 	}
 
 	// ErrRedisInvalidOption generates a new error of Redis invalid option.

internal/errors/redis_test.go

@@ -159,7 +159,7 @@ func TestNewErrRedisNotFoundIdentity(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := NewErrRedisNotFoundIdentity()
+			got := NewErrRedisNotFoundIdentity
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}
@@ -195,14 +195,14 @@ func TestErrRdisNotFound(t *testing.T) {
 				key: "vdaas",
 			},
 			want: want{
-				want: Wrap(NewErrRedisNotFoundIdentity(), "error redis key 'vdaas' not found"),
+				want: Wrap(NewErrRedisNotFoundIdentity, "error redis key 'vdaas' not found"),
 			},
 		},
 		{
 			name:   "return an ErrRedisNotFound error when key is empty",
 			fields: fields{},
 			want: want{
-				want: Wrap(NewErrRedisNotFoundIdentity(), "error redis key '' not found"),
+				want: Wrap(NewErrRedisNotFoundIdentity, "error redis key '' not found"),
 			},
 		},
 	}

internal/errors/vald.go

@@ -18,18 +18,16 @@
 package errors
 
 var (
-	// ErrMetaDataAlreadyExists represents a function to generate an error that vald metadata is already exists.
+	// ErrMetaDataAlreadyExists represents an error that vald metadata is already exists.
 	ErrMetaDataAlreadyExists = func(meta string) error {
 		return Errorf("vald metadata:\t%s\talready exists ", meta)
 	}
 
-	// ErrSameVectorAlreadyExists represents a function to generate an error that vald already has same features vector data.
+	// ErrSameVectorAlreadyExists represents an error that vald already has same features vector data.
 	ErrSameVectorAlreadyExists = func(meta string, n, o []float32) error {
 		return Errorf("vald metadata:\t%s\talready exists reqested: %v, stored: %v", meta, n, o)
 	}
 
-	// ErrMetaDataCannotFetch represents a function to generate an error that vald metadata cannot fetch.
-	ErrMetaDataCannotFetch = func() error {
-		return Errorf("vald metadata cannot fetch")
-	}
+	// ErrMetaDataCannotFetch represents an error that vald metadata cannot fetch.
+	ErrMetaDataCannotFetch = Errorf("vald metadata cannot fetch")
 )

internal/errors/vald_test.go

@@ -123,7 +123,7 @@ func TestErrMetadataCannotFetch(t *testing.T) {
 				checkFunc = defaultCheckFunc
 			}
 
-			got := ErrMetaDataCannotFetch()
+			got := ErrMetaDataCannotFetch
 			if err := checkFunc(test.want, got); err != nil {
 				tt.Errorf("error = %v", err)
 			}

internal/errors/worker.go

@@ -29,23 +29,15 @@ var (
 		return Errorf("worker %s is already running", name)
 	}
 
-	// ErrQueueIsNotRunning represents a function to generate the queue is not running error.
-	ErrQueueIsNotRunning = func() error {
-		return New("queue is not running")
-	}
+	// ErrQueueIsNotRunning represents an error that the queue is not running.
+	ErrQueueIsNotRunning = New("queue is not running")
 
-	// ErrQueueIsAlreadyRunning represents a function to generate the queue is already running error.
-	ErrQueueIsAlreadyRunning = func() error {
-		return New("queue is already running")
-	}
+	// ErrQueueIsAlreadyRunning represents an error that the queue is already running.
+	ErrQueueIsAlreadyRunning = New("queue is already running")
 
-	// ErrJobFuncIsNil represents a function to generate job function is nil error.
-	ErrJobFuncIsNil = func() error {
-		return New("JobFunc is nil")
-	}
+	// ErrJobFuncIsNil represents an error that job function is nil.
+	ErrJobFuncIsNil = New("JobFunc is nil")
 
-	// ErrJobFuncNotFound represents a function to generate job function is not found.
-	ErrJobFuncNotFound = func() error {
-		return New("JobFunc is not found")
-	}
+	// ErrJobFuncNotFound represents an error that job function is not found.
+	ErrJobFuncNotFound = New("JobFunc is not found")
 )