1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
package operations
import (
"context"
"errors"
"fmt"
"regexp"
"strings"
"time"
"github.com/golang/protobuf/ptypes"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
"gitlab.com/gitlab-org/gitaly/internal/git"
"gitlab.com/gitlab-org/gitaly/internal/git/localrepo"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver"
"gitlab.com/gitlab-org/gitaly/internal/helper"
"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
const userUpdateSubmoduleName = "UserUpdateSubmodule"
func (s *Server) UserUpdateSubmodule(ctx context.Context, req *gitalypb.UserUpdateSubmoduleRequest) (*gitalypb.UserUpdateSubmoduleResponse, error) {
if err := validateUserUpdateSubmoduleRequest(req); err != nil {
return nil, status.Errorf(codes.InvalidArgument, userUpdateSubmoduleName+": %v", err)
}
if featureflag.IsEnabled(ctx, featureflag.GoUserUpdateSubmodule) {
return s.userUpdateSubmodule(ctx, req)
}
client, err := s.ruby.OperationServiceClient(ctx)
if err != nil {
return nil, err
}
clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, req.GetRepository())
if err != nil {
return nil, err
}
return client.UserUpdateSubmodule(clientCtx, req)
}
func validateUserUpdateSubmoduleRequest(req *gitalypb.UserUpdateSubmoduleRequest) error {
if req.GetRepository() == nil {
return fmt.Errorf("empty Repository")
}
if req.GetUser() == nil {
return fmt.Errorf("empty User")
}
if req.GetCommitSha() == "" {
return fmt.Errorf("empty CommitSha")
}
if match, err := regexp.MatchString(`\A[0-9a-f]{40}\z`, req.GetCommitSha()); !match || err != nil {
return fmt.Errorf("invalid CommitSha")
}
if len(req.GetBranch()) == 0 {
return fmt.Errorf("empty Branch")
}
if len(req.GetSubmodule()) == 0 {
return fmt.Errorf("empty Submodule")
}
if len(req.GetCommitMessage()) == 0 {
return fmt.Errorf("empty CommitMessage")
}
return nil
}
func (s *Server) userUpdateSubmodule(ctx context.Context, req *gitalypb.UserUpdateSubmoduleRequest) (*gitalypb.UserUpdateSubmoduleResponse, error) {
repo := localrepo.New(s.gitCmdFactory, req.GetRepository(), s.cfg)
branches, err := repo.GetBranches(ctx)
if err != nil {
return nil, fmt.Errorf("%s: get branches: %w", userUpdateSubmoduleName, err)
}
if len(branches) == 0 {
return &gitalypb.UserUpdateSubmoduleResponse{
CommitError: "Repository is empty",
}, nil
}
referenceName := git.NewReferenceNameFromBranchName(string(req.GetBranch()))
branchOID, err := repo.ResolveRevision(ctx, referenceName.Revision())
if err != nil {
if errors.Is(err, git.ErrReferenceNotFound) {
return nil, helper.ErrInvalidArgumentf("Cannot find branch")
}
return nil, fmt.Errorf("%s: get branch: %w", userUpdateSubmoduleName, err)
}
repoPath, err := s.locator.GetRepoPath(req.GetRepository())
if err != nil {
return nil, fmt.Errorf("%s: locate repo: %w", userUpdateSubmoduleName, err)
}
authorDate := time.Now()
if req.Timestamp != nil {
authorDate, err = ptypes.Timestamp(req.Timestamp)
if err != nil {
return nil, helper.ErrInvalidArgument(err)
}
}
result, err := git2go.SubmoduleCommand{
Repository: repoPath,
AuthorMail: string(req.GetUser().GetEmail()),
AuthorName: string(req.GetUser().GetName()),
AuthorDate: authorDate,
Branch: string(req.GetBranch()),
CommitSHA: req.GetCommitSha(),
Submodule: string(req.GetSubmodule()),
Message: string(req.GetCommitMessage()),
}.Run(ctx, s.cfg)
if err != nil {
errStr := strings.TrimPrefix(err.Error(), "submodule: ")
errStr = strings.TrimSpace(errStr)
var resp *gitalypb.UserUpdateSubmoduleResponse
for _, legacyErr := range []string{
git2go.LegacyErrPrefixInvalidBranch,
git2go.LegacyErrPrefixInvalidSubmodulePath,
git2go.LegacyErrPrefixFailedCommit,
} {
if strings.HasPrefix(errStr, legacyErr) {
resp = &gitalypb.UserUpdateSubmoduleResponse{
CommitError: legacyErr,
}
ctxlogrus.
Extract(ctx).
WithError(err).
Error(userUpdateSubmoduleName + ": git2go subcommand failure")
break
}
}
if strings.Contains(errStr, "is already at") {
resp = &gitalypb.UserUpdateSubmoduleResponse{
CommitError: errStr,
}
}
if resp != nil {
return resp, nil
}
return nil, fmt.Errorf("%s: submodule subcommand: %w", userUpdateSubmoduleName, err)
}
commitID, err := git.NewObjectIDFromHex(result.CommitID)
if err != nil {
return nil, helper.ErrInvalidArgumentf("cannot parse commit ID: %w", err)
}
if err := s.updateReferenceWithHooks(
ctx,
req.GetRepository(),
req.GetUser(),
referenceName,
commitID,
branchOID,
); err != nil {
var preReceiveError preReceiveError
if errors.As(err, &preReceiveError) {
return &gitalypb.UserUpdateSubmoduleResponse{
PreReceiveError: preReceiveError.Error(),
}, nil
}
var updateRefError updateRefError
if errors.As(err, &updateRefError) {
return &gitalypb.UserUpdateSubmoduleResponse{
CommitError: err.Error(),
}, nil
}
return nil, err
}
return &gitalypb.UserUpdateSubmoduleResponse{
BranchUpdate: &gitalypb.OperationBranchUpdate{
CommitId: result.CommitID,
BranchCreated: false,
RepoCreated: false,
},
}, nil
}
|
