Commitc710840

committed

chore: always use new codepath over deprecated

1 parent6b75cbf commitc710840Copy full SHA for c710840

File tree

+14

-32

lines changed

+14

-32

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ type Request[T Auditable] struct {`
`51`	`51`	`Action database.AuditAction`
`52`	`52`	`}`
`53`	`53`
	`54`	`+// UpdateOrganizationID can be used if the organization ID is not known`
	`55`	`+// at the initiation of an audit log request.`
`54`	`56`	`func (r*Request[T])UpdateOrganizationID(id uuid.UUID) {`
`55`	`57`	`r.params.OrganizationID=id`
`56`	`58`	`}`

Lines changed: 0 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -1064,25 +1064,6 @@ func (w WorkspaceAgentWaiter) Wait() []codersdk.WorkspaceResource {`
`1064`	`1064`	`// CreateWorkspace creates a workspace for the user and template provided.`
`1065`	`1065`	`// A random name is generated for it.`
`1066`	`1066`	`// To customize the defaults, pass a mutator func.`
`1067`		`-//`
`1068`		`-// Deprecated: Use CreateWorkspace.`
`1069`		`-funcCreateWorkspaceByOrganization(t testing.TB,clientcodersdk.Client,organization uuid.UUID,templateID uuid.UUID,mutators...func(codersdk.CreateWorkspaceRequest)) codersdk.Workspace {`
`1070`		`-t.Helper()`
`1071`		`-req:= codersdk.CreateWorkspaceRequest{`
`1072`		`-TemplateID:templateID,`
`1073`		`-Name:RandomUsername(t),`
`1074`		`-AutostartSchedule:ptr.Ref("CRON_TZ=US/Central 30 9 * * 1-5"),`
`1075`		`-TTLMillis:ptr.Ref((8*time.Hour).Milliseconds()),`
`1076`		`-AutomaticUpdates:codersdk.AutomaticUpdatesNever,`
`1077`		`-}`
`1078`		`-for_,mutator:=rangemutators {`
`1079`		`-mutator(&req)`
`1080`		`-}`
`1081`		`-workspace,err:=client.CreateWorkspace(context.Background(),organization,codersdk.Me,req)`
`1082`		`-require.NoError(t,err)`
`1083`		`-returnworkspace`
`1084`		`-}`
`1085`		`-`
`1086`	`1067`	`funcCreateWorkspace(t testing.TB,clientcodersdk.Client,templateID uuid.UUID,mutators...func(codersdk.CreateWorkspaceRequest)) codersdk.Workspace {`
`1087`	`1068`	`t.Helper()`
`1088`	`1069`	`req:= codersdk.CreateWorkspaceRequest{`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -521,8 +521,18 @@ func createWorkspace(`
`521`	`521`	`})`
`522`	`522`	`return`
`523`	`523`	`}`
	`524`	`+`
	`525`	`+// Update audit log's organization`
`524`	`526`	`auditReq.UpdateOrganizationID(template.OrganizationID)`
`525`	`527`
	`528`	`+// Do this upfront to save work. If this fails, the rest of the work`
	`529`	`+// would be wasted.`
	`530`	`+if!api.Authorize(r,policy.ActionCreate,`
	`531`	`+rbac.ResourceWorkspace.InOrg(template.OrganizationID).WithOwner(user.ID.String())) {`
	`532`	`+httpapi.ResourceNotFound(rw)`
	`533`	`+return`
	`534`	`+}`
	`535`	`+`
`526`	`536`	`templateAccessControl:= (*(api.AccessControlStore.Load())).GetTemplateAccessControl(template)`
`527`	`537`	`iftemplateAccessControl.IsDeprecated() {`
`528`	`538`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -475,19 +475,8 @@ func (c *Client) TemplateByName(ctx context.Context, organizationID uuid.UUID, n`
`475`	`475`	`// CreateWorkspace creates a new workspace for the template specified.`
`476`	`476`	`//`
`477`	`477`	`// Deprecated: Use CreateUserWorkspace instead.`
`478`		`-func (c*Client)CreateWorkspace(ctx context.Context,organizationID uuid.UUID,userstring,requestCreateWorkspaceRequest) (Workspace,error) {`
`479`		`-res,err:=c.Request(ctx,http.MethodPost,fmt.Sprintf("/api/v2/organizations/%s/members/%s/workspaces",organizationID,user),request)`
`480`		`-iferr!=nil {`
`481`		`-returnWorkspace{},err`
`482`		`-}`
`483`		`-deferres.Body.Close()`
`484`		`-`
`485`		`-ifres.StatusCode!=http.StatusCreated {`
`486`		`-returnWorkspace{},ReadBodyAsError(res)`
`487`		`-}`
`488`		`-`
`489`		`-varworkspaceWorkspace`
`490`		`-returnworkspace,json.NewDecoder(res.Body).Decode(&workspace)`
	`478`	`+func (c*Client)CreateWorkspace(ctx context.Context,_ uuid.UUID,userstring,requestCreateWorkspaceRequest) (Workspace,error) {`
	`479`	`+returnc.CreateUserWorkspace(ctx,user,request)`
`491`	`480`	`}`
`492`	`481`
`493`	`482`	`// CreateUserWorkspace creates a new workspace for the template specified.`

Comments

(0)