cleaned up tests

Kira-Pilot · Kira-Pilot · commit 43e1694c0311 · 2023-01-26T21:22:36.000Z
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,7 @@
     "afero",
     "apps",
     "ASKPASS",
+    "autostop",
     "awsidentity",
     "bodyclose",
     "buildinfo",
diff --git a/codersdk/audit.go b/codersdk/audit.go
@@ -14,7 +14,6 @@ import (
 type ResourceType string
 
 const (
-	ResourceTypeOrganization    ResourceType = "organization"
 	ResourceTypeTemplate        ResourceType = "template"
 	ResourceTypeTemplateVersion ResourceType = "template_version"
 	ResourceTypeUser            ResourceType = "user"
@@ -27,8 +26,6 @@ const (
 
 func (r ResourceType) FriendlyString() string {
 	switch r {
-	case ResourceTypeOrganization:
-		return "organization"
 	case ResourceTypeTemplate:
 		return "template"
 	case ResourceTypeTemplateVersion:
@@ -122,7 +119,7 @@ type AuditLogResponse struct {
 
 type CreateTestAuditLogRequest struct {
 	Action       AuditAction  `json:"action,omitempty" enums:"create,write,delete,start,stop"`
-	ResourceType ResourceType `json:"resource_type,omitempty" enums:"organization,template,template_version,user,workspace,workspace_build,git_ssh_key,api_key,group"`
+	ResourceType ResourceType `json:"resource_type,omitempty" enums:"template,template_version,user,workspace,workspace_build,git_ssh_key,auditable_group"`
 	ResourceID   uuid.UUID    `json:"resource_id,omitempty" format:"uuid"`
 	Time         time.Time    `json:"time,omitempty" format:"date-time"`
 	BuildReason  BuildReason  `json:"build_reason,omitempty" enums:"autostart,autostop,initiator"`
diff --git a/enterprise/audit/diff_internal_test.go b/enterprise/audit/diff_internal_test.go
@@ -275,44 +275,6 @@ func Test_diff(t *testing.T) {
 		},
 	})
 
-	runDiffTests(t, []diffTest{
-		{
-			name: "Create",
-			left: audit.Empty[database.OrganizationMember](),
-			right: database.OrganizationMember{
-				UserID:         uuid.UUID{1},
-				OrganizationID: uuid.UUID{2},
-				CreatedAt:      time.Now(),
-				UpdatedAt:      time.Now(),
-				Roles:          []string{"auditor"},
-			},
-			exp: audit.Map{
-				"user_id":         audit.OldNew{Old: "", New: uuid.UUID{1}.String()},
-				"organization_id": audit.OldNew{Old: "", New: uuid.UUID{2}.String()},
-				"roles":           audit.OldNew{Old: ([]string)(nil), New: []string{"auditor"}},
-			},
-		},
-	})
-
-	runDiffTests(t, []diffTest{
-		{
-			name: "Create",
-			left: audit.Empty[database.Organization](),
-			right: database.Organization{
-				ID:          uuid.UUID{1},
-				Name:        "rust developers",
-				Description: "an organization for rust developers",
-				CreatedAt:   time.Now(),
-				UpdatedAt:   time.Now(),
-			},
-			exp: audit.Map{
-				"id":          audit.OldNew{Old: "", New: uuid.UUID{1}.String()},
-				"name":        audit.OldNew{Old: "", New: "rust developers"},
-				"description": audit.OldNew{Old: "", New: "an organization for rust developers"},
-			},
-		},
-	})
-
 	runDiffTests(t, []diffTest{
 		{
 			name: "Create",
