From 76b88933e5fadc23b5a9c50cabd717e1fab843c3 Mon Sep 17 00:00:00 2001
From: Akhilesh Pandey <1akhil.pandey@gmail.com>
Date: Thu, 18 May 2023 00:30:21 +0530
Subject: [PATCH] fix: [CODE-199]: Minor, rename local variables to request

---
 gitrpc/internal/service/tag.go | 36 +++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/gitrpc/internal/service/tag.go b/gitrpc/internal/service/tag.go
index ab9929523..dc05ce34c 100644
--- a/gitrpc/internal/service/tag.go
+++ b/gitrpc/internal/service/tag.go
@@ -183,8 +183,8 @@ func listCommitTagsWalkReferencesHandler(tags *[]*rpc.CommitTag) types.WalkRefer
 		return nil
 	}
 }
-func (s ReferenceService) CreateTag(ctx context.Context, createTagRequest *rpc.CreateTagRequest) (*rpc.CreateTagResponse, error) {
-	base := createTagRequest.GetBase()
+func (s ReferenceService) CreateTag(ctx context.Context, request *rpc.CreateTagRequest) (*rpc.CreateTagResponse, error) {
+	base := request.GetBase()
 	if base == nil {
 		return nil, types.ErrBaseCannotBeEmpty
 	}
@@ -206,25 +206,25 @@ func (s ReferenceService) CreateTag(ctx context.Context, createTagRequest *rpc.C
 
 	err = sharedRepo.Clone(ctx, "")
 	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),
 		"GIT_COMMITTER_NAME="+actor.GetName(),
 		"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 {
-		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 {
-		return nil, err
+	if err = sharedRepo.PushTag(ctx, base, request.GetTagName()); err != nil {
+		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 {
 		return nil, err
@@ -233,8 +233,8 @@ func (s ReferenceService) CreateTag(ctx context.Context, createTagRequest *rpc.C
 	return &rpc.CreateTagResponse{Tag: commitTag}, nil
 }
 
-func (s ReferenceService) DeleteTag(ctx context.Context, deleteTagRequest *rpc.DeleteTagRequest) (*rpc.UpdateRefResponse, error) {
-	base := deleteTagRequest.GetBase()
+func (s ReferenceService) DeleteTag(ctx context.Context, request *rpc.DeleteTagRequest) (*rpc.UpdateRefResponse, error) {
+	base := request.GetBase()
 	if base == nil {
 		return nil, types.ErrBaseCannotBeEmpty
 	}
@@ -256,17 +256,21 @@ func (s ReferenceService) DeleteTag(ctx context.Context, deleteTagRequest *rpc.D
 
 	err = sharedRepo.Clone(ctx, "")
 	if err != nil {
-		return nil, processGitErrorf(err, "failed to clone shared repo with tag '%s'", deleteTagRequest.GetTagName())
+		return nil, processGitErrorf(err, "failed to clone shared repo with tag '%s'", request.GetTagName())
 	}
-	actor := deleteTagRequest.GetBase().GetActor()
+	actor := request.GetBase().GetActor()
 	env := append(CreateEnvironmentForPush(ctx, base),
 		"GIT_COMMITTER_NAME="+actor.GetName(),
 		"GIT_COMMITTER_EMAIL="+actor.GetEmail(),
 	)
-	err = s.adapter.DeleteTag(ctx, repoPath, deleteTagRequest.TagName, env)
-	sharedRepo.PushDeleteBranch(ctx, base, "")
+	err = s.adapter.DeleteTag(ctx, repoPath, request.TagName, env)
 	if err != nil {
-		return nil, processGitErrorf(err, "Failed to delete the tag")
+		return nil, processGitErrorf(err, "Failed to delete tag '%s' from remote repo", request.GetTagName())
 	}
+
+	if err = sharedRepo.push(ctx, base, "", GetReferenceFromTagName(request.GetTagName())); err != nil {
+		return nil, processGitErrorf(err, "Failed to push the tag %s to remote", request.GetTagName())
+	}
+
 	return &rpc.UpdateRefResponse{}, nil
 }