Aug 3, 2023 · Jul 21, 2023 · Jul 21, 2023 · Jul 21, 2023 · Jul 21, 2023 · Aug 1, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.GetTemplateInsights(ctx, arg)
 }

 func (q *querier) GetTemplateParameterInsights(ctx context.Context, arg database.GetTemplateParameterInsightsParams) ([]database.GetTemplateParameterInsightsRow, error) {
 for _, templateID := range arg.TemplateIDs {
 template, err := q.db.GetTemplateByID(ctx, templateID)
 if err != nil {
 return nil, err
 }

 if err := q.authorizeContext(ctx, rbac.ActionUpdate, template); err != nil {
 return nil, err
 }
 }
 if len(arg.TemplateIDs) == 0 {
 if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
 return nil, err
 }
 }
 return q.db.GetTemplateParameterInsights(ctx, arg)
 }

 func (q *querier) GetTemplateVersionByID(ctx context.Context, tvid uuid.UUID) (database.TemplateVersion, error) {
 tv, err := q.db.GetTemplateVersionByID(ctx, tvid)
 if err != nil {
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
 // these methods  remain unimplemented in the FakeQuerier.
 var ErrUnimplemented = xerrors.New("unimplemented")

 func uniqueSortedUUIDs(uuids []uuid.UUID) []uuid.UUID {
 set := make(map[uuid.UUID]struct{})
 for _, id := range uuids {
 set[id] = struct{}{}
 }
 unique := make([]uuid.UUID, 0, len(set))
 for id := range set {
 unique = append(unique, id)
 }
 slices.SortFunc(unique, func(a, b uuid.UUID) bool {
 return a.String() < b.String()
 })
 return unique
 }

 func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
 return xerrors.New("AcquireLock must only be called within a transaction")
 }
 return result, nil
 }

 func (q *FakeQuerier) GetTemplateParameterInsights(ctx context.Context, arg database.GetTemplateParameterInsightsParams) ([]database.GetTemplateParameterInsightsRow, error) {
 err := validateDatabaseType(arg)
 if err != nil {
 return nil, err
 }

 q.mutex.RLock()
 defer q.mutex.RUnlock()

 // WITH latest_workspace_builds ...
 latestWorkspaceBuilds := make(map[uuid.UUID]database.WorkspaceBuildTable)
 for _, wb := range q.workspaceBuilds {
 if wb.CreatedAt.Before(arg.StartTime) || wb.CreatedAt.Equal(arg.EndTime) || wb.CreatedAt.After(arg.EndTime) {
 continue
 }
 if latestWorkspaceBuilds[wb.WorkspaceID].BuildNumber < wb.BuildNumber {
 latestWorkspaceBuilds[wb.WorkspaceID] = wb
 }
 }
 if len(arg.TemplateIDs) > 0 {
 for wsID := range latestWorkspaceBuilds {
 ws, err := q.getWorkspaceByIDNoLock(ctx, wsID)
 if err != nil {
 return nil, err
 }
 if slices.Contains(arg.TemplateIDs, ws.TemplateID) {
 delete(latestWorkspaceBuilds, wsID)
 }
 }
 }
 // WITH unique_template_params ...
 num := int64(0)
 uniqueTemplateParams := make(map[string]*database.GetTemplateParameterInsightsRow)
 uniqueTemplateParamWorkspaceBuildIDs := make(map[string][]uuid.UUID)
 for _, wb := range latestWorkspaceBuilds {
 tv, err := q.getTemplateVersionByIDNoLock(ctx, wb.TemplateVersionID)
 if err != nil {
 return nil, err
 }
 for _, tvp := range q.templateVersionParameters {
 if tvp.TemplateVersionID != tv.ID {
 continue
 }
 key := fmt.Sprintf("%s:%s:%s:%s", tvp.Name, tvp.DisplayName, tvp.Description, tvp.Options)
 if _, ok := uniqueTemplateParams[key]; !ok {
 num++
 uniqueTemplateParams[key] = &database.GetTemplateParameterInsightsRow{
 Num:         num,
 Name:        tvp.Name,
 DisplayName: tvp.DisplayName,
 Description: tvp.Description,
 Options:     tvp.Options,
 }
 }
 uniqueTemplateParams[key].TemplateIDs = append(uniqueTemplateParams[key].TemplateIDs, tv.TemplateID.UUID)
 uniqueTemplateParamWorkspaceBuildIDs[key] = append(uniqueTemplateParamWorkspaceBuildIDs[key], wb.ID)
 }
 }
 // SELECT ...
 counts := make(map[string]map[string]int64)
 for key, utp := range uniqueTemplateParams {
 for _, wbp := range q.workspaceBuildParameters {
 if !slices.Contains(uniqueTemplateParamWorkspaceBuildIDs[key], wbp.WorkspaceBuildID) {
 continue
 }
 if wbp.Name != utp.Name {
 continue
 }
 if counts[key] == nil {
 counts[key] = make(map[string]int64)
 }
 counts[key][wbp.Value]++
 }
 }

 var rows []database.GetTemplateParameterInsightsRow
 for key, utp := range uniqueTemplateParams {
 for value, count := range counts[key] {
 rows = append(rows, database.GetTemplateParameterInsightsRow{
 Num:         utp.Num,
 TemplateIDs: uniqueSortedUUIDs(utp.TemplateIDs),
 Name:        utp.Name,
 DisplayName: utp.DisplayName,
 Description: utp.Description,
 Options:     utp.Options,
 Value:       value,
 Count:       count,
 })
 }
 }

 return rows, nil
 }

 func (q *FakeQuerier) GetTemplateVersionByID(ctx context.Context, templateVersionID uuid.UUID) (database.TemplateVersion, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1227,6 +1227,25 @@ func (q *querier) GetTemplateInsights(ctx context.Context, arg database.GetTempl
		return q.db.GetTemplateInsights(ctx, arg)
		}

		func (q *querier) GetTemplateParameterInsights(ctx context.Context, arg database.GetTemplateParameterInsightsParams) ([]database.GetTemplateParameterInsightsRow, error) {
		for _, templateID := range arg.TemplateIDs {
		template, err := q.db.GetTemplateByID(ctx, templateID)
Copy link Member johnstcnAug 3, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. note: this will generally only be called with a single TemplateID as a parameter, so we hopefully shouldn't see a pathological case of querying hundreds of templates. mtojek reacted with thumbs up emoji
		if err != nil {
		return nil, err
		}

		if err := q.authorizeContext(ctx, rbac.ActionUpdate, template); err != nil {
		return nil, err
		}
		}
		if len(arg.TemplateIDs) == 0 {
		if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
		return nil, err
		}
		}
Comment on lines +1231 to +1245 Copy link Member johnstcnAug 3, 2023• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. `GetTemplatesWithFilter` might be more performant here instead of calling`GetTemplateByID` in a tight loop? Edit: or you could leverage`GetAuthorizedTemplates` to check if the caller has the required permissions on the requested templates. mtojek reacted with eyes emoji Copy link Member johnstcnAug 3, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Turns out this wasn't a useful suggestion :(`GetTemplatesWithFilter` will return an empty slice if you do not have the permissions on any of the supplied TemplateIDs. mtojek reacted with thumbs up emoji
		return q.db.GetTemplateParameterInsights(ctx, arg)
		}

		func (q *querier) GetTemplateVersionByID(ctx context.Context, tvid uuid.UUID) (database.TemplateVersion, error) {
		tv, err := q.db.GetTemplateVersionByID(ctx, tvid)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -596,6 +596,21 @@ func isNotNull(v interface{}) bool {
		// these methods remain unimplemented in the FakeQuerier.
		var ErrUnimplemented = xerrors.New("unimplemented")

		func uniqueSortedUUIDs(uuids []uuid.UUID) []uuid.UUID {
		set := make(map[uuid.UUID]struct{})
		for _, id := range uuids {
		set[id] = struct{}{}
		}
		unique := make([]uuid.UUID, 0, len(set))
		for id := range set {
		unique = append(unique, id)
		}
		slices.SortFunc(unique, func(a, b uuid.UUID) bool {
		return a.String() < b.String()
		})
		return unique
		}

		func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
		return xerrors.New("AcquireLock must only be called within a transaction")
		}
Expand DownExpand Up		@@ -2122,6 +2137,100 @@ func (q *FakeQuerier) GetTemplateInsights(_ context.Context, arg database.GetTem
		return result, nil
		}

		func (q *FakeQuerier) GetTemplateParameterInsights(ctx context.Context, arg database.GetTemplateParameterInsightsParams) ([]database.GetTemplateParameterInsightsRow, error) {
		err := validateDatabaseType(arg)
		if err != nil {
		return nil, err
		}

		q.mutex.RLock()
		defer q.mutex.RUnlock()

		// WITH latest_workspace_builds ...
		latestWorkspaceBuilds := make(map[uuid.UUID]database.WorkspaceBuildTable)
		for _, wb := range q.workspaceBuilds {
		if wb.CreatedAt.Before(arg.StartTime) \|\| wb.CreatedAt.Equal(arg.EndTime) \|\| wb.CreatedAt.After(arg.EndTime) {
		continue
		}
		if latestWorkspaceBuilds[wb.WorkspaceID].BuildNumber < wb.BuildNumber {
		latestWorkspaceBuilds[wb.WorkspaceID] = wb
		}
		}
		if len(arg.TemplateIDs) > 0 {
		for wsID := range latestWorkspaceBuilds {
		ws, err := q.getWorkspaceByIDNoLock(ctx, wsID)
		if err != nil {
		return nil, err
		}
		if slices.Contains(arg.TemplateIDs, ws.TemplateID) {
		delete(latestWorkspaceBuilds, wsID)
		}
		}
		}
		// WITH unique_template_params ...
		num := int64(0)
		uniqueTemplateParams := make(map[string]*database.GetTemplateParameterInsightsRow)
		uniqueTemplateParamWorkspaceBuildIDs := make(map[string][]uuid.UUID)
		for _, wb := range latestWorkspaceBuilds {
		tv, err := q.getTemplateVersionByIDNoLock(ctx, wb.TemplateVersionID)
		if err != nil {
		return nil, err
		}
		for _, tvp := range q.templateVersionParameters {
		if tvp.TemplateVersionID != tv.ID {
		continue
		}
		key := fmt.Sprintf("%s:%s:%s:%s", tvp.Name, tvp.DisplayName, tvp.Description, tvp.Options)
		if _, ok := uniqueTemplateParams[key]; !ok {
		num++
		uniqueTemplateParams[key] = &database.GetTemplateParameterInsightsRow{
		Num: num,
		Name: tvp.Name,
		DisplayName: tvp.DisplayName,
		Description: tvp.Description,
		Options: tvp.Options,
		}
		}
		uniqueTemplateParams[key].TemplateIDs = append(uniqueTemplateParams[key].TemplateIDs, tv.TemplateID.UUID)
		uniqueTemplateParamWorkspaceBuildIDs[key] = append(uniqueTemplateParamWorkspaceBuildIDs[key], wb.ID)
		}
		}
		// SELECT ...
		counts := make(map[string]map[string]int64)
		for key, utp := range uniqueTemplateParams {
		for _, wbp := range q.workspaceBuildParameters {
		if !slices.Contains(uniqueTemplateParamWorkspaceBuildIDs[key], wbp.WorkspaceBuildID) {
		continue
		}
		if wbp.Name != utp.Name {
		continue
		}
		if counts[key] == nil {
		counts[key] = make(map[string]int64)
		}
		counts[key][wbp.Value]++
		}
		}

		var rows []database.GetTemplateParameterInsightsRow
		for key, utp := range uniqueTemplateParams {
		for value, count := range counts[key] {
		rows = append(rows, database.GetTemplateParameterInsightsRow{
		Num: utp.Num,
		TemplateIDs: uniqueSortedUUIDs(utp.TemplateIDs),
		Name: utp.Name,
		DisplayName: utp.DisplayName,
		Description: utp.Description,
		Options: utp.Options,
		Value: value,
		Count: count,
		})
		}
		}
mtojek marked this conversation as resolved. Show resolvedHide resolved

		return rows, nil
		}

		func (q *FakeQuerier) GetTemplateVersionByID(ctx context.Context, templateVersionID uuid.UUID) (database.TemplateVersion, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()
Expand Down