Skip to content

fix(adapter): eliminate data race on shared event field #2590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chmouel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(adapter): eliminate data race on shared event field #2590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d02056
fix(adapter): eliminate data race on shared event field
chmouel Mar 18, 2026
9fa048c
Merge branch 'main' into eliminate-data-race-on-shared-event-field
chmouel Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pkg/adapter/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ type listener struct {
run *params.Run
kint kubeinteraction.Interface
logger *zap.SugaredLogger
event *info.Event
}

type Response struct {
Expand Down Expand Up @@ -131,9 +130,9 @@ func (l listener) handleEvent(ctx context.Context) http.HandlerFunc {
return
}

var event map[string]any
var eventBody map[string]any
if string(payload) != "" {
if err := json.Unmarshal(payload, &event); err != nil {
if err := json.Unmarshal(payload, &eventBody); err != nil {
l.logger.Errorf("Invalid event body format format: %s", err)
response.WriteHeader(http.StatusBadRequest)
return
Expand All @@ -143,7 +142,7 @@ func (l listener) handleEvent(ctx context.Context) http.HandlerFunc {
var gitProvider provider.Interface
var logger *zap.SugaredLogger

l.event = info.NewEvent()
event := info.NewEvent()
pacInfo := l.run.Info.GetPacOpts()

globalRepo, err := l.run.Clients.PipelineAsCode.PipelinesascodeV1alpha1().Repositories(l.run.Info.Kube.Namespace).Get(
Expand All @@ -170,7 +169,7 @@ func (l listener) handleEvent(ctx context.Context) http.HandlerFunc {
return
}

isIncoming, targettedRepo, err := l.detectIncoming(ctx, request, payload)
isIncoming, targettedRepo, err := l.detectIncoming(ctx, event, request, payload)
if err != nil {
if errors.Is(err, errMissingFields) {
l.writeResponse(response, http.StatusBadRequest, err.Error())
Expand All @@ -180,7 +179,7 @@ func (l listener) handleEvent(ctx context.Context) http.HandlerFunc {
}

if isIncoming {
gitProvider, logger, err = l.processIncoming(targettedRepo)
gitProvider, logger, err = l.processIncoming(event, targettedRepo)
} else {
gitProvider, logger, err = l.detectProvider(request, string(payload))
}
Expand All @@ -196,7 +195,7 @@ func (l listener) handleEvent(ctx context.Context) http.HandlerFunc {
run: l.run,
vcx: gitProvider,
kint: l.kint,
event: l.event,
event: event,
logger: logger,
payload: payload,
pacInfo: &pacInfo,
Expand Down
36 changes: 18 additions & 18 deletions pkg/adapter/incoming.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func applyIncomingParams(req *http.Request, payloadBody []byte, params []string)
// detectIncoming checks if the request is for an "incoming" webhook request.
// If the request is for an "incoming" webhook request the request is parsed and matched to the expected
// repository.
func (l *listener) detectIncoming(ctx context.Context, req *http.Request, payloadBody []byte) (bool, *v1alpha1.Repository, error) {
func (l *listener) detectIncoming(ctx context.Context, event *info.Event, req *http.Request, payloadBody []byte) (bool, *v1alpha1.Repository, error) {
if req.URL.Path != "/incoming" {
return false, nil, nil
}
Expand Down Expand Up @@ -182,45 +182,45 @@ func (l *listener) detectIncoming(ctx context.Context, req *http.Request, payloa
if err != nil {
return false, nil, err
}
l.event.Provider.URL = enterpriseURL
l.event.Provider.Token = token
l.event.InstallationID = installationID
event.Provider.URL = enterpriseURL
event.Provider.Token = token
event.InstallationID = installationID
// Github app is not installed for provided repository url
if l.event.InstallationID == 0 {
if event.InstallationID == 0 {
return false, nil, fmt.Errorf("GithubApp is not installed for the provided repository url %s ", repo.Spec.URL)
}
}

// make sure accepted is json
if string(payloadBody) != "" {
if l.event.Event, err = applyIncomingParams(req, payloadBody, hook.Params); err != nil {
if event.Event, err = applyIncomingParams(req, payloadBody, hook.Params); err != nil {
return false, nil, err
}
}

// TODO: more than i think about it and more i think triggertarget should be
// eventType and vice versa, but keeping as is for now.
l.event.EventType = "incoming"
l.event.TriggerTarget = "push"
l.event.TargetPipelineRun = payload.PipelineRun
l.event.HeadBranch = payload.Branch
l.event.BaseBranch = payload.Branch
l.event.Request.Header = req.Header
l.event.Request.Payload = payloadBody
l.event.URL = repo.Spec.URL
l.event.Sender = "incoming"
event.EventType = "incoming"
event.TriggerTarget = "push"
event.TargetPipelineRun = payload.PipelineRun
event.HeadBranch = payload.Branch
event.BaseBranch = payload.Branch
event.Request.Header = req.Header
event.Request.Payload = payloadBody
event.URL = repo.Spec.URL
event.Sender = "incoming"

return true, repo, err
}

func (l *listener) processIncoming(targetRepo *v1alpha1.Repository) (provider.Interface, *zap.SugaredLogger, error) {
func (l *listener) processIncoming(event *info.Event, targetRepo *v1alpha1.Repository) (provider.Interface, *zap.SugaredLogger, error) {
// can a git ssh URL be a Repo URL? I don't think this will even ever work
org, repo, err := formatting.GetRepoOwnerSplitted(targetRepo.Spec.URL)
if err != nil {
return nil, nil, err
}
l.event.Organization = org
l.event.Repository = repo
event.Organization = org
event.Repository = repo

var provider provider.Interface
if targetRepo.Spec.GitProvider == nil || targetRepo.Spec.GitProvider.Type == "" {
Expand Down
23 changes: 12 additions & 11 deletions pkg/adapter/incoming_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,16 +830,16 @@ func Test_listener_detectIncoming(t *testing.T) {
run: client,
logger: logger,
kint: kint,
event: info.NewEvent(),
}
event := info.NewEvent()

// make a new request
req := httptest.NewRequestWithContext(ctx, tt.args.method,
fmt.Sprintf("http://localhost%s?repository=%s&secret=%s&pipelinerun=%s&branch=%s&namespace=%s", tt.args.queryURL,
tt.args.queryRepository, tt.args.querySecret, tt.args.queryPipelineRun, tt.args.queryBranch, tt.args.queryNamespace),
strings.NewReader(tt.args.incomingBody))
req.Header = tt.args.queryHeaders
got, _, err := l.detectIncoming(ctx, req, []byte(tt.args.incomingBody))
got, _, err := l.detectIncoming(ctx, event, req, []byte(tt.args.incomingBody))
if tt.wantSubstrErr != "" {
assert.Assert(t, err != nil)
assert.ErrorContains(t, err, tt.wantSubstrErr)
Expand All @@ -850,7 +850,7 @@ func Test_listener_detectIncoming(t *testing.T) {
return
}
assert.Equal(t, got, tt.want, "err = %v", err)
assert.Equal(t, l.event.TargetPipelineRun, tt.args.queryPipelineRun)
assert.Equal(t, event.TargetPipelineRun, tt.args.queryPipelineRun)
})
}
}
Expand Down Expand Up @@ -1012,16 +1012,17 @@ func Test_listener_processIncoming(t *testing.T) {
observer, _ := zapobserver.New(zap.InfoLevel)
logger := zap.New(observer).Sugar()
l := &listener{
run: client, kint: kint, logger: logger, event: info.NewEvent(),
run: client, kint: kint, logger: logger,
}
pintf, _, err := l.processIncoming(tt.targetRepo)
event := info.NewEvent()
pintf, _, err := l.processIncoming(event, tt.targetRepo)
if tt.wantErr {
assert.Assert(t, err != nil)
return
}
assert.Assert(t, reflect.TypeOf(pintf).Elem() == reflect.TypeOf(tt.want).Elem())
assert.Assert(t, l.event.Organization == tt.wantOrg)
assert.Assert(t, l.event.Repository == tt.wantRepo)
assert.Assert(t, event.Organization == tt.wantOrg)
assert.Assert(t, event.Repository == tt.wantRepo)
})
}
}
Expand Down Expand Up @@ -1158,9 +1159,9 @@ func Test_detectIncoming_legacy_warning(t *testing.T) {
run: client,
logger: logger,
kint: kint,
event: info.NewEvent(),
}
got, _, err := l.detectIncoming(ctx, tt.req, tt.body)
event := info.NewEvent()
got, _, err := l.detectIncoming(ctx, event, tt.req, tt.body)
assert.NilError(t, err)
assert.Assert(t, got)
found := false
Expand Down Expand Up @@ -1229,9 +1230,9 @@ func Test_detectIncoming_body_params_are_parsed(t *testing.T) {
run: client,
logger: zap.NewNop().Sugar(),
kint: kint,
event: info.NewEvent(),
}
got, _, err := l.detectIncoming(ctx, req, []byte(payload))
event := info.NewEvent()
got, _, err := l.detectIncoming(ctx, event, req, []byte(payload))
assert.NilError(t, err)
assert.Assert(t, got)
}
Expand Down
Loading