PR feedback pt 1

Kira-Pilot · Kira-Pilot · commit 93533422db8f · 2022-12-01T19:14:41.000Z
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/tabbed/pqtype"
+	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/coderd/database"
@@ -240,30 +241,50 @@ func (api *API) auditLogIsResourceDeleted(ctx context.Context, alog database.Get
 	case database.ResourceTypeTemplate:
 		template, err := api.Database.GetTemplateByID(ctx, alog.ResourceID)
 		if err != nil {
-			api.Logger.Error(ctx, "could not fetch template", slog.Error(err))
+			if xerrors.Is(err, sql.ErrNoRows) {
+				return true
+			} else {
+				api.Logger.Error(ctx, "fetch template", slog.Error(err))
+			}
 		}
 		return template.Deleted
 	case database.ResourceTypeUser:
 		user, err := api.Database.GetUserByID(ctx, alog.ResourceID)
 		if err != nil {
-			api.Logger.Error(ctx, "could not fetch user", slog.Error(err))
+			if xerrors.Is(err, sql.ErrNoRows) {
+				return true
+			} else {
+				api.Logger.Error(ctx, "fetch user", slog.Error(err))
+			}
 		}
 		return user.Deleted
 	case database.ResourceTypeWorkspace:
 		workspace, err := api.Database.GetWorkspaceByID(ctx, alog.ResourceID)
 		if err != nil {
-			api.Logger.Error(ctx, "could not fetch workspace", slog.Error(err))
+			if xerrors.Is(err, sql.ErrNoRows) {
+				return true
+			} else {
+				api.Logger.Error(ctx, "fetch workspace", slog.Error(err))
+			}
 		}
 		return workspace.Deleted
 	case database.ResourceTypeWorkspaceBuild:
 		workspaceBuild, err := api.Database.GetWorkspaceBuildByID(ctx, alog.ResourceID)
 		if err != nil {
-			api.Logger.Error(ctx, "could not fetch workspace build", slog.Error(err))
+			if xerrors.Is(err, sql.ErrNoRows) {
+				return true
+			} else {
+				api.Logger.Error(ctx, "fetch workspace build", slog.Error(err))
+			}
 		}
 		// We use workspace as a proxy for workspace build here
 		workspace, err := api.Database.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
 		if err != nil {
-			api.Logger.Error(ctx, "could not fetch workspace", slog.Error(err))
+			if xerrors.Is(err, sql.ErrNoRows) {
+				return true
+			} else {
+				api.Logger.Error(ctx, "fetch workspace", slog.Error(err))
+			}
 		}
 		return workspace.Deleted
 	default:
@@ -296,7 +317,7 @@ func (api *API) auditLogResourceLink(ctx context.Context, alog database.GetAudit
 		var additionalFields AdditionalFields
 		err := json.Unmarshal(additionalFieldsBytes, &additionalFields)
 		if err != nil {
-			api.Logger.Error(ctx, "could not unmarshal workspace name", slog.Error(err))
+			api.Logger.Error(ctx, "unmarshal workspace name", slog.Error(err))
 		}
 		return fmt.Sprintf("/@%s/%s/builds/%s",
 			alog.UserUsername.String, additionalFields.WorkspaceName, additionalFields.BuildNumber)
