Skip to content

refactor(coderd): fetch owner information when authorizing workspace agent #9123

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 19 commits into from
Aug 21, 2023
Merged

refactor(coderd): fetch owner information when authorizing workspace agent #9123

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
11c20d6
use dbtestutil in httpmw test, refactor
johnstcn Aug 15, 2023
da03c4b
add new query
johnstcn Aug 15, 2023
317537c
remove old query
johnstcn Aug 15, 2023
8e2430d
alter query
johnstcn Aug 16, 2023
4aa23c6
mockgen
johnstcn Aug 16, 2023
41561b9
rm unused tx in dbfake
johnstcn Aug 16, 2023
0cb0d18
add TODO
johnstcn Aug 17, 2023
e6ce0f5
fix dbfake
johnstcn Aug 18, 2023
b1d4084
return latest workspace build
johnstcn Aug 18, 2023
b64a870
fixup! return latest workspace build
johnstcn Aug 18, 2023
73de552
fix TestWorkspaceAgentListen/FailNonLatestBuild
johnstcn Aug 18, 2023
1218fa4
the bug was inside you all along
johnstcn Aug 18, 2023
8e222e3
linter
johnstcn Aug 18, 2023
e8844ae
Merge remote-tracking branch 'origin/main' into cj/GetWorkspaceAgentA…
johnstcn Aug 21, 2023
06bbda2
address comments in dbfake impl
johnstcn Aug 21, 2023
3e21545
match indentation
johnstcn Aug 21, 2023
3a603fc
reword error
johnstcn Aug 21, 2023
267aa6c
rm unnecessary pubsub close
johnstcn Aug 21, 2023
6e0d3b3
rename misleading argument
johnstcn Aug 21, 2023
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
Next Next commit
use dbtestutil in httpmw test, refactor
  • Loading branch information
@johnstcn
johnstcn committed Aug 18, 2023
commit 11c20d694e1dda3eff777100352d919c62f4fa09
116 changes: 69 additions & 47 deletions coderd/httpmw/workspaceagent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,31 @@ import (
"github.com/stretchr/testify/require"

"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/database/dbtestutil"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
)

func TestWorkspaceAgent(t *testing.T) {
t.Parallel()

setup := func(db database.Store, token uuid.UUID) *http.Request {
r := httptest.NewRequest("GET", "/", nil)
r.Header.Set(codersdk.SessionTokenHeader, token.String())
return r
}

t.Run("None", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceAgent(httpmw.ExtractWorkspaceAgentConfig{
db, pubsub := dbtestutil.NewDB(t)
t.Cleanup(func() {
_ = pubsub.Close()
})

req, rtr := setup(t, db, uuid.New(), httpmw.ExtractWorkspaceAgent(
httpmw.ExtractWorkspaceAgentConfig{
DB: db,
Optional: false,
}),
)
rtr.Get("/", nil)
r := setup(db, uuid.New())
}))

rw := httptest.NewRecorder()
rtr.ServeHTTP(rw, r)
req.Header.Set(codersdk.SessionTokenHeader, uuid.New().String())
rtr.ServeHTTP(rw, req)

res := rw.Result()
defer res.Body.Close()
Expand All @@ -47,42 +43,68 @@ func TestWorkspaceAgent(t *testing.T) {

t.Run("Found", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
var (
user = dbgen.User(t, db, database.User{})
workspace = dbgen.Workspace(t, db, database.Workspace{
OwnerID: user.ID,
})
job = dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
resource = dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: job.ID,
})
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
WorkspaceID: workspace.ID,
JobID: job.ID,
})
agent = dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
ResourceID: resource.ID,
})
)

rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceAgent(httpmw.ExtractWorkspaceAgentConfig{
db, pubsub := dbtestutil.NewDB(t)
t.Cleanup(func() {
_ = pubsub.Close()
})
authToken := uuid.New()
req, rtr := setup(t, db, authToken, httpmw.ExtractWorkspaceAgent(
httpmw.ExtractWorkspaceAgentConfig{
DB: db,
Optional: false,
}),
)
rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) {
_ = httpmw.WorkspaceAgent(r)
rw.WriteHeader(http.StatusOK)
})
r := setup(db, agent.AuthToken)
}))

rw := httptest.NewRecorder()
rtr.ServeHTTP(rw, r)
req.Header.Set(codersdk.SessionTokenHeader, authToken.String())
rtr.ServeHTTP(rw, req)

res := rw.Result()
defer res.Body.Close()
t.Cleanup(func() { _ = res.Body.Close() })
require.Equal(t, http.StatusOK, res.StatusCode)
})
}

func setup(t testing.TB, db database.Store, authToken uuid.UUID, mw func(http.Handler) http.Handler) (*http.Request, http.Handler) {
t.Helper()
org := dbgen.Organization(t, db, database.Organization{})
user := dbgen.User(t, db, database.User{})
templateVersion := dbgen.TemplateVersion(t, db, database.TemplateVersion{
OrganizationID: org.ID,
CreatedBy: user.ID,
})
template := dbgen.Template(t, db, database.Template{
OrganizationID: org.ID,
ActiveVersionID: templateVersion.ID,
CreatedBy: user.ID,
})
workspace := dbgen.Workspace(t, db, database.Workspace{
OwnerID: user.ID,
OrganizationID: org.ID,
TemplateID: template.ID,
})
job := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
OrganizationID: org.ID,
})
resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: job.ID,
})
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
WorkspaceID: workspace.ID,
JobID: job.ID,
TemplateVersionID: templateVersion.ID,
})
_ = dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
ResourceID: resource.ID,
AuthToken: authToken,
})

req := httptest.NewRequest("GET", "/", nil)
rtr := chi.NewRouter()
rtr.Use(mw)
rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) {
_ = httpmw.WorkspaceAgent(r)
rw.WriteHeader(http.StatusOK)
})

return req, rtr
}