Skip to content

fix: [CODE-5090]: fix forked repo output when upstream is soft deleted #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhinavcode wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: [CODE-5090]: fix forked repo output when upstream is soft deleted #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/api/controller/repo/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/harness/gitness/app/services/refcache"
"github.com/harness/gitness/app/store"
"github.com/harness/gitness/errors"
gitnessstore "github.com/harness/gitness/store"
"github.com/harness/gitness/types"
"github.com/harness/gitness/types/enum"

Expand Down Expand Up @@ -127,16 +128,20 @@ func GetRepoOutput(
return nil, fmt.Errorf("failed to check if repo is public: %w", err)
}

repoClone := *repo

var upstreamRepo *types.RepositoryCore
if repo.ForkID != 0 {
upstreamRepo, err = repoFinder.FindByID(ctx, repo.ForkID)
if err != nil {
if errors.Is(err, gitnessstore.ErrResourceNotFound) {
repoClone.ForkID = 0
} else if err != nil {
return nil, fmt.Errorf("failed to find repo fork %d: %w", repo.ForkID, err)
}
}

return &RepositoryOutput{
Repository: *repo,
Repository: repoClone,
IsPublic: isPublic,
Importing: slices.Contains(importingStates, repo.State),
Archived: repo.State == enum.RepoStateArchived,
Expand Down