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

Commit017cac1

Browse files
committed
hideshared_with in workspace response behind experiment
1 parentea27a72 commit017cac1

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

‎coderd/aitasks.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func (api *API) convertTasks(ctx context.Context, requesterID uuid.UUID, dbTasks
477477
returnnil,xerrors.Errorf("fetch workspace data: %w",err)
478478
}
479479

480-
apiWorkspaces,err:=convertWorkspaces(requesterID,workspaces,data)
480+
apiWorkspaces,err:=convertWorkspaces(api.Experiments,requesterID,workspaces,data)
481481
iferr!=nil {
482482
returnnil,xerrors.Errorf("convert workspaces: %w",err)
483483
}
@@ -551,6 +551,7 @@ func (api *API) taskGet(rw http.ResponseWriter, r *http.Request) {
551551
}
552552

553553
ws,err:=convertWorkspace(
554+
api.Experiments,
554555
apiKey.UserID,
555556
workspace,
556557
data.builds[0],

‎coderd/workspaces.go‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ func (api *API) workspace(rw http.ResponseWriter, r *http.Request) {
114114
}
115115

116116
w,err:=convertWorkspace(
117+
api.Experiments,
117118
apiKey.UserID,
118119
workspace,
119120
data.builds[0],
@@ -229,7 +230,7 @@ func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
229230
return
230231
}
231232

232-
wss,err:=convertWorkspaces(apiKey.UserID,workspaces,data)
233+
wss,err:=convertWorkspaces(api.Experiments,apiKey.UserID,workspaces,data)
233234
iferr!=nil {
234235
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
235236
Message:"Internal error converting workspaces.",
@@ -319,6 +320,7 @@ func (api *API) workspaceByOwnerAndName(rw http.ResponseWriter, r *http.Request)
319320
}
320321

321322
w,err:=convertWorkspace(
323+
api.Experiments,
322324
apiKey.UserID,
323325
workspace,
324326
data.builds[0],
@@ -847,6 +849,7 @@ func createWorkspace(
847849
}
848850

849851
w,err:=convertWorkspace(
852+
api.Experiments,
850853
initiatorID,
851854
workspace,
852855
apiBuild,
@@ -1490,6 +1493,7 @@ func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
14901493
}
14911494

14921495
w,err:=convertWorkspace(
1496+
api.Experiments,
14931497
apiKey.UserID,
14941498
workspace,
14951499
data.builds[0],
@@ -2067,6 +2071,7 @@ func (api *API) watchWorkspace(
20672071
appStatus=data.appStatuses[0]
20682072
}
20692073
w,err:=convertWorkspace(
2074+
api.Experiments,
20702075
apiKey.UserID,
20712076
workspace,
20722077
data.builds[0],
@@ -2516,7 +2521,12 @@ func (api *API) workspaceData(ctx context.Context, workspaces []database.Workspa
25162521
},nil
25172522
}
25182523

2519-
funcconvertWorkspaces(requesterID uuid.UUID,workspaces []database.Workspace,dataworkspaceData) ([]codersdk.Workspace,error) {
2524+
funcconvertWorkspaces(
2525+
experiments codersdk.Experiments,
2526+
requesterID uuid.UUID,
2527+
workspaces []database.Workspace,
2528+
dataworkspaceData,
2529+
) ([]codersdk.Workspace,error) {
25202530
buildByWorkspaceID:=map[uuid.UUID]codersdk.WorkspaceBuild{}
25212531
for_,workspaceBuild:=rangedata.builds {
25222532
buildByWorkspaceID[workspaceBuild.WorkspaceID]=workspaceBuild
@@ -2548,6 +2558,7 @@ func convertWorkspaces(requesterID uuid.UUID, workspaces []database.Workspace, d
25482558
appStatus:=appStatusesByWorkspaceID[workspace.ID]
25492559

25502560
w,err:=convertWorkspace(
2561+
experiments,
25512562
requesterID,
25522563
workspace,
25532564
build,
@@ -2565,6 +2576,7 @@ func convertWorkspaces(requesterID uuid.UUID, workspaces []database.Workspace, d
25652576
}
25662577

25672578
funcconvertWorkspace(
2579+
experiments codersdk.Experiments,
25682580
requesterID uuid.UUID,
25692581
workspace database.Workspace,
25702582
workspaceBuild codersdk.WorkspaceBuild,
@@ -2603,7 +2615,13 @@ func convertWorkspace(
26032615
}
26042616
}
26052617
}
2606-
sharedWith:= []codersdk.SharedWorkspaceActor{}
2618+
// TODO(geokat): using a pointer that's serialized with
2619+
// "omitempty" so that we can hide it behind an experiment. This
2620+
// won't be necessary once workspace sharing is in beta.
2621+
varsharedWith*[]codersdk.SharedWorkspaceActor
2622+
ifexperiments.Enabled(codersdk.ExperimentWorkspaceSharing) {
2623+
sharedWith=&[]codersdk.SharedWorkspaceActor{}
2624+
}
26072625

26082626
ttlMillis:=convertWorkspaceTTLMillis(workspace.Ttl)
26092627
// If the template doesn't allow a workspace-configured value, then report the

‎codersdk/workspaces.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ type Workspace struct {
7373
// and IsPrebuild returns false.
7474
IsPrebuildbool`json:"is_prebuild"`
7575
// TaskID, if set, indicates that the workspace is relevant to the given codersdk.Task.
76-
TaskID uuid.NullUUID`json:"task_id,omitempty"`
77-
SharedWith []SharedWorkspaceActor`json:"shared_with"`
76+
TaskID uuid.NullUUID`json:"task_id,omitempty"`
77+
SharedWith*[]SharedWorkspaceActor`json:"shared_with,omitempty"`
7878
}
7979

8080
func (wWorkspace)FullName()string {

‎site/src/api/typesGenerated.ts‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp