Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 556c817

Browse files
sreyasreya
committed
revert some stuff
1 parent 0379a57 commit 556c817

File tree

11 files changed

+36
-86
lines changed

11 files changed

+36
-86
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77

88
"github.com/google/uuid"
99
"golang.org/x/exp/slices"
10-
"golang.org/x/xerrors"
1110

1211
"github.com/coder/coder/v2/coderd/database"
1312
"github.com/coder/coder/v2/coderd/parameter"
@@ -26,24 +25,11 @@ func WorkspaceBuildParameters(params []database.WorkspaceBuildParameter) []coder
2625

2726
func WorkspaceBuildParameter(p database.WorkspaceBuildParameter) codersdk.WorkspaceBuildParameter {
2827
return codersdk.WorkspaceBuildParameter{
29-
BuildID: p.WorkspaceBuildID,
30-
Name: p.Name,
31-
Value: p.Value,
28+
Name: p.Name,
29+
Value: p.Value,
3230
}
3331
}
3432

35-
func TemplateVersionParameters(params []database.TemplateVersionParameter) ([]codersdk.TemplateVersionParameter, error) {
36-
out := make([]codersdk.TemplateVersionParameter, len(params))
37-
var err error
38-
for i, p := range params {
39-
out[i], err = TemplateVersionParameter(p)
40-
if err != nil {
41-
return nil, xerrors.Errorf("convert parameter %q: %w", p.Name, err)
42-
}
43-
}
44-
return out, nil
45-
}
46-
4733
func TemplateVersionParameter(param database.TemplateVersionParameter) (codersdk.TemplateVersionParameter, error) {
4834
options, err := templateVersionParameterOptions(param.Options)
4935
if err != nil {
@@ -82,7 +68,6 @@ func TemplateVersionParameter(param database.TemplateVersionParameter) (codersdk
8268
ValidationMonotonic: codersdk.ValidationMonotonicOrder(param.ValidationMonotonic),
8369
Required: param.Required,
8470
Ephemeral: param.Ephemeral,
85-
TemplateVersionID: param.TemplateVersionID,
8671
}, nil
8772
}
8873

‎coderd/workspaces.go

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ func (api *API) workspace(rw http.ResponseWriter, r *http.Request) {
123123
workspace,
124124
data.builds[0],
125125
data.templates[0],
126-
data.templateParameters,
127-
data.buildParameters,
126+
data.versionParameters[data.templates[0].ActiveVersionID],
127+
data.buildParameters[data.builds[0].ID],
128128
ownerName,
129129
))
130130
}
@@ -296,8 +296,8 @@ func (api *API) workspaceByOwnerAndName(rw http.ResponseWriter, r *http.Request)
296296
workspace,
297297
data.builds[0],
298298
data.templates[0],
299-
data.templateParameters,
300-
data.buildParameters,
299+
nil,
300+
nil,
301301
ownerName,
302302
))
303303
}
@@ -929,8 +929,8 @@ func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
929929
workspace,
930930
data.builds[0],
931931
data.templates[0],
932-
data.templateParameters,
933-
data.buildParameters,
932+
nil,
933+
nil,
934934
ownerName,
935935
))
936936
}
@@ -1163,8 +1163,8 @@ func (api *API) watchWorkspace(rw http.ResponseWriter, r *http.Request) {
11631163
workspace,
11641164
data.builds[0],
11651165
data.templates[0],
1166-
data.templateParameters,
1167-
data.buildParameters,
1166+
nil,
1167+
nil,
11681168
ownerName,
11691169
),
11701170
})
@@ -1222,8 +1222,8 @@ type workspaceData struct {
12221222
users []database.User
12231223
// The following fields will be nil if parameter resolution
12241224
// is not requested.
1225-
buildParameters []codersdk.WorkspaceBuildParameter
1226-
templateParameters []codersdk.TemplateVersionParameter
1225+
buildParameters map[uuid.UUID][]codersdk.WorkspaceBuildParameter
1226+
versionParameters map[uuid.UUID][]codersdk.TemplateVersionParameter
12271227
}
12281228

12291229
// workspacesData only returns the data the caller can access. If the caller
@@ -1260,8 +1260,8 @@ func (api *API) workspaceData(ctx context.Context, workspaces []database.Workspa
12601260
}
12611261

12621262
var (
1263-
versionParameters []codersdk.TemplateVersionParameter
1264-
buildParameters []codersdk.WorkspaceBuildParameter
1263+
versionParameters = map[uuid.UUID][]codersdk.TemplateVersionParameter{}
1264+
buildParameters = map[uuid.UUID][]codersdk.WorkspaceBuildParameter{}
12651265
)
12661266

