namespace: Standardization of errors creation

Replace usage of status.Errorf() with helper.Err<StatusCode>f() to
make error creation more standard.
Replace old %v with new %w for proper error wrapping.

1 files changed, 7 insertions, 9 deletions

diff --git a/internal/gitaly/service/namespace/namespace.go b/internal/gitaly/service/namespace/namespace.go
index b3a5215d1..1a5918c38 100644
--- a/internal/gitaly/service/namespace/namespace.go
+++ b/internal/gitaly/service/namespace/namespace.go
@@ -9,11 +9,9 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
-var noNameError = status.Errorf(codes.InvalidArgument, "Name: cannot be empty")
+var noNameError = helper.ErrInvalidArgumentf("Name: cannot be empty")
 
 func (s *server) NamespaceExists(ctx context.Context, in *gitalypb.NamespaceExistsRequest) (*gitalypb.NamespaceExistsResponse, error) {
 	storagePath, err := s.locator.GetStorageByName(in.GetStorageName())
@@ -30,7 +28,7 @@ func (s *server) NamespaceExists(ctx context.Context, in *gitalypb.NamespaceExis
 	if fi, err := os.Stat(namespacePath(storagePath, in.GetName())); os.IsNotExist(err) {
 		return &gitalypb.NamespaceExistsResponse{Exists: false}, nil
 	} else if err != nil {
-		return nil, status.Errorf(codes.Internal, "could not stat the directory: %v", err)
+		return nil, helper.ErrInternalf("could not stat the directory: %w", err)
 	} else {
 		return &gitalypb.NamespaceExistsResponse{Exists: fi.IsDir()}, nil
 	}
@@ -48,7 +46,7 @@ func (s *server) AddNamespace(ctx context.Context, in *gitalypb.AddNamespaceRequ
 	}
 
 	if err = os.MkdirAll(namespacePath(storagePath, name), 0o770); err != nil {
-		return nil, status.Errorf(codes.Internal, "create directory: %v", err)
+		return nil, helper.ErrInternalf("create directory: %w", err)
 	}
 
 	return &gitalypb.AddNamespaceResponse{}, nil
@@ -85,14 +83,14 @@ func (s *server) RenameNamespace(ctx context.Context, in *gitalypb.RenameNamespa
 
 	// Create the parent directory.
 	if err = os.MkdirAll(filepath.Dir(targetPath), 0o775); err != nil {
-		return nil, helper.ErrInternalf("create directory: %v", err)
+		return nil, helper.ErrInternalf("create directory: %w", err)
 	}
 
 	err = os.Rename(namespacePath(storagePath, in.GetFrom()), targetPath)
 	if _, ok := err.(*os.LinkError); ok {
-		return nil, status.Errorf(codes.InvalidArgument, "from directory %s not found", in.GetFrom())
+		return nil, helper.ErrInvalidArgumentf("from directory %s not found", in.GetFrom())
 	} else if err != nil {
-		return nil, status.Errorf(codes.Internal, "rename: %v", err)
+		return nil, helper.ErrInternalf("rename: %w", err)
 	}
 
 	return &gitalypb.RenameNamespaceResponse{}, nil
@@ -112,7 +110,7 @@ func (s *server) RemoveNamespace(ctx context.Context, in *gitalypb.RemoveNamespa
 	// os.RemoveAll is idempotent by itself
 	// No need to check if the directory exists, or not
 	if err = os.RemoveAll(namespacePath(storagePath, in.GetName())); err != nil {
-		return nil, status.Errorf(codes.Internal, "removal: %v", err)
+		return nil, helper.ErrInternalf("removal: %w", err)
 	}
 	return &gitalypb.RemoveNamespaceResponse{}, nil
 }