Skip to content

Add more checks in migration code #21011

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

Merged
merged 19 commits into from
Sep 4, 2022
Merged

Add more checks in migration code #21011

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f971a3b
Add more checks in migration code
zeripath Aug 26, 2022
657d54d
oops
zeripath Aug 31, 2022
6305ad2
oops 2
zeripath Aug 31, 2022
992ba59
only set head.SHA when the SHA is available
zeripath Aug 31, 2022
4ecf851
ensure test-backend passes
zeripath Aug 31, 2022
fddbb29
fix dump
zeripath Aug 31, 2022
0ca166c
Merge branch 'main' into migration-checks
zeripath Sep 2, 2022
6995b11
Update modules/validation/binding.go
zeripath Sep 2, 2022
b0df6d0
Update services/migrations/dump.go
zeripath Sep 2, 2022
cf5a1d2
Merge branch 'main' into migration-checks
zeripath Sep 2, 2022
9dddb96
Add check against external->local
zeripath Sep 2, 2022
1d44aca
use common function for testing against baseurl
zeripath Sep 2, 2022
4b31472
add check to restore
zeripath Sep 2, 2022
63715dd
oops
zeripath Sep 3, 2022
f1de1b2
Merge branch 'main' into migration-checks
zeripath Sep 3, 2022
e32d0a3
as per review
zeripath Sep 4, 2022
38353f3
Merge remote-tracking branch 'origin/main' into migration-checks
zeripath Sep 4, 2022
be367a3
placate the linter
zeripath Sep 4, 2022
e494fc5
Merge branch 'main' into migration-checks
zeripath Sep 4, 2022
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
Prev Previous commit
Next Next commit
oops 
Signed-off-by: Andrew Thornton <[email protected]>
  • Loading branch information
@zeripath
zeripath committed Aug 31, 2022
commit 657d54dd5622d614f2f5fd91646f1668052d7a24
5 changes: 4 additions & 1 deletion services/migrations/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ func (g *RepositoryDumper) handlePullRequest(pr *base.PullRequest) error {
for g.gitRepo.IsBranchExist(localRef) {
if i > 5 {
// ... We tried, we really tried but this is just a seriously unfriendly repo
continue
return fmt.Errorf("unable to create unique local reference from %s", pr.Head.Ref)
}
// OK just try some uuids!
localRef = git.SanitizeRefPattern("head-pr-" + strconv.FormatInt(pr.Number, 10) + uuid.New().String())
Expand All @@ -556,6 +556,9 @@ func (g *RepositoryDumper) handlePullRequest(pr *base.PullRequest) error {
g.prHeadCache[pr.Head.CloneURL+":"+pr.Head.Ref] = localRef
}

// Set the pr.Head.Ref to the localRef
pr.Head.Ref = localRef

// 5. Now if pr.Head.SHA == "" we should recover this to the head of this branch
if pr.Head.SHA == "" {
headSha, err := g.gitRepo.GetBranchCommitID(localRef)
Expand Down