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

Commitb64f624

Browse files
authored
fix: Remove unused scopes from parameter computation (#4171)
1 parentea115c9 commitb64f624

File tree

4 files changed

+0
-13
lines changed

4 files changed

+0
-13
lines changed

‎coderd/parameter/compute.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515
// ComputeScope targets identifiers to pull parameters from.
1616
typeComputeScopestruct {
1717
TemplateImportJobID uuid.UUID
18-
OrganizationID uuid.UUID
19-
UserID uuid.UUID
2018
TemplateID uuid.NullUUID
2119
WorkspaceID uuid.NullUUID
2220
AdditionalParameterValues []database.ParameterValue

‎coderd/parameter/compute_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ func TestCompute(t *testing.T) {
1818
generateScope:=func() parameter.ComputeScope {
1919
return parameter.ComputeScope{
2020
TemplateImportJobID:uuid.New(),
21-
OrganizationID:uuid.New(),
2221
TemplateID: uuid.NullUUID{
2322
UUID:uuid.New(),
2423
Valid:true,
@@ -27,7 +26,6 @@ func TestCompute(t *testing.T) {
2726
UUID:uuid.New(),
2827
Valid:true,
2928
},
30-
UserID:uuid.New(),
3129
}
3230
}
3331
typeparameterOptionsstruct {

‎coderd/provisionerdaemons.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,10 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
226226
// Compute parameters for the workspace to consume.
227227
parameters,err:=parameter.Compute(ctx,server.Database, parameter.ComputeScope{
228228
TemplateImportJobID:templateVersion.JobID,
229-
OrganizationID:job.OrganizationID,
230229
TemplateID: uuid.NullUUID{
231230
UUID:template.ID,
232231
Valid:true,
233232
},
234-
UserID:user.ID,
235233
WorkspaceID: uuid.NullUUID{
236234
UUID:workspace.ID,
237235
Valid:true,
@@ -283,9 +281,7 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
283281
// Compute parameters for the dry-run to consume.
284282
parameters,err:=parameter.Compute(ctx,server.Database, parameter.ComputeScope{
285283
TemplateImportJobID:templateVersion.JobID,
286-
OrganizationID:job.OrganizationID,
287284
TemplateID:templateVersion.TemplateID,
288-
UserID:user.ID,
289285
WorkspaceID: uuid.NullUUID{},
290286
AdditionalParameterValues:input.ParameterValues,
291287
},nil)
@@ -476,8 +472,6 @@ func (server *provisionerdServer) UpdateJob(ctx context.Context, request *proto.
476472
parameters,err:=parameter.Compute(ctx,server.Database, parameter.ComputeScope{
477473
TemplateImportJobID:job.ID,
478474
TemplateID:templateID,
479-
OrganizationID:job.OrganizationID,
480-
UserID:job.InitiatorID,
481475
},nil)
482476
iferr!=nil {
483477
returnnil,xerrors.Errorf("compute parameters: %w",err)

‎coderd/templateversions.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ func (api *API) templateVersionSchema(rw http.ResponseWriter, r *http.Request) {
148148

149149
func (api*API)templateVersionParameters(rw http.ResponseWriter,r*http.Request) {
150150
ctx:=r.Context()
151-
apiKey:=httpmw.APIKey(r)
152151
templateVersion:=httpmw.TemplateVersionParam(r)
153152
if!api.Authorize(r,rbac.ActionRead,templateVersion) {
154153
httpapi.ResourceNotFound(rw)
@@ -171,8 +170,6 @@ func (api *API) templateVersionParameters(rw http.ResponseWriter, r *http.Reques
171170
}
172171
values,err:=parameter.Compute(ctx,api.Database, parameter.ComputeScope{
173172
TemplateImportJobID:job.ID,
174-
OrganizationID:job.OrganizationID,
175-
UserID:apiKey.UserID,
176173
},&parameter.ComputeOptions{
177174
// We *never* want to send the client secret parameter values.
178175
HideRedisplayValues:true,

0 commit comments

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