feat: add __ID__ pipeline marker for the eval id

jippi · Aug 30, 2024 · f8322c0 · f8322c0
1 parent 1949473
commit f8322c0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/cmd/shared.go b/cmd/shared.go
@@ -37,7 +37,7 @@ func ProcessMR(ctx context.Context, client scm.Client, cfg *config.Config, event
 	ctx = state.WithStartTime(ctx, time.Now())
 
 	// Attach unique eval id to the logs so they are easy to filter on later
-	ctx = slogctx.With(ctx, slog.String("eval_id", sid.MustGenerate()))
+	ctx = state.WithEvaluationID(ctx, sid.MustGenerate())
 
 	// Track where we grab the configuration file from
 	ctx = slogctx.With(ctx, slog.String("config_source_branch", "merge_request_branch"))

diff --git a/pkg/scm/gitlab/client.go b/pkg/scm/gitlab/client.go
@@ -119,8 +119,9 @@ func (client *Client) Start(ctx context.Context) error {
 
 	if len(pattern) != 0 {
 		link := pattern
-		link = strings.ReplaceAll(link, "__PROJECT_ID__", state.ProjectID(ctx))
+		link = strings.ReplaceAll(link, "__ID__", state.EvaluationID(ctx))
 		link = strings.ReplaceAll(link, "__MR_ID__", state.MergeRequestID(ctx))
+		link = strings.ReplaceAll(link, "__PROJECT_ID__", state.ProjectID(ctx))
 		link = strings.ReplaceAll(link, "__START_TS_MS__", strconv.FormatInt(state.StartTime(ctx).UnixMilli(), 10))
 		link = strings.ReplaceAll(link, "__STOP_TS_MS__", "")
 
@@ -158,8 +159,9 @@ func (client *Client) Stop(ctx context.Context, err error) error {
 
 	if len(pattern) != 0 {
 		link := pattern
-		link = strings.ReplaceAll(link, "__PROJECT_ID__", state.ProjectID(ctx))
+		link = strings.ReplaceAll(link, "__ID__", state.EvaluationID(ctx))
 		link = strings.ReplaceAll(link, "__MR_ID__", state.MergeRequestID(ctx))
+		link = strings.ReplaceAll(link, "__PROJECT_ID__", state.ProjectID(ctx))
 		link = strings.ReplaceAll(link, "__START_TS_MS__", strconv.FormatInt(state.StartTime(ctx).UnixMilli(), 10))
 		link = strings.ReplaceAll(link, "__STOP_TS_MS__", strconv.FormatInt(time.Now().UnixMilli(), 10))
 

diff --git a/pkg/state/context.go b/pkg/state/context.go
@@ -20,16 +20,21 @@ const (
 	mergeRequestID
 	projectID
 	provider
+	startTime
 	token
 	updatePipeline
 	updatePipelineURL
-	startTime
+	evaluationID
 )
 
 func ProjectID(ctx context.Context) string {
 	return ctx.Value(projectID).(string) //nolint:forcetypeassert
 }
 
+func EvaluationID(ctx context.Context) string {
+	return ctx.Value(evaluationID).(string) //nolint:forcetypeassert
+}
+
 func CommitSHA(ctx context.Context) string {
 	return ctx.Value(commitSha).(string) //nolint:forcetypeassert
 }
@@ -62,6 +67,12 @@ func StartTime(ctx context.Context) time.Time {
 	return ctx.Value(startTime).(time.Time) //nolint:forcetypeassert
 }
 
+func WithEvaluationID(ctx context.Context, id string) context.Context {
+	ctx = slogctx.With(ctx, slog.String("eval_id", id))
+
+	return context.WithValue(ctx, evaluationID, id)
+}
+
 func WithStartTime(ctx context.Context, now time.Time) context.Context {
 	return context.WithValue(ctx, startTime, now)
 }