Merge branch 'pks-ci-linting-rules' into 'master'

golangci-lint: Enable additional linters

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5576

Merged-by: James Fargher <proglottis@gmail.com>
Approved-by: James Fargher <proglottis@gmail.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>

17 files changed, 67 insertions, 68 deletions

diff --git a/.golangci.yml b/.golangci.yml
index a5f53ec57..74286926b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -9,9 +9,10 @@ linters:
   disable-all: true
   enable:
     - bidichk
+    - depguard
     - errcheck
+    - errname
     - exportloopref
-    - depguard
     - forbidigo
     - gci
     # We use both gofmt and gofumpt because gofumpt doesn't seem to be linting
@@ -31,6 +32,7 @@ linters:
     - revive
     - staticcheck
     - stylecheck
+    - tenv
     - thelper
     - unconvert
     - unused
@@ -81,11 +83,6 @@ linters-settings:
       # they're tested as expected.
       - ^context.Background$
       - ^context.TODO$
-      # Tests should not set the bare environment functions, but instead use
-      # `t.Setenv()` or `testhelper.Unsetenv()`. These functions have sanity
-      # checks to verify we don't use `t.Parallel()` when setting envvars.
-      - ^os.Setenv$
-      - ^os.Unsetenv$
   paralleltest:
     # Ignore missing calls to `t.Parallel()` and only report incorrect uses of it.
     ignore-missing: true
diff --git a/internal/backup/pipeline.go b/internal/backup/pipeline.go
index 357428574..880e6df16 100644
--- a/internal/backup/pipeline.go
+++ b/internal/backup/pipeline.go
@@ -106,11 +106,11 @@ func (cmd RestoreCommand) Execute(ctx context.Context) error {
 	})
 }
 
-// PipelineError represents a summary of errors by repository
-type PipelineError []error
+// PipelineErrors represents a summary of errors by repository
+type PipelineErrors []error
 
 // AddError adds an error associated with a repository to the summary.
