Review feedback

Author: sethvargo

pkg/config/cleanup_server_config.go

@@ -16,6 +16,7 @@ package config
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/google/exposure-notifications-verification-server/pkg/database"
@@ -65,6 +66,7 @@ func (c *CleanupConfig) Validate() error {
 		{c.CleanupPeriod, "CLEANUP_PERIOD"},
 		{c.VerificationCodeMaxAge, "VERIFICATION_CODE_MAX_AGE"},
 		{c.VerificationTokenMaxAge, "VERIFICATION_TOKEN_MAX_AGE"},
+		{c.AuditEntryMaxAge, "AUDIT_ENTRY_MAX_AGE"},
 	}
 
 	for _, f := range fields {
@@ -73,6 +75,11 @@ func (c *CleanupConfig) Validate() error {
 		}
 	}
 
+	// Audit entries need to persist for at least 7 days. The default is 30d ays.
+	if c.AuditEntryMaxAge < 7*24*time.Hour {
+		return fmt.Errorf("AUDIT_ENTRY_MAX_AGE must be at least 7 days")
+	}
+
 	return nil
 }
 

pkg/database/audit_entry.go

@@ -51,7 +51,7 @@ type AuditEntry struct {
 
 	// TargetID and TargetDisplay are the same as the actor, but are for the
 	// target of the action.
-	TargetID      string `gorm:"column:target_name; type:text; not null;"`
+	TargetID      string `gorm:"column:target_id; type:text; not null;"`
 	TargetDisplay string `gorm:"column:target_display; type:text; not null;"`
 
 	// Diff is the change of structure that occurred, if any.

pkg/database/migrations.go

@@ -1376,7 +1376,8 @@ func (db *Database) getMigrations(ctx context.Context) *gormigrate.Gormigrate {
 
 				sqls := []string{
 					`CREATE INDEX IF NOT EXISTS idx_audit_entries_realm_id ON audit_entries (realm_id)`,
-					`CREATE INDEX IF NOT EXISTS idx_audit_entries_actor_id ON audit_entries (realm_id)`,
+					`CREATE INDEX IF NOT EXISTS idx_audit_entries_actor_id ON audit_entries (actor_id)`,
+					`CREATE INDEX IF NOT EXISTS idx_audit_entries_target_id ON audit_entries (target_id)`,
 					`CREATE INDEX IF NOT EXISTS idx_audit_entries_created_at ON audit_entries (created_at)`,
 				}