linting

Emyrk · Emyrk · commit 38280892a485 · 2024-07-31T16:17:20.000-05:00
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -266,7 +266,14 @@ func (s *MethodTestSuite) TestAuditLogs() {
 		_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
 		check.Args(database.GetAuditLogsOffsetParams{
 			LimitOpt: 10,
-		}).Asserts(rbac.ResourceAuditLog, policy.ActionRead)
+		}).Asserts()
+	}))
+	s.Run("GetAuthorizedAuditLogsOffset", s.Subtest(func(db database.Store, check *expects) {
+		_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
+		_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
+		check.Args(database.GetAuditLogsOffsetParams{
+			LimitOpt: 10,
+		}, emptyPreparedAuthorized{}).Asserts()
 	}))
 }
 
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -787,7 +787,6 @@ func TestAuthorizedAuditLogs(t *testing.T) {
 			ID:             id,
 			OrganizationID: uuid.Nil,
 		}))
-
 	}
 
 	orgAuditLogs := map[uuid.UUID][]uuid.UUID{
@@ -827,6 +826,8 @@ func TestAuthorizedAuditLogs(t *testing.T) {
 	}
 
 	t.Run("NoAccess", func(t *testing.T) {
+		t.Parallel()
+
 		siteAuditorCtx := dbauthz.As(ctx, rbac.Subject{
 			FriendlyName: "member",
 			ID:           uuid.NewString(),
@@ -840,6 +841,8 @@ func TestAuthorizedAuditLogs(t *testing.T) {
 	})
 
 	t.Run("SiteWideAuditor", func(t *testing.T) {
+		t.Parallel()
+
 		siteAuditorCtx := dbauthz.As(ctx, rbac.Subject{
 			FriendlyName: "owner",
 			ID:           uuid.NewString(),
@@ -853,6 +856,8 @@ func TestAuthorizedAuditLogs(t *testing.T) {
 	})
 
 	t.Run("SingleOrgAuditor", func(t *testing.T) {
+		t.Parallel()
+
 		orgID := orgIDs[0]
 		siteAuditorCtx := dbauthz.As(ctx, rbac.Subject{
 			FriendlyName: "org-auditor",
@@ -867,6 +872,8 @@ func TestAuthorizedAuditLogs(t *testing.T) {
 	})
 
 	t.Run("TwoOrgAuditors", func(t *testing.T) {
+		t.Parallel()
+
 		first := orgIDs[0]
 		second := orgIDs[1]
 		siteAuditorCtx := dbauthz.As(ctx, rbac.Subject{
@@ -882,6 +889,8 @@ func TestAuthorizedAuditLogs(t *testing.T) {
 	})
 
 	t.Run("ErroneousOrg", func(t *testing.T) {
+		t.Parallel()
+
 		siteAuditorCtx := dbauthz.As(ctx, rbac.Subject{
 			FriendlyName: "org-auditor",
 			ID:           uuid.NewString(),
diff --git a/enterprise/audit/backends/postgres_test.go b/enterprise/audit/backends/postgres_test.go
@@ -35,6 +35,6 @@ func TestPostgresBackend(t *testing.T) {
 		})
 		require.NoError(t, err)
 		require.Len(t, got, 1)
-		require.Equal(t, alog.ID, got[0].ID)
+		require.Equal(t, alog.ID, got[0].AuditLog.ID)
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ func TestPostgresBackend(t *testing.T) {`
`35`	`35`	`})`
`36`	`36`	`require.NoError(t, err)`
`37`	`37`	`require.Len(t, got, 1)`
`38`		`- require.Equal(t, alog.ID, got[0].ID)`
	`38`	`+ require.Equal(t, alog.ID, got[0].AuditLog.ID)`
`39`	`39`	`})`
`40`	`40`	`}`