-func (e *PipelineError) AddError(repo *gitalypb.Repository, err error) {
+func (e *PipelineErrors) AddError(repo *gitalypb.Repository, err error) {
 	if repo.GetGlProjectPath() != "" {
 		err = fmt.Errorf("%s (%s): %w", repo.GetRelativePath(), repo.GetGlProjectPath(), err)
 	} else {
@@ -119,7 +119,7 @@ func (e *PipelineError) AddError(repo *gitalypb.Repository, err error) {
 	*e = append(*e, err)
 }
 
-func (e PipelineError) Error() string {
+func (e PipelineErrors) Error() string {
 	var builder strings.Builder
 	_, _ = fmt.Fprintf(&builder, "%d failures encountered:\n", len(e))
 	for _, err := range e {
@@ -133,7 +133,7 @@ type LoggingPipeline struct {
 	log logrus.FieldLogger
 
 	mu   sync.Mutex
-	errs PipelineError
+	errs PipelineErrors
 }
 
 // NewLoggingPipeline creates a new logging pipeline
diff --git a/internal/backup/pipeline_test.go b/internal/backup/pipeline_test.go
index 0bed08cc1..905e80808 100644
--- a/internal/backup/pipeline_test.go
+++ b/internal/backup/pipeline_test.go
@@ -220,7 +220,7 @@ func TestPipelineError(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			err := PipelineError{}
+			err := PipelineErrors{}
 
 			for _, repo := range tc.repos {
 				err.AddError(repo, assert.AnError)
diff --git a/internal/git/localrepo/remote.go b/internal/git/localrepo/remote.go
index 4e264ba9e..437ce21e3 100644
--- a/internal/git/localrepo/remote.go
+++ b/internal/git/localrepo/remote.go
@@ -56,17 +56,17 @@ type FetchOpts struct {
 	DisableTransactions bool
 }
 
-// ErrFetchFailed indicates that the fetch has failed.
-type ErrFetchFailed struct {
+// FetchFailedError indicates that the fetch has failed.
+type FetchFailedError struct {
 	err error
 }
 
 // Error returns the error message.
-func (e ErrFetchFailed) Error() string {
+func (e FetchFailedError) Error() string {
 	return e.err.Error()
 }
 
-// FetchRemote fetches changes from the specified remote. Returns an ErrFetchFailed error in case
+// FetchRemote fetches changes from the specified remote. Returns an FetchFailedError error in case
 // the fetch itself failed.
 func (repo *Repo) FetchRemote(ctx context.Context, remoteName string, opts FetchOpts) error {
 	if err := validateNotBlank(remoteName, "remoteName"); err != nil {
@@ -107,14 +107,14 @@ func (repo *Repo) FetchRemote(ctx context.Context, remoteName string, opts Fetch
 	}
 
 	if err := cmd.Wait(); err != nil {
-		return ErrFetchFailed{errorWithStderr(err, stderr.Bytes())}
+		return FetchFailedError{errorWithStderr(err, stderr.Bytes())}
 	}
 
 	return nil
 }
 
 // FetchInternal performs a fetch from an internal Gitaly-hosted repository. Returns an
-// ErrFetchFailed error in case git-fetch(1) failed.
+// FetchFailedError error in case git-fetch(1) failed.
 func (repo *Repo) FetchInternal(
 	ctx context.Context,
 	remoteRepo *gitalypb.Repository,
@@ -165,7 +165,7 @@ func (repo *Repo) FetchInternal(
 		},
 		commandOptions...,
 	); err != nil {
-		return ErrFetchFailed{errorWithStderr(err, stderr.Bytes())}
+		return FetchFailedError{errorWithStderr(err, stderr.Bytes())}
 	}
 
 	return nil
diff --git a/internal/git/localrepo/remote_extra_test.go b/internal/git/localrepo/remote_extra_test.go
index 805ae2575..d3989814b 100644
--- a/internal/git/localrepo/remote_extra_test.go
+++ b/internal/git/localrepo/remote_extra_test.go
@@ -140,7 +140,7 @@ func TestRepo_FetchInternal(t *testing.T) {
 			localrepo.FetchOpts{Stderr: &stderr},
 		)
 		require.EqualError(t, err, "exit status 128")
-		require.IsType(t, err, localrepo.ErrFetchFailed{})
+		require.IsType(t, err, localrepo.FetchFailedError{})
 		require.Equal(t, stderr.String(), "fatal: couldn't find remote ref refs/does/not/exist\n")
 	})
 
@@ -185,7 +185,7 @@ func TestRepo_FetchInternal(t *testing.T) {
 			StorageName:  cfg.Storages[0].Name,
 		}, []string{"refs/does/not/exist"}, localrepo.FetchOpts{})
 		require.Error(t, err)
-		require.IsType(t, err, localrepo.ErrFetchFailed{})
+		require.IsType(t, err, localrepo.FetchFailedError{})
 
 		expectedMsg := "GetRepoPath: not a git repository"
 		if testhelper.IsPraefectEnabled() {
diff --git a/internal/git/localrepo/remote_test.go b/internal/git/localrepo/remote_test.go
index 19ac15bd4..5e043035a 100644
--- a/internal/git/localrepo/remote_test.go
+++ b/internal/git/localrepo/remote_test.go
@@ -197,7 +197,7 @@ func TestRepo_FetchRemote(t *testing.T) {
 		err := repo.FetchRemote(ctx, "doesnotexist", FetchOpts{})
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "fatal: 'doesnotexist' does not appear to be a git repository")
-		require.IsType(t, err, ErrFetchFailed{})
+		require.IsType(t, err, FetchFailedError{})
 	})
 
 	t.Run("generates reverse index", func(t *testing.T) {
diff --git a/internal/git/pktline/pktline.go b/internal/git/pktline/pktline.go
index a82cbf4e4..d7dc5a1be 100644
--- a/internal/git/pktline/pktline.go
+++ b/internal/git/pktline/pktline.go
@@ -190,9 +190,11 @@ type writerFunc func([]byte) (int, error)
 
 func (wf writerFunc) Write(p []byte) (int, error) { return wf(p) }
 
-type errNotSideband struct{ pkt string }
+type invalidSidebandPacketError struct{ pkt string }
 
-func (err *errNotSideband) Error() string { return fmt.Sprintf("invalid sideband packet: %q", err.pkt) }
+func (err *invalidSidebandPacketError) Error() string {
+	return fmt.Sprintf("invalid sideband packet: %q", err.pkt)
+}
 
 // EachSidebandPacket iterates over a side-band-64k pktline stream. For
 // each packet, it will call fn with the band ID and the packet. Fn must
@@ -203,7 +205,7 @@ func EachSidebandPacket(r io.Reader, fn func(byte, []byte) error) error {
 	for scanner.Scan() {
 		data := Data(scanner.Bytes())
 		if len(data) == 0 {
-			return &errNotSideband{scanner.Text()}
+			return &invalidSidebandPacketError{scanner.Text()}
 		}
 		if err := fn(data[0], data[1:]); err != nil {
 			return err
diff --git a/internal/git/pktline/pktline_test.go b/internal/git/pktline/pktline_test.go
index 78e6e29b7..c2d499732 100644
--- a/internal/git/pktline/pktline_test.go
+++ b/internal/git/pktline/pktline_test.go
@@ -327,7 +327,7 @@ func TestEachSidebandPacket(t *testing.T) {
 		{
 			desc: "stream without band",
 			in:   "0004",
-			err:  &errNotSideband{pkt: "0004"},
+			err:  &invalidSidebandPacketError{pkt: "0004"},
 		},
 	}
 
diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go
index a161d8435..59ecb79b5 100644
--- a/internal/git/updateref/updateref.go
+++ b/internal/git/updateref/updateref.go
@@ -13,50 +13,50 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v15/internal/structerr"
 )
 
-// ErrAlreadyLocked indicates a reference cannot be locked because another
+// AlreadyLockedError indicates a reference cannot be locked because another
 // process has already locked it.
-type ErrAlreadyLocked struct {
+type AlreadyLockedError struct {
 	Ref string
 }
 
-func (e *ErrAlreadyLocked) Error() string {
+func (e *AlreadyLockedError) Error() string {
 	return fmt.Sprintf("reference is already locked: %q", e.Ref)
 }
 
-// ErrInvalidReferenceFormat indicates a reference name was invalid.
-type ErrInvalidReferenceFormat struct {
+// InvalidReferenceFormatError indicates a reference name was invalid.
+type InvalidReferenceFormatError struct {
 	// ReferenceName is the invalid reference name.
 	ReferenceName string
 }
 
-func (e ErrInvalidReferenceFormat) Error() string {
+func (e InvalidReferenceFormatError) Error() string {
 	return fmt.Sprintf("invalid reference format: %q", e.ReferenceName)
 }
 
-// ErrFileDirectoryConflict is returned when an operation would causes a file-directory conflict
+// FileDirectoryConflictError is returned when an operation would causes a file-directory conflict
 // in the reference store.
-type ErrFileDirectoryConflict struct {
+type FileDirectoryConflictError struct {
 	// ConflictingReferenceName is the name of the reference that would have conflicted.
 	ConflictingReferenceName string
 	// ExistingReferenceName is the name of the already existing reference.
 	ExistingReferenceName string
 }
 
-func (e ErrFileDirectoryConflict) Error() string {
+func (e FileDirectoryConflictError) Error() string {
 	return fmt.Sprintf("%q conflicts with %q", e.ConflictingReferenceName, e.ExistingReferenceName)
 }
 
-// ErrInTransactionConflict is returned when attempting to modify two references in the same transaction
+// InTransactionConflictError is returned when attempting to modify two references in the same transaction
 // in a manner that is not allowed. For example, modifying 'refs/heads/parent' and creating
 // 'refs/heads/parent/child' is not allowed.
-type ErrInTransactionConflict struct {
+type InTransactionConflictError struct {
 	// FirstReferenceName is the name of the first reference that was modified.
 	FirstReferenceName string
 	// SecondReferenceName is the name of the second reference that was modified.
 	SecondReferenceName string
 }
 
-func (e ErrInTransactionConflict) Error() string {
+func (e InTransactionConflictError) Error() string {
 	return fmt.Sprintf("%q and %q conflict in the same transaction", e.FirstReferenceName, e.SecondReferenceName)
 }
 
@@ -381,17 +381,17 @@ func (u *Updater) handleIOError(fallbackErr error) error {
 
 	matches := refLockedRegex.FindSubmatch(stderr)
 	if len(matches) > 1 {
-		return &ErrAlreadyLocked{Ref: string(matches[1])}
+		return &AlreadyLockedError{Ref: string(matches[1])}
 	}
 
 	matches = refInvalidFormatRegex.FindSubmatch(stderr)
 	if len(matches) > 1 {
-		return ErrInvalidReferenceFormat{ReferenceName: string(matches[1])}
+		return InvalidReferenceFormatError{ReferenceName: string(matches[1])}
 	}
 
 	matches = referenceExistsConflictRegex.FindSubmatch(stderr)
 	if len(matches) > 1 {
-		return ErrFileDirectoryConflict{
+		return FileDirectoryConflictError{
 			ExistingReferenceName:    string(matches[2]),
 			ConflictingReferenceName: string(matches[1]),
 		}
@@ -399,7 +399,7 @@ func (u *Updater) handleIOError(fallbackErr error) error {
 
 	matches = inTransactionConflictRegex.FindSubmatch(stderr)
 	if len(matches) > 1 {
-		return ErrInTransactionConflict{
+		return InTransactionConflictError{
 			FirstReferenceName:  string(matches[1]),
 			SecondReferenceName: string(matches[2]),
 		}
diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go
index ce04344a8..374d02b33 100644
--- a/internal/git/updateref/updateref_test.go
+++ b/internal/git/updateref/updateref_test.go
@@ -159,7 +159,7 @@ func TestUpdater_properErrorOnWriteFailure(t *testing.T) {
 					continue
 				}
 
-				require.Equal(t, ErrInvalidReferenceFormat{ReferenceName: referenceName}, err)
+				require.Equal(t, InvalidReferenceFormatError{ReferenceName: referenceName}, err)
 				break
 			}
 		})
@@ -246,7 +246,7 @@ func TestUpdater_fileDirectoryConflict(t *testing.T) {
 						require.NoError(t, updater.Start())
 						require.NoError(t, updater.Create(tc.secondReference, commitID))
 
-						require.Equal(t, ErrFileDirectoryConflict{
+						require.Equal(t, FileDirectoryConflictError{
 							ExistingReferenceName:    tc.firstReference.String(),
 							ConflictingReferenceName: tc.secondReference.String(),
 						}, method.finish(updater))
@@ -262,7 +262,7 @@ func TestUpdater_fileDirectoryConflict(t *testing.T) {
 						require.NoError(t, updater.Create(tc.firstReference, commitID))
 						require.NoError(t, updater.Create(tc.secondReference, commitID))
 
-						require.Equal(t, ErrInTransactionConflict{
+						require.Equal(t, InTransactionConflictError{
 							FirstReferenceName:  tc.firstReference.String(),
 							SecondReferenceName: tc.secondReference.String(),
 						}, method.finish(updater))
@@ -394,7 +394,7 @@ func TestUpdater_invalidReferenceName(t *testing.T) {
 	const referenceName = `refs/heads\master`
 	require.NoError(t, updater.Start())
 	require.NoError(t, updater.Update(referenceName, commitID, ""))
-	require.Equal(t, ErrInvalidReferenceFormat{ReferenceName: referenceName}, updater.Prepare())
+	require.Equal(t, InvalidReferenceFormatError{ReferenceName: referenceName}, updater.Prepare())
 }
 
 func TestUpdater_concurrentLocking(t *testing.T) {
@@ -428,9 +428,9 @@ func TestUpdater_concurrentLocking(t *testing.T) {
 	// Preparing this second updater should fail though because we notice that the reference is
 	// locked.
 	err = secondUpdater.Prepare()
-	var errAlreadyLocked *ErrAlreadyLocked
-	require.ErrorAs(t, err, &errAlreadyLocked)
-	require.Equal(t, err, &ErrAlreadyLocked{
+	var alreadyLockedErr *AlreadyLockedError
+	require.ErrorAs(t, err, &alreadyLockedErr)
+	require.Equal(t, err, &AlreadyLockedError{
 		Ref: "refs/heads/master",
 	})
 
diff --git a/internal/gitaly/hook/sidechannel.go b/internal/gitaly/hook/sidechannel.go
index 03fb2a0a0..034a19fa5 100644
--- a/internal/gitaly/hook/sidechannel.go
+++ b/internal/gitaly/hook/sidechannel.go
@@ -22,10 +22,10 @@ const (
 	sidechannelSocket = "sidechannel"
 )
 
-// ErrInvalidSidechannelAddress is returned by GetSidechannel if improper address is used.
-type ErrInvalidSidechannelAddress struct{ address string }
+// InvalidSidechannelAddressError is returned by GetSidechannel if improper address is used.
+type InvalidSidechannelAddressError struct{ address string }
 
-func (e ErrInvalidSidechannelAddress) Error() string {
+func (e InvalidSidechannelAddressError) Error() string {
 	return fmt.Sprintf("invalid side channel address: %q", e.address)
 }
 
@@ -34,7 +34,7 @@ func (e ErrInvalidSidechannelAddress) Error() string {
 func GetSidechannel(ctx context.Context) (net.Conn, error) {
 	address := gitaly_metadata.GetValue(ctx, sidechannelHeader)
 	if path.Base(address) != sidechannelSocket {
-		return nil, ErrInvalidSidechannelAddress{address: address}
+		return nil, InvalidSidechannelAddressError{address: address}
 	}
 
 	return net.DialTimeout("unix", address, time.Second)
diff --git a/internal/gitaly/hook/sidechannel_test.go b/internal/gitaly/hook/sidechannel_test.go
index 318800599..44a914129 100644
--- a/internal/gitaly/hook/sidechannel_test.go
+++ b/internal/gitaly/hook/sidechannel_test.go
@@ -111,7 +111,7 @@ func TestGetSidechannel(t *testing.T) {
 			)
 			_, err := GetSidechannel(ctx)
 			require.Error(t, err)
-			require.Equal(t, ErrInvalidSidechannelAddress{tc}, err)
+			require.Equal(t, InvalidSidechannelAddressError{tc}, err)
 		})
 	}
 }
diff --git a/internal/gitaly/service/hook/pack_objects.go b/internal/gitaly/service/hook/pack_objects.go
index d2797f6cf..d22c64bca 100644
--- a/internal/gitaly/service/hook/pack_objects.go
+++ b/internal/gitaly/service/hook/pack_objects.go
@@ -373,7 +373,7 @@ func (s *server) PackObjectsHookWithSidechannel(ctx context.Context, req *gitaly
 
 	c, err := gitalyhook.GetSidechannel(ctx)
 	if err != nil {
-		if errors.As(err, &gitalyhook.ErrInvalidSidechannelAddress{}) {
+		if errors.As(err, &gitalyhook.InvalidSidechannelAddressError{}) {
 			return nil, structerr.NewInvalidArgument("%w", err)
 		}
 		return nil, structerr.NewInternal("get side-channel: %w", err)
diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go
index d8e1c867e..c1dd1613a 100644
--- a/internal/gitaly/service/ref/delete_refs.go
+++ b/internal/gitaly/service/ref/delete_refs.go
@@ -92,13 +92,13 @@ func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest)
 
 	if err := updater.Prepare(); err != nil {
 		if featureflag.DeleteRefsStructuredErrors.IsEnabled(ctx) {
-			var errAlreadyLocked *updateref.ErrAlreadyLocked
-			if errors.As(err, &errAlreadyLocked) {
+			var alreadyLockedErr *updateref.AlreadyLockedError
+			if errors.As(err, &alreadyLockedErr) {
 				return nil, structerr.NewFailedPrecondition("cannot lock references").WithDetail(
 					&gitalypb.DeleteRefsError{
 						Error: &gitalypb.DeleteRefsError_ReferencesLocked{
 							ReferencesLocked: &gitalypb.ReferencesLockedError{
-								Refs: [][]byte{[]byte(errAlreadyLocked.Ref)},
+								Refs: [][]byte{[]byte(alreadyLockedErr.Ref)},
 							},
 						},
 					},
diff --git a/internal/gitaly/service/repository/fetch.go b/internal/gitaly/service/repository/fetch.go
index 96b207892..66f7a90fe 100644
--- a/internal/gitaly/service/repository/fetch.go
+++ b/internal/gitaly/service/repository/fetch.go
@@ -91,7 +91,7 @@ func (s *server) FetchSourceBranch(ctx context.Context, req *gitalypb.FetchSourc
 			localrepo.FetchOpts{Tags: localrepo.FetchOptsTagsNone},
 		); err != nil {
 			// Design quirk: if the fetch fails, this RPC returns Result: false, but no error.
-			if errors.As(err, &localrepo.ErrFetchFailed{}) {
+			if errors.As(err, &localrepo.FetchFailedError{}) {
 				ctxlogrus.Extract(ctx).
 					WithField("oid", sourceOid.String()).
 					WithError(err).Warn("git fetch failed")
diff --git a/internal/gitaly/service/repository/replicate.go b/internal/gitaly/service/repository/replicate.go
index 4b8cfc352..2362dd2ce 100644
--- a/internal/gitaly/service/repository/replicate.go
+++ b/internal/gitaly/service/repository/replicate.go
@@ -233,7 +233,7 @@ func fetchInternalRemote(
 			},
 		},
 	); err != nil {
-		if errors.As(err, &localrepo.ErrFetchFailed{}) {
+		if errors.As(err, &localrepo.FetchFailedError{}) {
 			return fmt.Errorf("fetch: %w, stderr: %q", err, stderr.String())
 		}
 
diff --git a/internal/gitaly/transaction_manager_test.go b/internal/gitaly/transaction_manager_test.go
index 9961fff83..156dad929 100644
--- a/internal/gitaly/transaction_manager_test.go
+++ b/internal/gitaly/transaction_manager_test.go
@@ -179,7 +179,7 @@ func TestTransactionManager(t *testing.T) {
 						"refs/heads/main":    {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 						"refs/heads/../main": {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 					},
-					ExpectedCommitError:   updateref.ErrInvalidReferenceFormat{ReferenceName: "refs/heads/../main"},
+					ExpectedCommitError:   updateref.InvalidReferenceFormatError{ReferenceName: "refs/heads/../main"},
 					ExpectedDefaultBranch: "",
 				},
 			},
@@ -191,7 +191,7 @@ func TestTransactionManager(t *testing.T) {
 					ReferenceUpdates: ReferenceUpdates{
 						"refs/heads/../main": {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 					},
-					ExpectedCommitError:   updateref.ErrInvalidReferenceFormat{ReferenceName: "refs/heads/../main"},
+					ExpectedCommitError:   updateref.InvalidReferenceFormatError{ReferenceName: "refs/heads/../main"},
 					ExpectedDefaultBranch: "",
 				},
 				{
@@ -283,7 +283,7 @@ func TestTransactionManager(t *testing.T) {
 					ReferenceUpdates: ReferenceUpdates{
 						"refs/heads/parent/child": {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 					},
-					ExpectedCommitError: updateref.ErrFileDirectoryConflict{
+					ExpectedCommitError: updateref.FileDirectoryConflictError{
 						ExistingReferenceName:    "refs/heads/parent",
 						ConflictingReferenceName: "refs/heads/parent/child",
 					},
@@ -303,7 +303,7 @@ func TestTransactionManager(t *testing.T) {
 						"refs/heads/parent":       {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 						"refs/heads/parent/child": {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 					},
-					ExpectedCommitError: updateref.ErrInTransactionConflict{
+					ExpectedCommitError: updateref.InTransactionConflictError{
 						FirstReferenceName:  "refs/heads/parent",
 						SecondReferenceName: "refs/heads/parent/child",
 					},
@@ -321,7 +321,7 @@ func TestTransactionManager(t *testing.T) {
 						"refs/heads/parent":       {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 						"refs/heads/parent/child": {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 					},
-					ExpectedCommitError: updateref.ErrInTransactionConflict{
+					ExpectedCommitError: updateref.InTransactionConflictError{
 						FirstReferenceName:  "refs/heads/parent",
 						SecondReferenceName: "refs/heads/parent/child",
 					},
@@ -361,7 +361,7 @@ func TestTransactionManager(t *testing.T) {
 					ReferenceUpdates: ReferenceUpdates{
 						"refs/heads/parent": {OldOID: objectHash.ZeroOID, NewOID: objectHash.ZeroOID},
 					},
-					ExpectedCommitError: updateref.ErrFileDirectoryConflict{
+					ExpectedCommitError: updateref.FileDirectoryConflictError{
 						ExistingReferenceName:    "refs/heads/parent/child",
 						ConflictingReferenceName: "refs/heads/parent",
 					},
@@ -381,7 +381,7 @@ func TestTransactionManager(t *testing.T) {
 						"refs/heads/parent/child": {OldOID: objectHash.ZeroOID, NewOID: rootCommitOID},
 						"refs/heads/parent":       {OldOID: objectHash.ZeroOID, NewOID: objectHash.ZeroOID},
 					},
-					ExpectedCommitError: updateref.ErrInTransactionConflict{
+					ExpectedCommitError: updateref.InTransactionConflictError{
 						FirstReferenceName:  "refs/heads/parent",
 						SecondReferenceName: "refs/heads/parent/child",
 					},
@@ -1967,7 +1967,7 @@ func TestTransactionManager(t *testing.T) {
 		var err error
 		err = InvalidReferenceFormatError{ReferenceName: invalidReference}
 		if tc.updateRefError {
-			err = updateref.ErrInvalidReferenceFormat{ReferenceName: invalidReference.String()}
+			err = updateref.InvalidReferenceFormatError{ReferenceName: invalidReference.String()}
 		}
 
 		testCases = append(testCases, testCase{