synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix workspace count to exclude deleted workspaces (#2916)

Browse Source
This commit is contained in:
Steven Masley
2022-07-12 12:52:28 -05:00
committed by GitHub
parent 61c52b3090
commit c07a45e610
4 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coderd/database/databasefake/databasefake.go
View File

@ -527,7 +527,7 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te
counts := map[uuid.UUID]map[uuid.UUID]struct{}{} counts := map[uuid.UUID]map[uuid.UUID]struct{}{}
for _, templateID := range templateIDs { for _, templateID := range templateIDs {
found := false counts[templateID] = map[uuid.UUID]struct{}{}
for _, workspace := range q.workspaces { for _, workspace := range q.workspaces {
if workspace.TemplateID != templateID { if workspace.TemplateID != templateID {
continue continue
@ -541,11 +541,6 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te
} }
countByOwnerID[workspace.OwnerID] = struct{}{} countByOwnerID[workspace.OwnerID] = struct{}{}
counts[templateID] = countByOwnerID counts[templateID] = countByOwnerID
found = true
break
}
if !found {
counts[templateID] = map[uuid.UUID]struct{}{}
} }
} }
res := make([]database.GetWorkspaceOwnerCountsByTemplateIDsRow, 0) res := make([]database.GetWorkspaceOwnerCountsByTemplateIDsRow, 0)

2
coderd/database/queries.sql.go
View File

@ -4058,6 +4058,8 @@ FROM
workspaces workspaces
WHERE WHERE
template_id = ANY($1 :: uuid [ ]) template_id = ANY($1 :: uuid [ ])
-- Ignore deleted workspaces
AND deleted != true
GROUP BY GROUP BY
template_id template_id
` `

2
coderd/database/queries/workspaces.sql
View File

@ -83,6 +83,8 @@ FROM
workspaces workspaces
WHERE WHERE
template_id = ANY(@ids :: uuid [ ]) template_id = ANY(@ids :: uuid [ ])
-- Ignore deleted workspaces
AND deleted != true
GROUP BY GROUP BY
template_id; template_id;

32
coderd/templates_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/coderd/rbac"
"github.com/coder/coder/coderd/util/ptr" "github.com/coder/coder/coderd/util/ptr"
"github.com/coder/coder/codersdk" "github.com/coder/coder/codersdk"
) )
@ -27,6 +28,37 @@ func TestTemplate(t *testing.T) {
_, err := client.Template(context.Background(), template.ID) _, err := client.Template(context.Background(), template.ID)
require.NoError(t, err) require.NoError(t, err)
}) })
t.Run("WorkspaceCount", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
user := coderdtest.CreateFirstUser(t, client)
member := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleAdmin())
memberWithDeleted := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleAdmin())
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
// Create 3 workspaces with 3 users. 2 workspaces exist, 1 is deleted
workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
memberWorkspace := coderdtest.CreateWorkspace(t, member, user.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, member, memberWorkspace.LatestBuild.ID)
deletedWorkspace := coderdtest.CreateWorkspace(t, memberWithDeleted, user.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, deletedWorkspace.LatestBuild.ID)
build, err := client.CreateWorkspaceBuild(ctx, deletedWorkspace.ID, codersdk.CreateWorkspaceBuildRequest{
Transition: codersdk.WorkspaceTransitionDelete,
})
require.NoError(t, err)
coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)
template, err = client.Template(context.Background(), template.ID)
require.NoError(t, err)
require.Equal(t, 2, int(template.WorkspaceOwnerCount), "workspace count")
})
} }
func TestPostTemplateByOrganization(t *testing.T) { func TestPostTemplateByOrganization(t *testing.T) {