Skip to content

Commit 48936f8

Browse files
south-mersouth-mer
committed
Reduce diff from upstream
1 parent ef6f68a commit 48936f8

File tree

14 files changed

+48
-78
lines changed

14 files changed

+48
-78
lines changed

‎cmd/server.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package cmd
1616

1717
import (
18-
"context"
1918
"io/fs"
2019
"os"
2120

@@ -59,7 +58,7 @@ func serverCmd(cmd *cobra.Command, args []string) error {
5958
return errors.Wrapf(err, "failed to read server config")
6059
}
6160

62-
s, err := server.New(context.Background(), cfg)
61+
s, err := server.New(cfg)
6362
if err != nil {
6463
return err
6564
}

‎config/policy-bot.example.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,3 @@ sessions:
174174
# files:
175175
# static: build/static
176176
# templates: server/templates
177-
178-
# Options for OpenTelemetry tracing.
179-
#
180-
# opentelemetry:
181-
# enabled: true
182-
# google_cloud_support: true

‎policy/reviewer/reviewer.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func selectTeamReviewers(ctx context.Context, prctx pull.Context, selection *Sel
205205
}
206206
}
207207

208-
logger.Debug().Ctx(ctx).Msgf("Requesting %d teams for review", len(teams))
208+
logger.Debug().Msgf("Requesting %d teams for review", len(teams))
209209
selection.Teams = append(selection.Teams, teams...)
210210
return nil
211211
}
@@ -219,10 +219,10 @@ func selectUserReviewers(ctx context.Context, prctx pull.Context, selection *Sel
219219
}
220220

