fix(backend): fix bad userId in pull log creation for agent (#1873)

Author: kosmoz

frontend/ui/src/app/artifacts/artifact-pulls/artifact-pulls.component.html

@@ -132,7 +132,7 @@
                   @if (pull.userAccountName || pull.userAccountEmail) {
                     {{ pull.userAccountName ?? pull.userAccountEmail }}
                   } @else {
-                    <span class="text-gray-500 dark:text-gray-400 italic">User deleted</span>
+                    <span class="text-gray-500 dark:text-gray-400">-</span>
                   }
                 </td>
                 <td class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white">

internal/db/artifacts.go

@@ -630,6 +630,19 @@ func CreateArtifactPullLogEntry(
 	if remoteAddress == "" {
 		remoteAddressPtr = nil
 	}
+
+	args := pgx.NamedArgs{
+		"versionId":     versionID,
+		"remoteAddress": remoteAddressPtr,
+		"customerOrgId": customerOrgID,
+	}
+
+	if userID != uuid.Nil {
+		args["userId"] = userID
+	} else {
+		args["userId"] = nil
+	}
+
 	_, err := db.Exec(
 		ctx,
 		`INSERT INTO ArtifactVersionPull (
@@ -644,12 +657,7 @@ func CreateArtifactPullLogEntry(
 			@remoteAddress,
 			@customerOrgId
 		)`,
-		pgx.NamedArgs{
-			"versionId":     versionID,
-			"userId":        userID,
-			"remoteAddress": remoteAddressPtr,
-			"customerOrgId": customerOrgID,
-		},
+		args,
 	)
 	if err != nil {
 		return fmt.Errorf("could not create artifact pull log entry: %w", err)

internal/registry/manifest.go

@@ -365,7 +365,7 @@ func (handler *manifests) handleGet(resp http.ResponseWriter, req *http.Request,
 				if err := handler.audit.AuditPull(ctx, repo, target); err != nil {
 					log := internalctx.GetLogger(ctx)
 					log.Warn("failed to audit-log pull", zap.Error(err))
-					sentry.GetHubFromContext(ctx)
+					sentry.GetHubFromContext(ctx).CaptureException(err)
 				}
 				http.Redirect(resp, req, rerr.Location, rerr.Code)
 				return nil
@@ -383,7 +383,7 @@ func (handler *manifests) handleGet(resp http.ResponseWriter, req *http.Request,
 	if err := handler.audit.AuditPull(ctx, repo, target); err != nil {
 		log := internalctx.GetLogger(ctx)
 		log.Warn("failed to audit-log pull", zap.Error(err))
-		sentry.GetHubFromContext(ctx)
+		sentry.GetHubFromContext(ctx).CaptureException(err)
 	}
 
 	resp.Header().Set("Docker-Content-Digest", m.Digest.String())
@@ -410,7 +410,7 @@ func (handler *manifests) handleHead(resp http.ResponseWriter, req *http.Request
 	if err := handler.audit.AuditPull(ctx, repo, target); err != nil {
 		log := internalctx.GetLogger(ctx)
 		log.Warn("failed to audit-log pull", zap.Error(err))
-		sentry.GetHubFromContext(ctx)
+		sentry.GetHubFromContext(ctx).CaptureException(err)
 	}
 
 	resp.Header().Set("Docker-Content-Digest", m.Digest.String())