Merge remote-tracking branch 'origin/authzquerier_layer' into authzquerier_layer

johnstcn · johnstcn · commit d6810dea79ef · 2023-02-03T17:21:49.000Z
diff --git a/coderd/authzquery/methods_test.go b/coderd/authzquery/methods_test.go
@@ -27,10 +27,8 @@ import (
 
 var (
 	skipMethods = map[string]string{
-		"InTx":                    "Not relevant",
-		"Ping":                    "Not relevant",
-		"GetAuthorizedWorkspaces": "Will not be exposed",
-		"GetAuthorizedTemplates":  "Will not be exposed",
+		"InTx": "Not relevant",
+		"Ping": "Not relevant",
 	}
 )
 
diff --git a/coderd/authzquery/template_test.go b/coderd/authzquery/template_test.go
@@ -132,9 +132,12 @@ func (suite *MethodTestSuite) TestTemplate() {
 			tv2 := dbgen.TemplateVersion(t, db, database.TemplateVersion{
 				TemplateID: uuid.NullUUID{UUID: t2.ID, Valid: true},
 			})
-			return methodCase(values([]uuid.UUID{tv1.ID, tv2.ID}),
+			tv3 := dbgen.TemplateVersion(t, db, database.TemplateVersion{
+				TemplateID: uuid.NullUUID{UUID: t2.ID, Valid: true},
+			})
+			return methodCase(values([]uuid.UUID{tv1.ID, tv2.ID, tv3.ID}),
 				asserts(t1, rbac.ActionRead, t2, rbac.ActionRead),
-				values([]database.TemplateVersion{tv1, tv2}))
+				values([]database.TemplateVersion{tv1, tv2, tv3}))
 		})
 	})
 	suite.Run("GetTemplateVersionsByTemplateID", func() {
@@ -176,6 +179,15 @@ func (suite *MethodTestSuite) TestTemplate() {
 				values([]database.Template{a}))
 		})
 	})
+	suite.Run("GetAuthorizedTemplates", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			a := dbgen.Template(t, db, database.Template{})
+			// No asserts because SQLFilter.
+			return methodCase(values(database.GetTemplatesWithFilterParams{}, emptyPreparedAuthorized{}),
+				asserts(),
+				values([]database.Template{a}))
+		})
+	})
 	suite.Run("InsertTemplate", func() {
 		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
 			orgID := uuid.New()
diff --git a/coderd/authzquery/workspace_test.go b/coderd/authzquery/workspace_test.go
@@ -26,6 +26,15 @@ func (s *MethodTestSuite) TestWorkspace() {
 				nil) // GetWorkspacesRow
 		})
 	})
+	s.Run("GetAuthorizedWorkspaces", func() {
+		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			_ = dbgen.Workspace(t, db, database.Workspace{})
+			_ = dbgen.Workspace(t, db, database.Workspace{})
+			// No asserts here because SQLFilter.
+			return methodCase(values(database.GetWorkspacesParams{}, emptyPreparedAuthorized{}), asserts(),
+				nil) // GetWorkspacesRow
+		})
+	})
 	s.Run("GetLatestWorkspaceBuildByWorkspaceID", func() {
 		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
 			ws := dbgen.Workspace(t, db, database.Workspace{})

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,8 @@ import (`
`27`	`27`
`28`	`28`	`var (`
`29`	`29`	`skipMethods = map[string]string{`
`30`		`- "InTx": "Not relevant",`
`31`		`- "Ping": "Not relevant",`
`32`		`- "GetAuthorizedWorkspaces": "Will not be exposed",`
`33`		`- "GetAuthorizedTemplates": "Will not be exposed",`
	`30`	`+ "InTx": "Not relevant",`
	`31`	`+ "Ping": "Not relevant",`
`34`	`32`	`}`
`35`	`33`	`)`
`36`	`34`