Fix merge compile issues

Emyrk · Emyrk · commit d3affdcb2be3 · 2023-02-02T17:34:32.000-06:00
diff --git a/coderd/authzquery/group.go b/coderd/authzquery/group.go
@@ -22,6 +22,14 @@ func (q *AuthzQuerier) DeleteGroupMemberFromGroup(ctx context.Context, arg datab
 	return authorizedUpdate(q.logger, q.authorizer, fetch, q.database.DeleteGroupMemberFromGroup)(ctx, arg)
 }
 
+func (q *AuthzQuerier) InsertUserGroupsByName(ctx context.Context, arg database.InsertUserGroupsByNameParams) error {
+	panic("not implemented")
+}
+
+func (q *AuthzQuerier) DeleteGroupMembersByOrgAndUser(ctx context.Context, arg database.DeleteGroupMembersByOrgAndUserParams) error {
+	panic("not implemented")
+}
+
 func (q *AuthzQuerier) GetGroupByID(ctx context.Context, id uuid.UUID) (database.Group, error) {
 	return authorizedFetch(q.logger, q.authorizer, q.database.GetGroupByID)(ctx, id)
 }
diff --git a/coderd/authzquery/template.go b/coderd/authzquery/template.go
@@ -94,26 +94,6 @@ func (q *AuthzQuerier) GetTemplateVersionByJobID(ctx context.Context, jobID uuid
 	)(ctx, jobID)
 }
 
-func (q *AuthzQuerier) GetTemplateVersionByOrganizationAndName(ctx context.Context, arg database.GetTemplateVersionByOrganizationAndNameParams) (database.TemplateVersion, error) {
-	// An actor can read the template version if they can read the related template in the organization.
-	fetchRelated := func(tv database.TemplateVersion, p database.GetTemplateVersionByOrganizationAndNameParams) (rbac.Objecter, error) {
-		if !tv.TemplateID.Valid {
-			// If no linked template exists, check if the actor can read
-			// any template in the organization.
-			return rbac.ResourceTemplate.InOrg(p.OrganizationID), nil
-		}
-		return q.database.GetTemplateByID(ctx, tv.TemplateID.UUID)
-	}
-
-	return authorizedQueryWithRelated(
-		q.logger,
-		q.authorizer,
-		rbac.ActionRead,
-		fetchRelated,
-		q.database.GetTemplateVersionByOrganizationAndName,
-	)(ctx, arg)
-}
-
 func (q *AuthzQuerier) GetTemplateVersionByTemplateIDAndName(ctx context.Context, arg database.GetTemplateVersionByTemplateIDAndNameParams) (database.TemplateVersion, error) {
 	// An actor can read the template version if they can read the related template.
 	fetchRelated := func(tv database.TemplateVersion, p database.GetTemplateVersionByTemplateIDAndNameParams) (rbac.Objecter, error) {
diff --git a/coderd/authzquery/workspace.go b/coderd/authzquery/workspace.go
@@ -212,26 +212,6 @@ func (q *AuthzQuerier) GetWorkspaceByOwnerIDAndName(ctx context.Context, arg dat
 	return authorizedFetch(q.logger, q.authorizer, q.database.GetWorkspaceByOwnerIDAndName)(ctx, arg)
 }
 
-func (q *AuthzQuerier) GetWorkspaceOwnerCountsByTemplateIDs(ctx context.Context, ids []uuid.UUID) ([]database.GetWorkspaceOwnerCountsByTemplateIDsRow, error) {
-	// Would be nice if this was just returned in the GetTemplates() call.
-	// This is not very efficient, but it is the way to ensure read access to the templates
-	// being queried. Most of the time, the templates are already fetched and authorized.
-	// TODO: Optimize this
-	tpls, err := q.GetTemplatesWithFilter(ctx, database.GetTemplatesWithFilterParams{
-		IDs: ids,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	allowed := make([]uuid.UUID, 0, len(tpls))
-	for _, tpl := range tpls {
-		allowed = append(allowed, tpl.ID)
-	}
-
-	return q.database.GetWorkspaceOwnerCountsByTemplateIDs(ctx, allowed)
-}
-
 func (q *AuthzQuerier) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) (database.WorkspaceResource, error) {
 	// TODO: Optimize this
 	resource, err := q.database.GetWorkspaceResourceByID(ctx, id)
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -453,6 +453,7 @@ type oauthLoginParams struct {
 	Email        string
 	Username     string
 	AvatarURL    string
+	Groups       []string
 }
 
 type httpError struct {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,14 @@ func (q *AuthzQuerier) DeleteGroupMemberFromGroup(ctx context.Context, arg datab`
`22`	`22`	`return authorizedUpdate(q.logger, q.authorizer, fetch, q.database.DeleteGroupMemberFromGroup)(ctx, arg)`
`23`	`23`	`}`
`24`	`24`
	`25`	`+func (q *AuthzQuerier) InsertUserGroupsByName(ctx context.Context, arg database.InsertUserGroupsByNameParams) error {`
	`26`	`+ panic("not implemented")`
	`27`	`+}`
	`28`	`+`
	`29`	`+func (q *AuthzQuerier) DeleteGroupMembersByOrgAndUser(ctx context.Context, arg database.DeleteGroupMembersByOrgAndUserParams) error {`
	`30`	`+ panic("not implemented")`
	`31`	`+}`
	`32`	`+`
`25`	`33`	`func (q *AuthzQuerier) GetGroupByID(ctx context.Context, id uuid.UUID) (database.Group, error) {`
`26`	`34`	`return authorizedFetch(q.logger, q.authorizer, q.database.GetGroupByID)(ctx, id)`
`27`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,7 @@ type oauthLoginParams struct {`
`453`	`453`	`Email string`
`454`	`454`	`Username string`
`455`	`455`	`AvatarURL string`
	`456`	`+ Groups []string`
`456`	`457`	`}`
`457`	`458`
`458`	`459`	`type httpError struct {`