git/api/errors.go - main - githubmirror/gitness

git/api/errors.go
201 строка6 KB
Atefeh Mohseni Ejiyeh
fix: [CODE-5591] handle non-unique merge bases gracefully instead of failing the whole import (#5235)
09 июн 2026, 20:36
09 июн 2026, 20:36822a47b
// Copyright 2023 Harness, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//     http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package api

import (
	"fmt"
	"strings"

	"github.com/harness/gitness/errors"

	"github.com/rs/zerolog/log"
)

var (
	ErrInvalidPath         = errors.New("path is invalid")
	ErrRepositoryPathEmpty = errors.InvalidArgument("repository path cannot be empty")
	ErrBranchNameEmpty     = errors.InvalidArgument("branch name cannot be empty")
	ErrParseDiffHunkHeader = errors.Internal(nil, "failed to parse diff hunk header")
	ErrNoDefaultBranch     = errors.New("no default branch")
	ErrInvalidSignature    = errors.New("invalid signature")
)

// PushOutOfDateError represents an error if merging fails due to unrelated histories.
type PushOutOfDateError struct {
	StdOut string
	StdErr string
	Err    error
}

func (err *PushOutOfDateError) Error() string {
	return fmt.Sprintf("PushOutOfDate Error: %v: %s\n%s", err.Err, err.StdErr, err.StdOut)
}

// Unwrap unwraps the underlying error.
func (err *PushOutOfDateError) Unwrap() error {
	return fmt.Errorf("%w - %s", err.Err, err.StdErr)
}

// PushRejectedError represents an error if merging fails due to rejection from a hook.
type PushRejectedError struct {
	Message string
	StdOut  string
	StdErr  string
	Err     error
}

// IsErrPushRejected checks if an error is a PushRejectedError.
func IsErrPushRejected(err error) bool {
	var errPushRejected *PushRejectedError
	return errors.As(err, &errPushRejected)
}

func (err *PushRejectedError) Error() string {
	return fmt.Sprintf("PushRejected Error: %v: %s\n%s", err.Err, err.StdErr, err.StdOut)
}

// Unwrap unwraps the underlying error.
func (err *PushRejectedError) Unwrap() error {
	return fmt.Errorf("%w - %s", err.Err, err.StdErr)
}

// GenerateMessage generates the remote message from the stderr.
func (err *PushRejectedError) GenerateMessage() {
	messageBuilder := &strings.Builder{}
	i := strings.Index(err.StdErr, "remote: ")
	if i < 0 {
		err.Message = ""
		return
	}
	for len(err.StdErr) > i+8 {
		if err.StdErr[i:i+8] != "remote: " {
			break
		}
		i += 8
		nl := strings.IndexByte(err.StdErr[i:], '\n')
		if nl >= 0 {
			messageBuilder.WriteString(err.StdErr[i : i+nl+1])
			i = i + nl + 1
		} else {
			messageBuilder.WriteString(err.StdErr[i:])
			i = len(err.StdErr)
		}
	}
	err.Message = strings.TrimSpace(messageBuilder.String())
}

// MoreThanOneError represents an error when there are more
// than one sources (branch, tag) with the same name.
type MoreThanOneError struct {
	StdOut string
	StdErr string
	Err    error
}

// IsErrMoreThanOne checks if an error is a MoreThanOneError.
func IsErrMoreThanOne(err error) bool {
	var errMoreThanOne *MoreThanOneError
	return errors.As(err, &errMoreThanOne)
}

func (err *MoreThanOneError) Error() string {
	return fmt.Sprintf("MoreThanOneError Error: %v: %s\n%s", err.Err, err.StdErr, err.StdOut)
}

// Logs the error and message, returns either the provided message or a git equivalent if possible.
// Always logs the full message with error as warning.
// Note: git errors should be processed in command package, this will probably be removed in the future.
func processGitErrorf(err error, format string, args ...any) error {
	// create fallback error returned if we can't map it
	fallbackErr := errors.Internalf(err, format, args...)

	// always log internal error together with message.
	log.Warn().Msgf("%v: [GIT] %v", fallbackErr, err)

	switch {
	case strings.Contains(err.Error(), "no such file or directory"):
		return errors.NotFound("repository not found")
	case strings.Contains(err.Error(), "reference already exists"):
		return errors.Conflict("reference already exists")
	case strings.Contains(err.Error(), "no merge base"):
		if len(args) >= 2 {
			return &UnrelatedHistoriesError{
				BaseRef: strings.TrimSpace(args[0].(string)), //nolint:errcheck
				HeadRef: strings.TrimSpace(args[1].(string)), //nolint:errcheck
			}
		}
		return &UnrelatedHistoriesError{}
	default:
		return fallbackErr
	}
}

type UnrelatedHistoriesError struct {
	BaseRef string
	HeadRef string
}

func (e *UnrelatedHistoriesError) Map() map[string]any {
	return map[string]any{
		"base_ref": e.BaseRef,
		"head_ref": e.HeadRef,
	}
}

func (e *UnrelatedHistoriesError) Is(err error) bool {
	var target *UnrelatedHistoriesError
	ok := errors.As(err, &target)
	if !ok {
		return false
	}

	return target.BaseRef == e.BaseRef && target.HeadRef == e.HeadRef
}

func (e *UnrelatedHistoriesError) Error() string {
	if e.BaseRef == "" || e.HeadRef == "" {
		return "unrelated commit histories error"
	}
	// remove branch and tag prefixes, original remains in struct fields
	// we just need to remove first occurrence.
	baseRef := strings.TrimPrefix(e.BaseRef, BranchPrefix)
	baseRef = strings.TrimPrefix(baseRef, TagPrefix)
	headRef := strings.TrimPrefix(e.HeadRef, BranchPrefix)
	headRef = strings.TrimPrefix(headRef, TagPrefix)
	return fmt.Sprintf("%s and %s have entirely different commit histories.", baseRef, headRef)
}

// ErrMergeBaseNonUnique indicates that two commits have more than one merge base.
var ErrMergeBaseNonUnique = errors.New("the commits have more than one merge base")

// IsMergeBaseNonUniqueError checks if an error was caused by two commits having
// more than one merge base.
func IsMergeBaseNonUniqueError(err error) bool {
	return errors.Is(err, ErrMergeBaseNonUnique)
}

// IsUnrelatedHistoriesError checks if an error is a UnrelatedHistoriesError.
func IsUnrelatedHistoriesError(err error) bool {
	return AsUnrelatedHistoriesError(err) != nil
}

func AsUnrelatedHistoriesError(err error) *UnrelatedHistoriesError {
	var target *UnrelatedHistoriesError
	ok := errors.As(err, &target)
	if !ok {
		return nil
	}
	return target
}