Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat: Implement experiment gated CRUD for workspace proxies#6928

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.

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

Already on GitHub?Sign in to your account

Merged
Emyrk merged 26 commits intomainfromstevenmasley/moon_crud
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
26 commits
Select commitHold shift + click to select a range
243f837
feat: Implement basic moon crud
EmyrkMar 30, 2023
5bd1392
chore: Implement enterprise endpoints for moons
EmyrkMar 31, 2023
4b5e219
Make gen
EmyrkMar 31, 2023
a593520
Add unit test for moons
EmyrkMar 31, 2023
8613b13
Linting
EmyrkMar 31, 2023
f1da2f1
Add url validation
EmyrkMar 31, 2023
dff4fc8
Add unit tests
EmyrkMar 31, 2023
aa41907
Make gen
EmyrkMar 31, 2023
fa5ad31
Linting
EmyrkMar 31, 2023
d4260b5
Fix unit test
EmyrkMar 31, 2023
f689381
Fix unit test
EmyrkMar 31, 2023
bace1cf
Make gen
EmyrkApr 3, 2023
6ba9079
Merge remote-tracking branch 'origin/main' into stevenmasley/moon_crud
EmyrkApr 3, 2023
a8a5be1
Bump migrations
EmyrkApr 3, 2023
cce8a7d
wildcard hostname vs url
EmyrkApr 4, 2023
d84b46c
Use tabs
EmyrkApr 4, 2023
a1a31e4
Remove org scoped proxies
EmyrkApr 4, 2023
440645c
Fix unit tests
EmyrkApr 4, 2023
c7b6b7c
make fmt
EmyrkApr 4, 2023
9824f2e
Fix route gen
EmyrkApr 4, 2023
c7c52f3
Fix unit test
EmyrkApr 4, 2023
0f3af22
Merge remote-tracking branch 'origin/main' into stevenmasley/moon_crud
EmyrkApr 4, 2023
ac3f912
Merge remote-tracking branch 'origin/main' into stevenmasley/moon_crud
EmyrkApr 4, 2023
3145d5f
Make gen
EmyrkApr 4, 2023
8a5119e
Bump migrations
EmyrkApr 4, 2023
7daf459
Only return non deleted
EmyrkApr 4, 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
129 changes: 127 additions & 2 deletionscoderd/apidoc/docs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

117 changes: 115 additions & 2 deletionscoderd/apidoc/swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

3 changes: 2 additions & 1 deletioncoderd/audit/diff.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@ type Auditable interface {
database.GitSSHKey |
database.WorkspaceBuild |
database.AuditableGroup |
database.License
database.License |
database.WorkspaceProxy
}

// Map is a map of changed fields in an audited resource. It maps field names to
Expand Down
28 changes: 28 additions & 0 deletionscoderd/database/dbauthz/querier.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1685,6 +1685,34 @@ func (q *querier) GetWorkspaceByWorkspaceAppID(ctx context.Context, workspaceApp
returnfetch(q.log,q.auth,q.db.GetWorkspaceByWorkspaceAppID)(ctx,workspaceAppID)
}

func (q*querier)GetWorkspaceProxies(ctx context.Context) ([]database.WorkspaceProxy,error) {
returnfetchWithPostFilter(q.auth,func(ctx context.Context,_interface{}) ([]database.WorkspaceProxy,error) {
returnq.db.GetWorkspaceProxies(ctx)
})(ctx,nil)
}

func (q*querier)GetWorkspaceProxyByID(ctx context.Context,id uuid.UUID) (database.WorkspaceProxy,error) {
returnfetch(q.log,q.auth,q.db.GetWorkspaceProxyByID)(ctx,id)
}

func (q*querier)InsertWorkspaceProxy(ctx context.Context,arg database.InsertWorkspaceProxyParams) (database.WorkspaceProxy,error) {
returninsert(q.log,q.auth,rbac.ResourceWorkspaceProxy,q.db.InsertWorkspaceProxy)(ctx,arg)
}

func (q*querier)UpdateWorkspaceProxy(ctx context.Context,arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy,error) {
fetch:=func(ctx context.Context,arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy,error) {
returnq.db.GetWorkspaceProxyByID(ctx,arg.ID)
}
returnupdateWithReturn(q.log,q.auth,fetch,q.db.UpdateWorkspaceProxy)(ctx,arg)
}

func (q*querier)UpdateWorkspaceProxyDeleted(ctx context.Context,arg database.UpdateWorkspaceProxyDeletedParams)error {
fetch:=func(ctx context.Context,arg database.UpdateWorkspaceProxyDeletedParams) (database.WorkspaceProxy,error) {
returnq.db.GetWorkspaceProxyByID(ctx,arg.ID)
}
returndeleteQ(q.log,q.auth,fetch,q.db.UpdateWorkspaceProxyDeleted)(ctx,arg)
}

funcauthorizedTemplateVersionFromJob(ctx context.Context,q*querier,job database.ProvisionerJob) (database.TemplateVersion,error) {
switchjob.Type {
casedatabase.ProvisionerJobTypeTemplateVersionDryRun:
Expand Down
30 changes: 30 additions & 0 deletionscoderd/database/dbauthz/querier_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -438,6 +438,36 @@ func (s *MethodTestSuite) TestOrganization() {
}))
}

func (s *MethodTestSuite) TestWorkspaceProxy() {
s.Run("InsertWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
check.Args(database.InsertWorkspaceProxyParams{
ID: uuid.New(),
}).Asserts(rbac.ResourceWorkspaceProxy, rbac.ActionCreate)
}))
s.Run("UpdateWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
check.Args(database.UpdateWorkspaceProxyParams{
ID: p.ID,
}).Asserts(p, rbac.ActionUpdate)
}))
s.Run("GetWorkspaceProxyByID", s.Subtest(func(db database.Store, check *expects) {
p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
check.Args(p.ID).Asserts(p, rbac.ActionRead).Returns(p)
}))
s.Run("UpdateWorkspaceProxyDeleted", s.Subtest(func(db database.Store, check *expects) {
p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
check.Args(database.UpdateWorkspaceProxyDeletedParams{
ID: p.ID,
Deleted: true,
}).Asserts(p, rbac.ActionDelete)
}))
s.Run("GetWorkspaceProxies", s.Subtest(func(db database.Store, check *expects) {
p1 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
p2 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
check.Args().Asserts(p1, rbac.ActionRead, p2, rbac.ActionRead).Returns(slice.New(p1, p2))
}))
}

func (s *MethodTestSuite) TestParameters() {
s.Run("Workspace/InsertParameterValue", s.Subtest(func(db database.Store, check *expects) {
w := dbgen.Workspace(s.T(), db, database.Workspace{})
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp