chore: change audit type to include username

Emyrk · Emyrk · commit 96b07ac177df · 2024-06-20T18:27:39.000-05:00
diff --git a/coderd/audit/diff.go b/coderd/audit/diff.go
@@ -23,7 +23,7 @@ type Auditable interface {
 		database.OAuth2ProviderApp |
 		database.OAuth2ProviderAppSecret |
 		database.CustomRole |
-		database.OrganizationMember
+		database.AuditableOrganizationMember
 }
 
 // Map is a map of changed fields in an audited resource. It maps field names to
diff --git a/coderd/audit/request.go b/coderd/audit/request.go
@@ -105,8 +105,8 @@ func ResourceTarget[T Auditable](tgt T) string {
 		return typed.DisplaySecret
 	case database.CustomRole:
 		return typed.Name
-	case database.OrganizationMember:
-		return typed.UserID.String()
+	case database.AuditableOrganizationMember:
+		return typed.Username
 	default:
 		panic(fmt.Sprintf("unknown resource %T for ResourceTarget", tgt))
 	}
@@ -146,7 +146,7 @@ func ResourceID[T Auditable](tgt T) uuid.UUID {
 		return typed.ID
 	case database.CustomRole:
 		return typed.ID
-	case database.OrganizationMember:
+	case database.AuditableOrganizationMember:
 		return typed.UserID
 	default:
 		panic(fmt.Sprintf("unknown resource %T for ResourceID", tgt))
@@ -185,7 +185,7 @@ func ResourceType[T Auditable](tgt T) database.ResourceType {
 		return database.ResourceTypeOauth2ProviderAppSecret
 	case database.CustomRole:
 		return database.ResourceTypeCustomRole
-	case database.OrganizationMember:
+	case database.AuditableOrganizationMember:
 		return database.ResourceTypeOrganizationMember
 	default:
 		panic(fmt.Sprintf("unknown resource %T for ResourceType", typed))
@@ -225,7 +225,7 @@ func ResourceRequiresOrgID[T Auditable]() bool {
 		return false
 	case database.CustomRole:
 		return true
-	case database.OrganizationMember:
+	case database.AuditableOrganizationMember:
 		return true
 	default:
 		panic(fmt.Sprintf("unknown resource %T for ResourceRequiresOrgID", tgt))
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -60,6 +60,18 @@ func (s WorkspaceAgentStatus) Valid() bool {
 	}
 }
 
+type AuditableOrganizationMember struct {
+	OrganizationMember
+	Username string `json:"username"`
+}
+
+func (m OrganizationMember) Auditable(username string) AuditableOrganizationMember {
+	return AuditableOrganizationMember{
+		OrganizationMember: m,
+		Username:           username,
+	}
+}
+
 type AuditableGroup struct {
 	Group
 	Members []GroupMember `json:"members"`
diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go
@@ -50,7 +50,8 @@ type Table map[string]map[string]Action
 var AuditableResources = auditMap(auditableResourcesTypes)
 
 var auditableResourcesTypes = map[any]map[string]Action{
-	&database.OrganizationMember{}: {
+	&database.AuditableOrganizationMember{}: {
+		"username":        ActionTrack,
 		"user_id":         ActionTrack,
 		"organization_id": ActionTrack,
 		"created_at":      ActionTrack,

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ type Auditable interface {`
`23`	`23`	`database.OAuth2ProviderApp \|`
`24`	`24`	`database.OAuth2ProviderAppSecret \|`
`25`	`25`	`database.CustomRole \|`
`26`		`- database.OrganizationMember`
	`26`	`+ database.AuditableOrganizationMember`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// Map is a map of changed fields in an audited resource. It maps field names to`