From 97827f453040593631b3a2827e75cdc2424486d5 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Tue, 26 Aug 2025 13:21:51 +0000 Subject: [PATCH] knotserver: fix ingester for new pull lexicon Signed-off-by: oppiliappan --- appview/config/config.go | 2 +- knotserver/ingester.go | 8 ++++---- 2 file(s) changed, 5 insertion(s)(+), 5 deletion(s)(-) diff --git a/appview/config/config.go b/appview/config/config.go --- a/appview/config/config.go +++ b/appview/config/config.go @@ -21,7 +21,7 @@ // temporarily, to add users to default knot and spindle AppPassword string `env:"APP_PASSWORD"` // uhhhh this is because knot1 is under icy's did - TmpAltAppPassword string `env:"ALT_APP_PASSWORD, required"` + TmpAltAppPassword string `env:"ALT_APP_PASSWORD"` } type OAuthConfig struct { diff --git a/knotserver/ingester.go b/knotserver/ingester.go --- a/knotserver/ingester.go +++ b/knotserver/ingester.go @@ -98,8 +98,8 @@ l := log.FromContext(ctx) l = l.With("handler", "processPull") l = l.With("did", did) - l = l.With("target_repo", record.TargetRepo) - l = l.With("target_branch", record.TargetBranch) + l = l.With("target_repo", record.Target.Repo) + l = l.With("target_branch", record.Target.Branch) if record.Source == nil { return fmt.Errorf("ignoring pull record: not a branch-based pull request") @@ -109,7 +109,7 @@ if record.Source.Repo != nil { return fmt.Errorf("ignoring pull record: fork based pull") } - repoAt, err := syntax.ParseATURI(record.TargetRepo) + repoAt, err := syntax.ParseATURI(record.Target.Repo) if err != nil { return fmt.Errorf("failed to parse ATURI: %w", err) } @@ -178,7 +178,7 @@ trigger := tangled.Pipeline_PullRequestTriggerData{ Action: "create", SourceBranch: record.Source.Branch, SourceSha: record.Source.Sha, - TargetBranch: record.TargetBranch, + TargetBranch: record.Target.Branch, } compiler := workflow.Compiler{ -- tangled.sh