remove duplicate workspace build entry

Kira-Pilot · Kira-Pilot · commit 9895b8849d2c · 2022-11-21T15:07:33.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -520,6 +520,7 @@ func (server *Server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*p
 	case *proto.FailedJob_TemplateImport_:
 	}
 
+	// if failed job is a workspace build, audit the outcome
 	if job.Type == database.ProvisionerJobTypeWorkspaceBuild {
 		auditor := server.Auditor.Load()
 		build, getBuildErr := server.Database.GetWorkspaceBuildByJobID(ctx, job.ID)
@@ -695,9 +696,9 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
 			return nil, xerrors.Errorf("complete job: %w", err)
 		}
 
+		// audit the outcome of the workspace build
 		if getWorkspaceError == nil {
 			auditor := server.Auditor.Load()
-
 			auditAction := determineAuditAction(workspaceBuild.Transition)
 
 			// We pass the workspace name to the Auditor so that it
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -15,8 +15,6 @@ import (
 	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
-	"github.com/coder/coder/coderd/audit"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
@@ -280,58 +278,8 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	auditor := api.Auditor.Load()
-
-	// if user deletes a workspace, audit the workspace
-	if action == rbac.ActionDelete {
-		aReq, commitAudit := audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
-			Audit:   *auditor,
-			Log:     api.Logger,
-			Request: r,
-			Action:  database.AuditActionDelete,
-		})
-
-		defer commitAudit()
-		aReq.Old = workspace
-	}
-
-	latestBuild, latestBuildErr := api.Database.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspace.ID)
-
-	// if a user starts/stops a workspace, audit the workspace build
-	if action == rbac.ActionUpdate {
-		var auditAction database.AuditAction
-		if createBuild.Transition == codersdk.WorkspaceTransitionStart {
-			auditAction = database.AuditActionStart
-		} else if createBuild.Transition == codersdk.WorkspaceTransitionStop {
-			auditAction = database.AuditActionStop
-		} else {
-			auditAction = database.AuditActionWrite
-		}
-
-		// We pass the workspace name to the Auditor so that it
-		// can form a friendly string for the user.
-		workspaceResourceInfo := map[string]string{
-			"workspaceName": workspace.Name,
-		}
-
-		wriBytes, err := json.Marshal(workspaceResourceInfo)
-		if err != nil {
-			api.Logger.Error(ctx, "could not marshal workspace name", slog.Error(err))
-		}
-
-		aReq, commitAudit := audit.InitRequest[database.WorkspaceBuild](rw, &audit.RequestParams{
-			Audit:            *auditor,
-			Log:              api.Logger,
-			Request:          r,
-			Action:           auditAction,
-			AdditionalFields: wriBytes,
-		})
-
-		defer commitAudit()
-		aReq.Old = latestBuild
-	}
-
 	if createBuild.TemplateVersionID == uuid.Nil {
+		latestBuild, latestBuildErr := api.Database.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspace.ID)
 		if latestBuildErr != nil {
 			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 				Message: "Internal error fetching the latest workspace build.",
