Commitea91c1b

committed

use port sharer

1 parentf8e7094 commitea91c1bCopy full SHA for ea91c1b

File tree

+32

-6

lines changed

+32

-6

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,19 @@`
`1`	`1`	`package portsharing`
`2`	`2`
	`3`	`+import (`
	`4`	`+"github.com/google/uuid"`
	`5`	`+`
	`6`	`+"github.com/coder/coder/v2/codersdk"`
	`7`	`+)`
	`8`	`+`
`3`	`9`	`typePortSharerinterface {`
`4`		`-CanRestrictShareLevel()bool`
	`10`	`+ShareLevelAllowed(workspaceID uuid.UUID,level codersdk.WorkspacePortSharingLevel)bool`
`5`	`11`	`}`
`6`	`12`
`7`	`13`	`typeAGPLPortSharerstruct{}`
`8`	`14`
`9`		`-func (AGPLPortSharer)CanRestrictShareLevel()bool {`
`10`		`-returnfalse`
	`15`	`+func (AGPLPortSharer)ShareLevelAllowed(_ uuid.UUID,_ codersdk.WorkspacePortSharingLevel)bool {`
	`16`	`+returntrue`
`11`	`17`	`}`
`12`	`18`
`13`	`19`	`varDefaultPortSharerPortSharer=AGPLPortSharer{}`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,20 @@ import (`
`23`	`23`	`func (apiAPI)postWorkspacePortShareLevel(rw http.ResponseWriter,rhttp.Request) {`
`24`	`24`	`ctx:=r.Context()`
`25`	`25`	`workspace:=httpmw.WorkspaceParam(r)`
	`26`	`+portSharer:=*api.PortSharer.Load()`
`26`	`27`	`varreq codersdk.UpdateWorkspaceAgentPortSharingLevelRequest`
`27`	`28`	`if!httpapi.Read(ctx,rw,r,&req) {`
`28`	`29`	`return`
`29`	`30`	`}`
`30`	`31`
	`32`	`+shareLevelAllowed:=portSharer.ShareLevelAllowed(workspace.ID,codersdk.WorkspacePortSharingLevel(req.ShareLevel))`
	`33`	`+if!shareLevelAllowed {`
	`34`	`+httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
	`35`	`+Message:"Port sharing level not allowed.",`
	`36`	`+})`
	`37`	`+return`
	`38`	`+}`
	`39`	`+`
`31`	`40`	`agents,err:=api.Database.GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx,workspace.ID)`
`32`	`41`	`iferr!=nil {`
`33`	`42`	`httpapi.InternalServerError(rw,err)`
`@@ -59,7 +68,12 @@ func (api API) postWorkspacePortShareLevel(rw http.ResponseWriter, r http.Requ`
`59`	`68`	`return`
`60`	`69`	`}`
`61`	`70`
`62`		`-if (req.ShareLevel==codersdk.Shar)`
	`71`	`+ifreq.ShareLevel==int(codersdk.WorkspaceAgentPortSharingLevelOwner) {`
	`72`	`+// If the port is not shared, and the user is trying to set it to owner,`
	`73`	`+// we don't need to do anything.`
	`74`	`+rw.WriteHeader(http.StatusOK)`
	`75`	`+return`
	`76`	`+}`
`63`	`77`
`64`	`78`	`err=api.Database.CreateWorkspacePortShareLevel(ctx, database.CreateWorkspacePortShareLevelParams{`
`65`	`79`	`WorkspaceID:workspace.ID,`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,17 @@`
`1`	`1`	`package portsharing`
`2`	`2`
	`3`	`+import (`
	`4`	`+"github.com/google/uuid"`
	`5`	`+`
	`6`	`+"github.com/coder/coder/v2/codersdk"`
	`7`	`+)`
	`8`	`+`
`3`	`9`	`typeEnterprisePortSharerstruct{}`
`4`	`10`
`5`	`11`	`funcNewEnterprisePortSharer()*EnterprisePortSharer {`
`6`	`12`	`return&EnterprisePortSharer{}`
`7`	`13`	`}`
`8`	`14`
`9`		`-func (EnterprisePortSharer)CanRestrictShareLevel()bool {`
`10`		`-returntrue`
	`15`	`+func (EnterprisePortSharer)ShareLevelAllowed(_ uuid.UUID,_ codersdk.WorkspacePortSharingLevel)bool {`
	`16`	`+returnfalse`
`11`	`17`	`}`

Comments

(0)