Skip to content

feat: add orphan support #3849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 6, 2022
Merged

feat: add orphan support #3849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
86f5808
feat: add resource orphanage
ammario Sep 2, 2022
60059ba
feat: deny custom state in build for regular users
ammario Sep 2, 2022
eba7329
Add orphanage to CLI
ammario Sep 2, 2022
68eb021
Fix protoc
ammario Sep 2, 2022
38daa9d
Reduce metrics refresh intervals in tests
ammario Sep 2, 2022
b6c351d
Protoc
ammario Sep 2, 2022
a185907
Fix tests!
ammario Sep 2, 2022
7506ac4
Tests pass!
ammario Sep 2, 2022
9968e2f
Move Orphan checks into the backend
ammario Sep 2, 2022
0ba1819
Run gen
ammario Sep 2, 2022
0695441
Simplify orphan logic
ammario Sep 3, 2022
98e4365
Begin experimenting with frontend
ammario Sep 3, 2022
a81a8c7
Complete frontend
ammario Sep 4, 2022
4219659
Merge remote-tracking branch 'origin/main' into orphan
ammario Sep 4, 2022
2bfe354
Minor fixups
ammario Sep 4, 2022
8d46045
Update cli/delete.go
ammario Sep 6, 2022
e9b1edd
Update cli/delete.go
ammario Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: deny custom state in build for regular users
  • Loading branch information
@ammario
ammario committed Sep 3, 2022
commit 60059ba8fe8041be16d0ea29dd94ef81748e63c4
11 changes: 11 additions & 0 deletions coderd/workspacebuilds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,17 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
return
}

// If custom state, deny request since user could be orphaning their
// cloud resources.
if createBuild.ProvisionerState != nil {
if !api.Authorize(r, rbac.ActionUpdate, template.RBACObject()) {
httpapi.Write(rw, http.StatusForbidden, codersdk.Response{
Message: "Only template managers may provide custom state",
})
return
}
}

// Store prior build number to compute new build number
var priorBuildNum int32
priorHistory, err := api.Database.GetLatestWorkspaceBuildByWorkspaceID(r.Context(), workspace.ID)
Expand Down
55 changes: 55 additions & 0 deletions coderd/workspacebuilds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package coderd_test

import (
"context"
"errors"
"fmt"
"net/http"
"strconv"
Expand Down Expand Up @@ -164,6 +165,60 @@ func TestWorkspaceBuilds(t *testing.T) {
require.NoError(t, err)
})

t.Run("OrphanNotOwner", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
first := coderdtest.CreateFirstUser(t, client)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil)
template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID)
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

regularUser := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)

workspace := coderdtest.CreateWorkspace(t, regularUser, first.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, regularUser, workspace.LatestBuild.ID)

_, err := regularUser.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{
TemplateVersionID: workspace.LatestBuild.TemplateVersionID,
Transition: workspace.LatestBuild.Transition,
ProvisionerState: []byte(" "),
})
require.Error(t, err)

var cerr *codersdk.Error
require.True(t, errors.As(err, &cerr))

code := cerr.StatusCode()
require.Equal(t, http.StatusForbidden, code, "unexpected status %s", http.StatusText(code))
})

t.Run("Orphan", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
first := coderdtest.CreateFirstUser(t, client)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil)
template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID)
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)

_, err := client.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{
TemplateVersionID: workspace.LatestBuild.TemplateVersionID,
Transition: workspace.LatestBuild.Transition,
ProvisionerState: []byte(" "),
})
require.Nil(t, err)
})

t.Run("PaginateNonExistentRow", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
Expand Down