Skip to content

Commit 1a25a82

Browse files
lukaszgryglickilukaszgryglicki
authored
Merge pull request #4663 from communitybridge/unicron-4662-fix-update-approval-list
Fix for #4662 and added util scripts that allowed to detect the issue
2 parents c2d23f4 + 4d5a8b0 commit 1a25a82

File tree

38 files changed

+241
-104
lines changed

38 files changed

+241
-104
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup go
2727
uses: actions/setup-go@v5
2828
with:
29-
go-version: '1.22'
29+
go-version: '1.24'
3030
- name: Go Version
3131
run: go version
3232
- name: Setup Node

‎.github/workflows/deploy-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: '1.22'
30+
go-version: '1.24'
3131

3232
- name: Go Version
3333
run: go version

‎.github/workflows/deploy-prod.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: '1.22'
31+
go-version: '1.24'
3232
- name: Go Version
3333
run: go version
3434
- name: Setup Node

‎cla-backend-go/.golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ linters:
6363
- goimports
6464
- gosec
6565
- megacheck # (staticcheck + gosimple + unused in one linter)
66-
- depguard
66+
# - depguard
6767
- unconvert
6868
- unparam
6969
- unused

‎cla-backend-go/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ ifeq "$(shell uname -s)" "Linux"
3535
endif
3636

3737
LINT_TOOL=$(shell go env GOPATH)/bin/golangci-lint
38-
LINT_VERSION=v1.51.2
38+
# LINT_VERSION=v1.51.2
39+
LINT_VERSION=v1.64.8
3940
SWAGGER_DIR=$(ROOT_DIR)/swagger
4041
SWAGGER_BIN_DIR=/usr/local/bin
4142
SWAGGER_TOOL_VERSION=v0.30.3
@@ -350,5 +351,5 @@ build-repository-update-mac: deps build-prep
350351
@chmod +x $(BIN_DIR)/$(REPOSITORY_UPDATE_BIN)-mac
351352

352353
lint:
353-
@cd $(MAKEFILE_DIR) && $(LINT_TOOL) version && echo "==> Running lint..." && $(LINT_TOOL) run --exclude="this method will not auto-escape HTML. Verify data is well formed" --allow-parallel-runners --config=.golangci.yaml ./... && echo "==> Lint check passed."
354+
@cd $(MAKEFILE_DIR) && $(LINT_TOOL) version && echo "==> Running lint..." && $(LINT_TOOL) run --timeout 30m --exclude="this method will not auto-escape HTML. Verify data is well formed" --allow-parallel-runners --config=.golangci.yaml ./... && echo "==> Lint check passed."
354355
@cd $(MAKEFILE_DIR) && ./check-headers.sh

