rm dead code

sreya · sreya · commit 6e70d6b06f62 · 2023-10-05T18:30:19.000Z
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go
@@ -201,30 +201,13 @@ func (e *Executor) runOnce(t time.Time) Stats {
 						},
 					})
 
-					fields := audit.AdditionalFields{
-						WorkspaceName: ws.Name,
-						BuildReason:   reason,
-					}
-					if build != nil {
-						fields.BuildNumber = strconv.FormatInt(int64(latestBuild.BuildNumber), 10)
-					}
-
-					raw, err := json.Marshal(fields)
-					if err != nil {
-						e.log.Error(e.ctx, "marshal resource info for successful job", slog.Error(err))
-					}
-
-					audit.WorkspaceBuildAudit(e.ctx, &audit.BuildAuditParams[database.Workspace]{
-						Audit:            *e.auditor.Load(),
-						Log:              e.log,
-						UserID:           job.InitiatorID,
-						OrganizationID:   ws.OrganizationID,
-						JobID:            job.ID,
-						Action:           database.AuditActionWrite,
-						Old:              wsOld,
-						New:              ws,
-						Status:           http.StatusOK,
-						AdditionalFields: raw,
+					auditBuild(e.ctx, e.log, *e.auditor.Load(), auditParams{
+						Build:   build,
+						Job:     latestJob,
+						Reason:  reason,
+						Old:     wsOld,
+						New:     ws,
+						Success: err == nil,
 					})
 
 					if err != nil {
@@ -419,3 +402,46 @@ func isEligibleForFailedStop(build database.WorkspaceBuild, job database.Provisi
 		job.CompletedAt.Valid &&
 		currentTick.Sub(job.CompletedAt.Time) > templateSchedule.FailureTTL
 }
+
+type auditParams struct {
+	Build   *database.WorkspaceBuild
+	Job     database.ProvisionerJob
+	Reason  database.BuildReason
+	Old     database.Workspace
+	New     database.Workspace
+	Success bool
+}
+
+func auditBuild(ctx context.Context, log slog.Logger, auditor audit.Auditor, params auditParams) {
+	fields := audit.AdditionalFields{
+		WorkspaceName: params.New.Name,
+		BuildReason:   params.Reason,
+	}
+
+	if params.Build != nil {
+		fields.BuildNumber = strconv.FormatInt(int64(params.Build.BuildNumber), 10)
+	}
+
+	raw, err := json.Marshal(fields)
+	if err != nil {
+		log.Error(ctx, "marshal resource info for successful job", slog.Error(err))
+	}
+
+	status := http.StatusInternalServerError
+	if params.Success {
+		status = http.StatusOK
+	}
+
+	audit.WorkspaceBuildAudit(ctx, &audit.BuildAuditParams[database.Workspace]{
+		Audit:            auditor,
+		Log:              log,
+		UserID:           params.Job.InitiatorID,
+		OrganizationID:   params.New.OrganizationID,
+		JobID:            params.Job.ID,
+		Action:           database.AuditActionWrite,
+		Old:              params.Old,
+		New:              params.New,
+		Status:           status,
+		AdditionalFields: raw,
+	})
+}
diff --git a/codersdk/audit.go b/codersdk/audit.go
@@ -72,7 +72,6 @@ const (
 	AuditActionLogin    AuditAction = "login"
 	AuditActionLogout   AuditAction = "logout"
 	AuditActionRegister AuditAction = "register"
-	AuditActionDormant  AuditAction = "dormant"
 )
 
 func (a AuditAction) Friendly() string {
@@ -93,8 +92,6 @@ func (a AuditAction) Friendly() string {
 		return "logged out"
 	case AuditActionRegister:
 		return "registered"
-	case AuditActionDormant:
-		return "has gone dormant"
 	default:
 		return "unknown"
 	}
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -208,9 +208,9 @@ func TestTemplates(t *testing.T) {
 			require.EqualValues(t, 0, template.TimeTilDormantAutoDeleteMillis)
 
 			var (
-				failureTTL    time.Duration = 1 * time.Minute
-				inactivityTTL time.Duration = 2 * time.Minute
-				dormantTTL    time.Duration = 3 * time.Minute
+				failureTTL    = 1 * time.Minute
+				inactivityTTL = 2 * time.Minute
+				dormantTTL    = 3 * time.Minute
 			)
 
 			updated, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
