move actor ID fetching up

Author: Strum355

internal/database/executor_secret_access_logs.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/keegancsmith/sqlf"
 
-	"github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/database/basestore"
 )
 
@@ -110,11 +109,6 @@ func (s *executorSecretAccessLogStore) Transact(ctx context.Context) (ExecutorSe
 }
 
 func (s *executorSecretAccessLogStore) Create(ctx context.Context, log *ExecutorSecretAccessLog) error {
-	// Set the current actor as the creator.
-	if log.UserID != nil && *log.UserID == 0 {
-		log.UserID = &actor.FromContext(ctx).UID
-	}
-
 	q := sqlf.Sprintf(
 		executorSecretAccessLogCreateQueryFmtstr,
 		log.ExecutorSecretID,

internal/database/executor_secret_access_logs_test.go

@@ -42,18 +42,6 @@ func TestExecutorSecretAccessLogs_Create(t *testing.T) {
 		if log.CreatedAt.IsZero() {
 			t.Fatal("created_at time not set")
 		}
-
-		t.Run("uses actor user if user ID is not set", func(t *testing.T) {
-			log := &ExecutorSecretAccessLog{
-				ExecutorSecretID: secret.ID,
-			}
-			if err := store.Create(actor.WithActor(ctx, actor.FromUser(user.ID)), log); err != nil {
-				t.Fatal(err)
-			}
-			if *log.UserID != user.ID {
-				t.Fatal("wrong user_id set on access log record")
-			}
-		})
 	})
 }
 

internal/database/executor_secrets.go

@@ -47,9 +47,13 @@ type ExecutorSecretAccessLogCreator interface {
 // multiple times will not require another decryption call, but will create an
 // additional access log entry.
 func (e ExecutorSecret) Value(ctx context.Context, s ExecutorSecretAccessLogCreator) (string, error) {
+	var userID *int32
+	if uid := actor.FromContext(ctx).UID; uid != 0 {
+		userID = &uid
+	}
 	if err := s.Create(ctx, &ExecutorSecretAccessLog{
-		// user is set automatically from the context actor.
 		ExecutorSecretID: e.ID,
+		UserID:           userID,
 	}); err != nil {
 		return "", errors.Wrap(err, "creating secret access log entry")
 	}
@@ -488,7 +492,8 @@ RETURNING %s
 // ExecutorSecret.
 func scanExecutorSecret(secret *ExecutorSecret, key encryption.Key, s interface {
 	Scan(...any) error
-}) error {
+},
+) error {
 	var (
 		value []byte
 		keyID string