12671267
if resolveParameters {
@@ -1275,9 +1275,12 @@ func (api *API) workspaceData(ctx context.Context, workspaces []database.Workspa
12751275
return workspaceData{}, xerrors.Errorf("get template version parameters: %w", err)
12761276
}
12771277

1278-
versionParameters, err = db2sdk.TemplateVersionParameters(dbVersionParameters)
1279-
if err != nil {
1280-
return workspaceData{}, xerrors.Errorf("convert template version parameters: %w", err)
1278+
for _, p := range dbVersionParameters {
1279+
pp, err := db2sdk.TemplateVersionParameter(p)
1280+
if err != nil {
1281+
return workspaceData{}, xerrors.Errorf("convert template version parameter %q for template version %q: %w", p.Name, p.TemplateVersionID, err)
1282+
}
1283+
versionParameters[p.TemplateVersionID] = append(versionParameters[p.TemplateVersionID], pp)
12811284
}
12821285

12831286
versionIDs = make([]uuid.UUID, 0, len(builds))
@@ -1290,7 +1293,9 @@ func (api *API) workspaceData(ctx context.Context, workspaces []database.Workspa
12901293
return workspaceData{}, xerrors.Errorf("get workspace build parameters: %w", err)
12911294
}
12921295

1293-
buildParameters = db2sdk.WorkspaceBuildParameters(dbBuildParameters)
1296+
for _, b := range dbBuildParameters {
1297+
buildParameters[b.WorkspaceBuildID] = append(buildParameters[b.WorkspaceBuildID], db2sdk.WorkspaceBuildParameter(b))
1298+
}
12941299
}
12951300

12961301
apiBuilds, err := api.convertWorkspaceBuilds(
@@ -1311,11 +1316,11 @@ func (api *API) workspaceData(ctx context.Context, workspaces []database.Workspa
13111316
}
13121317

13131318
return workspaceData{
1314-
templates: templates,
1315-
builds: apiBuilds,
1316-
users: data.users,
1317-
buildParameters: buildParameters,
1318-
templateParameters: versionParameters,
1319+
templates: templates,
1320+
builds: apiBuilds,
1321+
users: data.users,
1322+
buildParameters: buildParameters,
1323+
versionParameters: versionParameters,
13191324
}, nil
13201325
}
13211326

@@ -1333,16 +1338,6 @@ func convertWorkspaces(workspaces []database.Workspace, data workspaceData) ([]c
13331338
userByID[user.ID] = user
13341339
}
13351340

1336-
versionParametersByID := map[uuid.UUID][]codersdk.TemplateVersionParameter{}
1337-
for _, p := range data.templateParameters {
1338-
versionParametersByID[p.TemplateVersionID] = append(versionParametersByID[p.TemplateVersionID], p)
1339-
}
1340-
1341-
buildParametersByID := map[uuid.UUID][]codersdk.WorkspaceBuildParameter{}
1342-
for _, b := range data.buildParameters {
1343-
buildParametersByID[b.BuildID] = append(buildParametersByID[b.BuildID], b)
1344-
}
1345-
13461341
apiWorkspaces := make([]codersdk.Workspace, 0, len(workspaces))
13471342
for _, workspace := range workspaces {
13481343
// If any data is missing from the workspace, just skip returning
@@ -1367,8 +1362,8 @@ func convertWorkspaces(workspaces []database.Workspace, data workspaceData) ([]c
13671362
workspace,
13681363
build,
13691364
template,
1370-
versionParametersByID[template.ActiveVersionID],
1371-
buildParametersByID[build.ID],
1365+
data.versionParameters[template.ActiveVersionID],
1366+
data.buildParameters[build.ID],
13721367
owner.Username,
13731368
))
13741369
}

‎codersdk/templateversions.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ type TemplateVersionParameter struct {
6868
ValidationMonotonic ValidationMonotonicOrder `json:"validation_monotonic,omitempty" enums:"increasing,decreasing"`
6969
Required bool `json:"required"`
7070
Ephemeral bool `json:"ephemeral"`
71-
TemplateVersionID uuid.UUID `json:"template_version_id" format:"uuid"`
7271
}
7372

7473
// TemplateVersionParameterOption represents a selectable option for a template parameter.

‎codersdk/workspacebuilds.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ type WorkspaceResourceMetadata struct {
9898

9999
// WorkspaceBuildParameter represents a parameter specific for a workspace build.
100100
type WorkspaceBuildParameter struct {
101-
BuildID uuid.UUID `json:"build_id" format:"uuid"`
102-
Name string `json:"name"`
103-
Value string `json:"value"`
101+
Name string `json:"name"`
102+
Value string `json:"value"`
104103
}
105104

106105
// WorkspaceBuild returns a single workspace build for a workspace.

‎docs/api/builds.md

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/schemas.md

Lines changed: 4 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/templates.md

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/workspaces.md

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)