fixed workspacebuilds_test

Kira-Pilot · Kira-Pilot · commit d5aed0e5d749 · 2022-11-21T17:06:13.000Z
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -560,6 +560,8 @@ func TestWorkspaceBuildStatus(t *testing.T) {
 	require.NoError(t, err)
 	require.EqualValues(t, codersdk.WorkspaceStatusRunning, workspace.LatestBuild.Status)
 
+	numLogs++ // add an audit log for workspace_build starting
+
 	// after successful stop is "stopped"
 	build := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop)
 	_ = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)
@@ -578,14 +580,14 @@ func TestWorkspaceBuildStatus(t *testing.T) {
 	err = client.CancelWorkspaceBuild(ctx, build.ID)
 	require.NoError(t, err)
 
-	numLogs++ // add an audit log for workspace build start
 	// assert an audit log has been created workspace starting
+	require.Equal(t, database.AuditActionStart, auditor.AuditLogs[numLogs-2].Action)
 	require.Len(t, auditor.AuditLogs, numLogs)
-	require.Equal(t, database.AuditActionStart, auditor.AuditLogs[numLogs-1].Action)
 
 	workspace, err = client.Workspace(ctx, workspace.ID)
 	require.NoError(t, err)
 	require.EqualValues(t, codersdk.WorkspaceStatusCanceled, workspace.LatestBuild.Status)
+	numLogs++ // add an audit log for workspace_build cancel
 
 	_ = coderdtest.NewProvisionerDaemon(t, api)
 	// after successful delete is "deleted"
@@ -594,7 +596,7 @@ func TestWorkspaceBuildStatus(t *testing.T) {
 	workspace, err = client.DeletedWorkspace(ctx, workspace.ID)
 	require.NoError(t, err)
 	require.EqualValues(t, codersdk.WorkspaceStatusDeleted, workspace.LatestBuild.Status)
-	numLogs++ // add an audit log for workspace build deletion
+	numLogs++ // add an audit log for workspace_build deletion
 
 	// assert an audit log has been created for deletion
 	require.Len(t, auditor.AuditLogs, numLogs)
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -1205,8 +1205,8 @@ func TestWorkspaceUpdateTTL(t *testing.T) {
 
 			require.Equal(t, testCase.ttlMillis, updated.TTLMillis, "expected autostop ttl to equal requested")
 
-			require.Len(t, auditor.AuditLogs, 5)
-			assert.Equal(t, database.AuditActionWrite, auditor.AuditLogs[4].Action)
+			require.Len(t, auditor.AuditLogs, 6)
+			assert.Equal(t, database.AuditActionWrite, auditor.AuditLogs[5].Action)
 		})
 	}
 
diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go
@@ -111,14 +111,13 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"avatar_url":      ActionTrack,
 		"quota_allowance": ActionTrack,
 	},
-	// We don't show any diff for the WorkspaceBuild resource,
-	// save for the template_version_id
+	// We don't show any diff for the WorkspaceBuild resource
 	&database.WorkspaceBuild{}: {
 		"id":                  ActionIgnore,
 		"created_at":          ActionIgnore,
 		"updated_at":          ActionIgnore,
 		"workspace_id":        ActionIgnore,
-		"template_version_id": ActionTrack,
+		"template_version_id": ActionIgnore,
 		"build_number":        ActionIgnore,
 		"transition":          ActionIgnore,
 		"initiator_id":        ActionIgnore,

Original file line number	Diff line number	Diff line change
`@@ -1205,8 +1205,8 @@ func TestWorkspaceUpdateTTL(t *testing.T) {`
`1205`	`1205`
`1206`	`1206`	`require.Equal(t, testCase.ttlMillis, updated.TTLMillis, "expected autostop ttl to equal requested")`
`1207`	`1207`
`1208`		`- require.Len(t, auditor.AuditLogs, 5)`
`1209`		`- assert.Equal(t, database.AuditActionWrite, auditor.AuditLogs[4].Action)`
	`1208`	`+ require.Len(t, auditor.AuditLogs, 6)`
	`1209`	`+ assert.Equal(t, database.AuditActionWrite, auditor.AuditLogs[5].Action)`
`1210`	`1210`	`})`
`1211`	`1211`	`}`
`1212`	`1212`