‎cla-backend-go/approval_list/service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (s service) ApproveCclaApprovalListRequest(ctx context.Context, claUser *us
193193
if requestModel.UserEmails == nil {
194194
msg := fmt.Sprintf("ApproveCclaApprovalListRequest - unable to send approval email - email missing for request: %+v, error: %+v",
195195
requestModel, err)
196-
log.Warnf(msg)
196+
log.Warnf("%s", msg)
197197
return errors.New(msg)
198198
}
199199

@@ -287,7 +287,7 @@ func (s service) RejectCclaApprovalListRequest(ctx context.Context, companyID, c
287287
if requestModel.UserEmails == nil {
288288
msg := fmt.Sprintf("unable to send approval email - email missing for request: %+v, error: %+v",
289289
requestModel, err)
290-
log.WithFields(f).Warnf(msg)
290+
log.WithFields(f).Warnf("%s", msg)
291291
return errors.New(msg)
292292
}
293293

‎cla-backend-go/auth/authorizer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (a Authorizer) SecurityAuth(token string, scopes []string) (*user.CLAUser,
6666
if err != nil {
6767
log.WithFields(f).WithError(err).Warnf("SecurityAuth - verify token error: %+v", err)
6868
if strings.Contains(strings.ToLower(err.Error()), "expired") {
69-
return nil, swagerrors.New(401, err.Error())
69+
return nil, swagerrors.New(401, "%s", err.Error())
7070
}
7171
return nil, err
7272
}

‎cla-backend-go/cmd/functional_tests/cla_manager/cla_manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ func (t *TestBehaviour) RunGetCLAManagerRequests() {
281281
if unmarshallErr != nil {
282282
F.AddError(unmarshallErr.Error())
283283
}
284-
if requests.Requests == nil || len(requests.Requests) == 0 {
284+
if len(requests.Requests) == 0 {
285285
F.AddError("GET CLA Manager Requests - Expecting at least one request in response")
286286
}
287287
var containsEntry = false

‎cla-backend-go/cmd/functional_tests/signatures/signatures.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func (t *TestBehaviour) RunGetCompanySignatures() {
174174
if unmarshallErr != nil {
175175
F.AddError(unmarshallErr.Error())
176176
}
177-
if signatures.Signatures == nil || len(signatures.Signatures) == 0 {
177+
if len(signatures.Signatures) == 0 {
178178
F.AddError("Signatures - Get Company Signatures - Google - Expecting at least one signature in response")
179179
}
180180
for _, sig := range signatures.Signatures {

‎cla-backend-go/company/handlers.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
3636
companiesModel, err := service.GetCompanies(ctx)
3737
if err != nil {
3838
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - unable to query all companies, error: %v", err)
39-
log.Warnf(msg)
39+
log.Warnf("%s", msg)
4040
return company.NewGetCompaniesBadRequest().WithXRequestID(reqID).WithPayload(&models.ErrorResponse{
4141
Code: "400",
4242
Message: msg,
@@ -52,7 +52,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
5252
companyModel, err := service.GetCompany(ctx, params.CompanyID)
5353
if err != nil {
5454
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - unable to query company by ID: %s, error: %v", params.CompanyID, err)
55-
log.Warnf(msg)
55+
log.Warnf("%s", msg)
5656
return company.NewGetCompanyBadRequest().WithXRequestID(reqID).WithPayload(&models.ErrorResponse{
5757
Code: "400",
5858
Message: msg,
@@ -87,7 +87,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
8787
companyModel, err := service.GetCompanyByExternalID(ctx, params.CompanySFID)
8888
if err != nil {
8989
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - unable to get associated salesforce Organization: %s using SFID: %s, error: %v", org.Name, params.CompanySFID, err)
90-
log.Warnf(msg)
90+
log.Warnf("%s", msg)
9191
return company.NewGetCompanyByExternalIDBadRequest().WithXRequestID(reqID).WithPayload(&models.ErrorResponse{
9292
Code: "400",
9393
Message: msg,
@@ -108,7 +108,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
108108
companyModel, err := service.GetCompanyBySigningEntityName(ctx, params.Name, params.CompanySFID)
109109
if err != nil {
110110
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - Unable to locate Company with Signing Entity Request of %s", params.Name)
111-
log.Warnf(msg)
111+
log.Warnf("%s", msg)
112112
return company.NewGetCompanyBySigningEntityNameBadRequest().WithPayload(&models.ErrorResponse{
113113
Code: "400",
114114
Message: msg,
@@ -134,7 +134,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
134134
companiesModel, err := service.SearchCompanyByName(ctx, params.CompanyName, nextKey)
135135
if err != nil {
136136
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - unable to query company by name: %s, error: %v", params.CompanyName, err)
137-
log.Warnf(msg)
137+
log.Warnf("%s", msg)
138138
return company.NewSearchCompanyBadRequest().WithXRequestID(reqID).WithPayload(&models.ErrorResponse{
139139
Code: "400",
140140
Message: msg,
@@ -173,7 +173,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
173173
companies, err := service.GetCompaniesByUserManager(ctx, params.UserID)
174174
if err != nil {
175175
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - unable to query companies by user manager id: %s, error: %v", params.UserID, err)
176-
log.Warnf(msg)
176+
log.Warnf("%s", msg)
177177
return company.NewGetCompaniesByUserManagerBadRequest().WithXRequestID(reqID).WithPayload(&models.ErrorResponse{
178178
Code: "400",
179179
Message: msg,
@@ -207,7 +207,7 @@ func Configure(api *operations.ClaAPI, service IService, usersService users.Serv
207207
companies, err := service.GetCompaniesByUserManagerWithInvites(ctx, params.UserID)
208208
if err != nil {
209209
msg := fmt.Sprintf("EasyCLA - 400 Bad Request - unable to query companies by user manager id: %s, error: %v", params.UserID, err)
210-
log.Warnf(msg)
210+
log.Warnf("%s", msg)
211211
return company.NewGetCompaniesByUserManagerWithInvitesBadRequest().WithXRequestID(reqID).WithPayload(&models.ErrorResponse{
212212
Code: "400",
213213
Message: msg,

0 commit comments

Comments
 (0)