fix: moved collection of github PR url until after it is possibly set

speakeasy-api · Oct 16, 2024 · 6db8428 · 6db8428
1 parent a081a0d
commit 6db8428
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/internal/actions/runWorkflow.go b/internal/actions/runWorkflow.go
@@ -62,6 +62,7 @@ func RunWorkflow() error {
 		if err != nil {
 			return err
 		}
+
 		if pr != nil {
 			os.Setenv("GH_PULL_REQUEST", *pr.URL)
 		}

diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go
@@ -63,12 +63,6 @@ func EnrichEventWithEnvironmentVariables(event *shared.CliEvent) {
 	if ghActionVersion != "" {
 		event.GhActionVersion = &ghActionVersion
 	}
-
-	ghPullRequest := os.Getenv("GH_PULL_REQUEST")
-
-	if ghPullRequest != "" {
-		event.GhPullRequest = &ghPullRequest
-	}
 }
 
 func enrichHostName(event *shared.CliEvent) {
@@ -130,6 +124,13 @@ func Track(ctx context.Context, exec shared.InteractionType, fn func(ctx context
 	// Execute the provided function, capturing any error
 	err = fn(ctx, runEvent)
 
+	// Populate event with pull request env var (available only after run)
+	ghPullRequest := os.Getenv("GH_PULL_REQUEST")
+
+	if ghPullRequest != "" {
+		runEvent.GhPullRequest = &ghPullRequest
+	}
+
 	// Update the event with completion details
 	curTime := time.Now()
 	runEvent.LocalCompletedAt = &curTime