Merge remote-tracking branch 'origin/main' into audit-on-build/kira-p…

…ilot
coder · Kira-Pilot · Oct 25, 2022 · Oct 18, 2022 · Oct 19, 2022 · Oct 19, 2022
commit cb4b5ee58e1b79b63beae99cc3f68deb48870ebf
diff --git a/coderd/audit/diff.go b/coderd/audit/diff.go
@@ -16,7 +16,8 @@ type Auditable interface {
 		database.User |
 		database.Workspace |
 		database.WorkspaceBuild |
-		database.GitSSHKey
+		database.GitSSHKey |
+		database.Group
 }
 
 // Map is a map of changed fields in an audited resource. It maps field names to

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go
@@ -118,6 +118,12 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"deadline":            ActionIgnore,
 		"reason":              ActionIgnore,
 	},
+	&database.Group{}: {
+		"id":              ActionTrack,
+		"name":            ActionTrack,
+		"organization_id": ActionIgnore, // Never changes.
+		"avatar_url":      ActionTrack,
+	},
 })
 
 // auditMap converts a map of struct pointers to a map of struct names as