221221
if len(result.ReviewRequestRule.Teams) > 0 {
222-
logger.Debug().Ctx(ctx).Msg("Selecting from teams for review")
222+
logger.Debug().Msg("Selecting from teams for review")
223223
teamsToUsers, err := selectTeamMembers(prctx, result.ReviewRequestRule.Teams)
224224
if err != nil {
225-
logger.Warn().Ctx(ctx).Err(err).Msgf("failed to get member listing for teams, skipping team member selection")
225+
logger.Warn().Err(err).Msgf("failed to get member listing for teams, skipping team member selection")
226226
}
227227
for _, users := range teamsToUsers {
228228
for _, user := range users {
@@ -232,10 +232,10 @@ func selectUserReviewers(ctx context.Context, prctx pull.Context, selection *Sel
232232
}
233233

234234
if len(result.ReviewRequestRule.Organizations) > 0 {
235-
logger.Debug().Ctx(ctx).Msg("Selecting from organizations for review")
235+
logger.Debug().Msg("Selecting from organizations for review")
236236
orgMembers, err := selectOrgMembers(prctx, result.ReviewRequestRule.Organizations)
237237
if err != nil {
238-
logger.Warn().Ctx(ctx).Err(err).Msg("failed to get member listing for org, skipping org member selection")
238+
logger.Warn().Err(err).Msg("failed to get member listing for org, skipping org member selection")
239239
}
240240
for _, user := range orgMembers {
241241
allUsers[user] = struct{}{}
@@ -252,7 +252,7 @@ func selectUserReviewers(ctx context.Context, prctx pull.Context, selection *Sel
252252
}
253253

254254
if len(result.ReviewRequestRule.Permissions) > 0 {
255-
logger.Debug().Ctx(ctx).Msg("Selecting from collaborators by permission for review")
255+
logger.Debug().Msg("Selecting from collaborators by permission for review")
256256
for _, c := range collaborators {
257257
for _, cp := range c.Permissions {
258258
if cp.ViaRepo && requestsPermission(result, cp.Permission) {
@@ -264,20 +264,20 @@ func selectUserReviewers(ctx context.Context, prctx pull.Context, selection *Sel
264264

265265
possibleReviewers := getPossibleReviewers(prctx, allUsers, collaborators)
266266
if len(possibleReviewers) == 0 {
267-
logger.Debug().Ctx(ctx).Msg("Found 0 eligible reviewers; skipping review request")
267+
logger.Debug().Msg("Found 0 eligible reviewers; skipping review request")
268268
return nil
269269
}
270270

271271
switch result.ReviewRequestRule.Mode {
272272
case common.RequestModeAllUsers:
273-
logger.Debug().Ctx(ctx).Msgf("Found %d eligible reviewers; selecting all", len(possibleReviewers))
273+
logger.Debug().Msgf("Found %d eligible reviewers; selecting all", len(possibleReviewers))
274274
selection.Users = append(selection.Users, possibleReviewers...)
275275

276276
case common.RequestModeRandomUsers:
277277
count := result.ReviewRequestRule.RequestedCount
278278
selectedUsers := selectRandomUsers(count, possibleReviewers, r)
279279

280-
logger.Debug().Ctx(ctx).Msgf("Found %d eligible reviewers; randomly selecting %d", len(possibleReviewers), count)
280+
logger.Debug().Msgf("Found %d eligible reviewers; randomly selecting %d", len(possibleReviewers), count)
281281
selection.Users = append(selection.Users, selectedUsers...)
282282
}
283283
return nil

‎pull/github_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func TestReviews(t *testing.T) {
205205
func TestNoReviews(t *testing.T) {
206206
rp := &ResponsePlayer{}
207207
dataRule := rp.AddRule(
208-
GraphQLNodePrefixMatcher("repository.pullRequest.commits"),
208+
GraphQLNodePrefixMatcher("repository.pullRequest.reviews"),
209209
"testdata/responses/pull_no_reviews.yml",
210210
)
211211

‎server/handler/check_run.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (h *CheckRun) Handle(ctx context.Context, eventType, deliveryID string, pay
5050

5151
ctx, logger := githubapp.PrepareRepoContext(ctx, installationID, repo)
5252

53-
logger.Debug().Ctx(ctx).Msgf("Check run event is for '%s', found %d PRs", event.GetCheckRun().GetName(), len(event.GetCheckRun().PullRequests))
53+
logger.Debug().Msgf("Check run event is for '%s', found %d PRs", event.GetCheckRun().GetName(), len(event.GetCheckRun().PullRequests))
5454

5555
evaluationFailures := 0
5656
for _, pr := range event.GetCheckRun().PullRequests {
@@ -67,7 +67,7 @@ func (h *CheckRun) Handle(ctx context.Context, eventType, deliveryID string, pay
6767
// do with us.
6868
prBaseRepo := pr.GetBase().GetRepo()
6969
if prBaseRepo.GetID() != repoID {
70-
logger.Debug().Ctx(ctx).Msgf("Skipping pull request '%d' from different repository '%s'", pr.GetNumber(), prBaseRepo.GetURL())
70+
logger.Debug().Msgf("Skipping pull request '%d' from different repository '%s'", pr.GetNumber(), prBaseRepo.GetURL())
7171
continue
7272
}
7373

@@ -78,7 +78,7 @@ func (h *CheckRun) Handle(ctx context.Context, eventType, deliveryID string, pay
7878
Value: pr,
7979
}); err != nil {
8080
evaluationFailures++
81-
logger.Error().Ctx(ctx).Err(err).Msgf("Failed to evaluate pull request '%d' for SHA '%s'", pr.GetNumber(), commitSHA)
81+
logger.Error().Err(err).Msgf("Failed to evaluate pull request '%d' for SHA '%s'", pr.GetNumber(), commitSHA)
8282
}
8383
}
8484
if evaluationFailures == 0 {

‎server/handler/details_reviewers.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (h *DetailsReviewers) ServeHTTP(w http.ResponseWriter, r *http.Request) err
5050
config := evalctx.Config
5151
switch {
5252
case config.LoadError != nil:
53-
logger.Warn().Ctx(r.Context()).Err(config.LoadError).Msgf("Error loading policy from %s, reviewers will be incomplete", config.Source)
53+
logger.Warn().Err(config.LoadError).Msgf("Error loading policy from %s, reviewers will be incomplete", config.Source)
5454
return h.renderReviewers(w, r, DetailsReviewersData{Incomplete: true})
5555

5656
case config.Config == nil:
@@ -80,7 +80,7 @@ func (h *DetailsReviewers) ServeHTTP(w http.ResponseWriter, r *http.Request) err
8080
for _, org := range requires.Actors.Organizations {
8181
members, err := prctx.OrganizationMembers(org)
8282
if err != nil {
83-
logger.Warn().Ctx(r.Context()).Err(err).Str("organization", org).Msg("Error listing organization members, reviewers will be incomplete")
83+
logger.Warn().Err(err).Str("organization", org).Msg("Error listing organization members, reviewers will be incomplete")
8484
incomplete = true
8585
} else {
8686
reviewers = append(reviewers, members...)
@@ -91,7 +91,7 @@ func (h *DetailsReviewers) ServeHTTP(w http.ResponseWriter, r *http.Request) err
9191
for _, team := range requires.Actors.Teams {
9292
members, err := prctx.TeamMembers(team)
9393
if err != nil {
94-
logger.Warn().Ctx(r.Context()).Err(err).Str("team", team).Msg("Error listing team members, reviewers will be incomplete")
94+
logger.Warn().Err(err).Str("team", team).Msg("Error listing team members, reviewers will be incomplete")
9595
incomplete = true
9696
} else {
9797
reviewers = append(reviewers, members...)
@@ -103,7 +103,7 @@ func (h *DetailsReviewers) ServeHTTP(w http.ResponseWriter, r *http.Request) err
103103
minPerm := slices.Min(perms)
104104
userCollaborators, err := prctx.RepositoryCollaborators(minPerm)
105105
if err != nil {
106-
logger.Warn().Ctx(r.Context()).Err(err).Msg("Error listing user collaborators, reviewers will be incomplete")
106+
logger.Warn().Err(err).Msg("Error listing user collaborators, reviewers will be incomplete")
107107
incomplete = true
108108
} else {
109109
for _, user := range userCollaborators {

‎server/handler/eval_context.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@ func (ec *EvalContext) ParseConfig(ctx context.Context, trigger common.Trigger)
7878
switch {
7979
case fc.LoadError != nil:
8080
msg := fmt.Sprintf("Error loading policy from %s", fc.Source)
81-
logger.Warn().Ctx(ctx).Err(fc.LoadError).Msg(msg)
81+
logger.Warn().Err(fc.LoadError).Msg(msg)
8282

8383
ec.PostStatus(ctx, "error", msg)
8484
return nil, errors.Wrapf(fc.LoadError, "failed to load policy: %s: %s", fc.Source, fc.Path)
8585

8686
case fc.ParseError != nil:
8787
msg := fmt.Sprintf("Invalid policy in %s: %s", fc.Source, fc.Path)
88-
logger.Warn().Ctx(ctx).Err(fc.ParseError).Msg(msg)
88+
logger.Warn().Err(fc.ParseError).Msg(msg)
8989

9090
ec.PostStatus(ctx, "error", msg)
9191
return nil, errors.Wrapf(fc.ParseError, "failed to parse policy: %s: %s", fc.Source, fc.Path)
9292

9393
case fc.Config == nil:
94-
logger.Debug().Ctx(ctx).Msg("No policy defined for repository")
94+
logger.Debug().Msg("No policy defined for repository")
9595
return nil, nil
9696
}
9797

@@ -103,15 +103,15 @@ func (ec *EvalContext) ParseConfig(ctx context.Context, trigger common.Trigger)
103103
evaluator, err := policy.ParsePolicy(fc.Config, opts)
104104
if err != nil {
105105
msg := fmt.Sprintf("Invalid policy in %s: %s", fc.Source, fc.Path)
106-
logger.Warn().Ctx(ctx).Err(err).Msg(msg)
106+
logger.Warn().Err(err).Msg(msg)
107107

108108
ec.PostStatus(ctx, "error", msg)
109109
return nil, errors.Wrapf(err, "failed to create evaluator: %s: %s", fc.Source, fc.Path)
110110
}
111111

112112
policyTrigger := evaluator.Trigger()
113113
if !trigger.Matches(policyTrigger) {
114-
logger.Debug().Ctx(ctx).
114+
logger.Debug().
115115
Str("event_trigger", trigger.String()).
116116
Str("policy_trigger", policyTrigger.String()).
117117
Msg("No evaluation necessary for this trigger, skipping")
@@ -130,7 +130,7 @@ func (ec *EvalContext) EvaluatePolicy(ctx context.Context, evaluator common.Eval
130130
result := evaluator.Evaluate(ctx, ec.PullContext)
131131
if result.Error != nil {
132132
msg := fmt.Sprintf("Error evaluating policy in %s: %s", ec.Config.Source, ec.Config.Path)
133-
logger.Warn().Ctx(ctx).Err(result.Error).Msg(msg)
133+
logger.Warn().Err(result.Error).Msg(msg)
134134

135135
ec.PostStatus(ctx, "error", msg)
136136
return result, result.Error
@@ -168,11 +168,11 @@ func (ec *EvalContext) RunPostEvaluateActions(ctx context.Context, result common
168168
logger := zerolog.Ctx(ctx)
169169

170170
if err := ec.requestReviewsForResult(ctx, trigger, result); err != nil {
171-
logger.Error().Ctx(ctx).Err(err).Msg("Failed to request reviewers")
171+
logger.Error().Err(err).Msg("Failed to request reviewers")
172172
}
173173

174174
if err := ec.dismissStaleReviewsForResult(ctx, result); err != nil {
175-
logger.Error().Ctx(ctx).Err(err).Msg("Failed to dismiss stale reviews")
175+
logger.Error().Err(err).Msg("Failed to dismiss stale reviews")
176176
}
177177
}
178178

@@ -201,7 +201,7 @@ func (ec *EvalContext) PostStatus(ctx context.Context, state, message string) {
201201
case "error":
202202
prefix = ec.Options.StatusCheckDescriptionPrefix.Error
203203
default:
204-
logger.Warn().Ctx(ctx).Msgf("Unknown status state: %s, using empty prefix", state)
204+
logger.Warn().Msgf("Unknown status state: %s, using empty prefix", state)
205205
}
206206

207207
var description string
@@ -224,7 +224,7 @@ func (ec *EvalContext) PostStatus(ctx context.Context, state, message string) {
224224
}
225225

226226
if !ec.PullContext.IsOpen() {
227-
logger.Info().Ctx(ctx).Msg("Skipping status update because PR state is not open")
227+
logger.Info().Msg("Skipping status update because PR state is not open")
228228
return
229229
}
230230

‎server/handler/eval_context_dismissal.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (ec *EvalContext) dismissStaleReviewsForResult(ctx context.Context, result
4545
continue
4646
}
4747

48-
logger.Info().Ctx(ctx).Str("reason", d.Reason).Msgf("Dismissing stale review %s", d.Candidate.ReviewID)
48+
logger.Info().Str("reason", d.Reason).Msgf("Dismissing stale review %s", d.Candidate.ReviewID)
4949
if err := dismissPullRequestReview(ctx, ec.V4Client, d.Candidate.ReviewID, d.Reason); err != nil {
5050
return err
5151
}

‎server/handler/eval_context_reviewers.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ func (ec *EvalContext) requestReviewsForResult(ctx context.Context, trigger comm
4444
}
4545

4646
if reqs := reviewer.FindRequests(&result); len(reqs) > 0 {
47-
logger.Debug().Ctx(ctx).Msgf("Found %d pending rules with review requests enabled", len(reqs))
47+
logger.Debug().Msgf("Found %d pending rules with review requests enabled", len(reqs))
4848
return ec.requestReviews(ctx, reqs)
4949
}
5050

51-
logger.Debug().Ctx(ctx).Msgf("No pending rules have review requests enabled, skipping reviewer assignment")
51+
logger.Debug().Msgf("No pending rules have review requests enabled, skipping reviewer assignment")
5252
return nil
5353
}
5454

@@ -67,7 +67,7 @@ func (ec *EvalContext) requestReviews(ctx context.Context, reqs []*common.Result
6767
}
6868

6969
if selection.IsEmpty() {
70-
logger.Debug().Ctx(ctx).Msg("No eligible users or teams found for review")
70+
logger.Debug().Msg("No eligible users or teams found for review")
7171
return nil
7272
}
7373

@@ -82,7 +82,7 @@ func (ec *EvalContext) requestReviews(ctx context.Context, reqs []*common.Result
8282
// Use the global random source instead of the per-PR source so that two
8383
// events for the same PR don't wait for the same amount of time.
8484
delay := time.Duration(rand.Intn(maxDelayMillis)) * time.Millisecond
85-
logger.Debug().Ctx(ctx).Msgf("Waiting for %s to spread out reviewer processing", delay)
85+
logger.Debug().Msgf("Waiting for %s to spread out reviewer processing", delay)
8686
time.Sleep(delay)
8787

8888
// Get existing reviewers _after_ computing the selection and sleeping in
@@ -120,7 +120,7 @@ func (ec *EvalContext) requestReviews(ctx context.Context, reqs []*common.Result
120120

121121
if diff := selection.Difference(reviewers); !diff.IsEmpty() {
122122
req := selectionToReviewersRequest(diff)
123-
logger.Debug().Ctx(ctx).
123+
logger.Debug().
124124
Strs("users", req.Reviewers).
125125
Strs("teams", req.TeamReviewers).
126126
Msgf("Requesting reviews from %d users and %d teams", len(req.Reviewers), len(req.TeamReviewers))
@@ -133,7 +133,7 @@ func (ec *EvalContext) requestReviews(ctx context.Context, reqs []*common.Result
133133
return errors.Wrap(err, "failed to request reviewers")
134134
}
135135

136-
logger.Debug().Ctx(ctx).Msg("All selected reviewers are already assigned or were explicitly removed")
136+
logger.Debug().Msg("All selected reviewers are already assigned or were explicitly removed")
137137
return nil
138138
}
139139

‎server/handler/issue_comment.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (h *IssueComment) Handle(ctx context.Context, eventType, deliveryID string,
7676

7777
switch {
7878
case evalCtx.Config.LoadError != nil || evalCtx.Config.ParseError != nil:
79-
logger.Warn().Ctx(ctx).Str(LogKeyAudit, "issue_comment").Msg("Skipping tampering check because the policy is not valid")
79+
logger.Warn().Str(LogKeyAudit, "issue_comment").Msg("Skipping tampering check because the policy is not valid")
8080
case evalCtx.Config.Config != nil:
8181
tampered := h.detectAndLogTampering(ctx, evalCtx, event)
8282
if tampered {
@@ -93,7 +93,7 @@ func (h *IssueComment) Handle(ctx context.Context, eventType, deliveryID string,
9393
}
9494

9595
if !h.affectsApproval(event, evalCtx.Config.Config) {
96-
logger.Debug().Ctx(ctx).Msg("Skipping evaluation because this comment does not impact approval")
96+
logger.Debug().Msg("Skipping evaluation because this comment does not impact approval")
9797
return nil
9898
}
9999

@@ -121,13 +121,13 @@ func (h *IssueComment) detectAndLogTampering(ctx context.Context, evalCtx *EvalC
121121

122122
if h.affectsApproval(event, evalCtx.Config.Config) {
123123
msg := fmt.Sprintf("Entity %s edited approval comment by %s", eventAuthor, commentAuthor)
124-
logger.Warn().Ctx(ctx).Str(LogKeyAudit, "issue_comment").Msg(msg)
124+
logger.Warn().Str(LogKeyAudit, "issue_comment").Msg(msg)
125125

126126
evalCtx.PostStatus(ctx, "failure", msg)
127127
return true
128128
}
129129

130-
logger.Warn().Ctx(ctx).Str(LogKeyAudit, "issue_comment").Msgf("The comment_editor=%s is not the author=%s", eventAuthor, commentAuthor)
130+
logger.Warn().Str(LogKeyAudit, "issue_comment").Msgf("The comment_editor=%s is not the author=%s", eventAuthor, commentAuthor)
131131
return true
132132
}
133133

0 commit comments

Comments
 (0)