Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
110 changes: 110 additions & 0 deletions internal/graph/gengql/jobs.generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions internal/graph/gengql/root_.generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions internal/graph/schema/jobs.graphqls
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,14 @@ type JobRunDeletedActivityLogEntry implements ActivityLogEntry & Node {

"The environment name that the entry belongs to."
environmentName: String

"Data associated with the entry."
data: JobRunDeletedActivityLogEntryData
}

type JobRunDeletedActivityLogEntryData {
"The name of the deleted job run."
runName: String!
}

extend enum ActivityLogActivityType {
Expand Down
20 changes: 19 additions & 1 deletion internal/workload/job/activitylog.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,21 @@ func init() {
}, nil

case activityLogEntryActionDeleteJobRun:
var data *JobRunDeletedActivityLogEntryData
if entry.Data != nil {
var err error
data, err = activitylog.UnmarshalData[JobRunDeletedActivityLogEntryData](entry)
if err != nil {
return nil, fmt.Errorf("transforming job run deleted activity log entry data: %w", err)
}
}
runName := entry.ResourceName
if data != nil && data.RunName != "" {
runName = data.RunName
}
return JobRunDeletedActivityLogEntry{
GenericActivityLogEntry: entry.WithMessage(fmt.Sprintf("Job run %s deleted", entry.ResourceName)),
GenericActivityLogEntry: entry.WithMessage(fmt.Sprintf("Job run %s deleted", runName)),
Data: data,
}, nil

case deploymentactivity.ActivityLogEntryActionDeployment:
Expand Down Expand Up @@ -58,6 +71,11 @@ type JobDeletedActivityLogEntry struct {
activitylog.GenericActivityLogEntry
}

type JobRunDeletedActivityLogEntryData struct {
RunName string
}

type JobRunDeletedActivityLogEntry struct {
activitylog.GenericActivityLogEntry
Data *JobRunDeletedActivityLogEntryData
}
3 changes: 2 additions & 1 deletion internal/workload/job/queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ func DeleteRun(ctx context.Context, teamSlug slug.Slug, environmentName, runName
Action: activityLogEntryActionDeleteJobRun,
Actor: authz.ActorFromContext(ctx).User,
ResourceType: activityLogEntryResourceTypeJob,
ResourceName: runName,
ResourceName: jobName,
Data: &JobRunDeletedActivityLogEntryData{RunName: runName},
EnvironmentName: &environmentName,
TeamSlug: &teamSlug,
}); err != nil {
Expand Down
Loading