github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-11 06:30:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ap/code-refactor' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#79)

Browse Source
This commit is contained in:
Akhilesh Pandey 2023-05-18 10:30:58 +00:00 committed by Harness
commit 96404de47c
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gitrpc/internal/service/tag.go
View File

@ -187,9 +187,9 @@ func listCommitTagsWalkReferencesHandler(tags *[]*rpc.CommitTag) types.WalkRefer
} }
func (s ReferenceService) CreateTag( func (s ReferenceService) CreateTag(
ctx context.Context, ctx context.Context,
createTagRequest *rpc.CreateTagRequest, request *rpc.CreateTagRequest,
) (*rpc.CreateTagResponse, error) { ) (*rpc.CreateTagResponse, error) {
base := createTagRequest.GetBase() base := request.GetBase()
if base == nil { if base == nil {
return nil, types.ErrBaseCannotBeEmpty return nil, types.ErrBaseCannotBeEmpty
} }
@ -211,25 +211,25 @@ func (s ReferenceService) CreateTag(
err = sharedRepo.Clone(ctx, "") err = sharedRepo.Clone(ctx, "")
if err != nil { if err != nil {
return nil, processGitErrorf(err, "failed to clone shared repo with branch '%s'", createTagRequest.GetSha()) return nil, processGitErrorf(err, "failed to clone shared repo with branch '%s'", request.GetSha())
} }
actor := createTagRequest.GetBase().GetActor() actor := request.GetBase().GetActor()
env := append(CreateEnvironmentForPush(ctx, base), env := append(CreateEnvironmentForPush(ctx, base),
"GIT_COMMITTER_NAME="+actor.GetName(), "GIT_COMMITTER_NAME="+actor.GetName(),
"GIT_COMMITTER_EMAIL="+actor.GetEmail(), "GIT_COMMITTER_EMAIL="+actor.GetEmail(),
) )
err = s.adapter.CreateAnnotatedTag(ctx, sharedRepo.repo.Path, createTagRequest, env) err = s.adapter.CreateAnnotatedTag(ctx, sharedRepo.repo.Path, request, env)
if err != nil { if err != nil {
return nil, processGitErrorf(err, "Failed to create tag %s - %s", createTagRequest.GetTagName(), err.Error()) return nil, processGitErrorf(err, "Failed to create tag %s - %s", request.GetTagName(), err.Error())
} }
if err = sharedRepo.PushTag(ctx, base, createTagRequest.GetTagName()); err != nil { if err = sharedRepo.PushTag(ctx, base, request.GetTagName()); err != nil {
return nil, err return nil, processGitErrorf(err, "Failed to push the tag %s to remote", request.GetTagName())
} }
tag, err := s.adapter.GetAnnotatedTag(ctx, repoPath, createTagRequest.GetTagName()) tag, err := s.adapter.GetAnnotatedTag(ctx, repoPath, request.GetTagName())
if err != nil { if err != nil {
return nil, err return nil, err
@ -274,12 +274,11 @@ func (s ReferenceService) DeleteTag(
err = s.adapter.DeleteTag(ctx, repoPath, request.TagName, env) err = s.adapter.DeleteTag(ctx, repoPath, request.TagName, env)
if err != nil { if err != nil {
return nil, processGitErrorf(err, "Failed to delete the tag %s", request.GetTagName()) return nil, processGitErrorf(err, "Failed to delete tag '%s' from remote repo", request.GetTagName())
} }
err = sharedRepo.PushDeleteBranch(ctx, base, "") if err = sharedRepo.push(ctx, base, "", GetReferenceFromTagName(request.GetTagName())); err != nil {
if err != nil { return nil, processGitErrorf(err, "Failed to push the tag %s to remote", request.GetTagName())
return nil, processGitErrorf(err, "failed to delete tag '%s' from remote repo", request.GetTagName())
} }
return &rpc.UpdateRefResponse{}, nil return &rpc.UpdateRefResponse{}, nil