Skip to content

Commit 74af869

Browse files
authored
Aliasing (#2113)
* ensure alias in user facing areas * support alias in comment ops * handle one line comments * remove unintended change * add alias to instructions, allow parsing * remove changes - not target * Update spec.go remove space * address comments * remove further * forgot to refactor
1 parent d95b1d8 commit 74af869

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

backend/services/spec.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,16 @@ func GetRunNameFromJob(job models.DiggerJob) (*string, error) {
100100
batch := job.Batch
101101
batchIdShort := batch.ID.String()[:8]
102102
diggerCommand := fmt.Sprintf("digger %v", batch.BatchType)
103+
// Use alias for display, keep original name for logging
103104
projectName := jobSpec.ProjectName
105+
projectDisplayName := jobSpec.ProjectName
106+
if jobSpec.ProjectAlias != "" {
107+
projectDisplayName = jobSpec.ProjectAlias
108+
}
104109
requestedBy := jobSpec.RequestedBy
105110
prNumber := *jobSpec.PullRequestNumber
106111

107-
runName := fmt.Sprintf("[%v] %v %v By: %v PR: %v", batchIdShort, diggerCommand, projectName, requestedBy, prNumber)
112+
runName := fmt.Sprintf("[%v] %v %v By: %v PR: %v", batchIdShort, diggerCommand, projectDisplayName, requestedBy, prNumber)
108113
slog.Debug("Generated run name",
109114
"jobId", job.DiggerJobID,
110115
"runName", runName,

backend/utils/comment_utils.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,16 @@ func GenerateRealtimeCommentMessage(jobs []models.DiggerJob, batchType orchestra
140140

141141
// Get project name from job spec
142142
var jobSpec orchestrator_scheduler.JobJson
143-
projectName := "Unknown"
143+
projectDisplayName := "Unknown"
144144
if job.SerializedJobSpec != nil {
145145
err := json.Unmarshal(job.SerializedJobSpec, &jobSpec)
146146
if err == nil {
147-
projectName = jobSpec.ProjectName
147+
// Use alias if available, fallback to project name
148+
if jobSpec.ProjectAlias != "" {
149+
projectDisplayName = jobSpec.ProjectAlias
150+
} else {
151+
projectDisplayName = jobSpec.ProjectName
152+
}
148153
} else {
149154
slog.Warn("Failed to unmarshal job spec for project name",
150155
"jobId", job.DiggerJobID,
@@ -167,7 +172,7 @@ func GenerateRealtimeCommentMessage(jobs []models.DiggerJob, batchType orchestra
167172
// Match exact CLI format: |emoji **project** |<a href='workflow'>status</a> | <a href='comment'>jobType</a> | + | ~ | - |
168173
message += fmt.Sprintf("|%s **%s** |<a href='%s'>%s</a> | <a href='%s'>%s</a> | %d | %d | %d|\n",
169174
job.Status.ToEmoji(),
170-
projectName,
175+
projectDisplayName,
171176
workflowUrl,
172177
job.Status.ToString(),
173178
prCommentUrl,

cli/pkg/spec/spec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func RunSpec(
9999
reportError(spec, backendApi, message, err)
100100
}
101101

102-
reporter, err := reporterProvider.GetReporter(fmt.Sprintf("%v for %v", spec.Job.JobType, job.ProjectName), spec.Reporter, prService, *spec.Job.PullRequestNumber, spec.VCS.VcsType)
102+
reporter, err := reporterProvider.GetReporter(fmt.Sprintf("%v for %v", spec.Job.JobType, job.GetProjectAlias()), spec.Reporter, prService, *spec.Job.PullRequestNumber, spec.VCS.VcsType)
103103
if err != nil {
104104
message := fmt.Sprintf("could not get reporter: %v", err)
105105
reportError(spec, backendApi, message, err)

libs/comment_utils/reporting/source_grouping.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ func (r SourceGroupingReporter) UpdateComment(sourceDetails []SourceDetails, loc
9393
continue
9494
}
9595
expanded := i == 0 || !allSimilarInGroup
96-
commenter := GetTerraformOutputAsCollapsibleComment(fmt.Sprintf("Plan for %v", project), expanded)
96+
// Use alias for display with fallback to project name
97+
displayName := scheduler.GetProjectAlias(job)
98+
commenter := GetTerraformOutputAsCollapsibleComment(fmt.Sprintf("Plan for %v", displayName), expanded)
9799
message = message + commenter(terraformOutputs[project]) + "\n"
98100
}
99101

0 commit comments

Comments
 (0)