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

Skip to content

Commit b1e493f

Browse files
kylecarbskylecarbs
committed
Update references when computing project parameters
1 parent 76df074 commit b1e493f

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎coderd/projectparameter/projectparameter.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515

1616
// Scope targets identifiers to pull parameters from.
1717
type Scope struct {
18-
OrganizationID string
19-
ProjectID uuid.UUID
20-
ProjectVersionID uuid.UUID
21-
UserID sql.NullString
22-
WorkspaceID uuid.NullUUID
18+
OrganizationID string
19+
ProjectID uuid.UUID
20+
ImportJobID uuid.UUID
21+
UserID sql.NullString
22+
WorkspaceID uuid.NullUUID
2323
}
2424

2525
// Value represents a computed parameter.
@@ -37,13 +37,13 @@ type Value struct {
3737
// the runtime parameter values for a project.
3838
func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, error) {
3939
compute := &compute{
40-
db: db,
41-
computedParameterByName: map[string]Value{},
42-
projectVersionParametersByName: map[string]database.ProjectVersionParameter{},
40+
db: db,
41+
computedParameterByName: map[string]Value{},
42+
parameterSchemasByName: map[string]database.ParameterSchema{},
4343
}
4444

4545
// All parameters for the project version!
46-
projectVersionParameters, err := db.GetProjectVersionParametersByVersionID(ctx, scope.ProjectVersionID)
46+
projectVersionParameters, err := db.GetParameterSchemasByJobID(ctx, scope.ImportJobID)
4747
if errors.Is(err, sql.ErrNoRows) {
4848
// This occurs when the project version has defined
4949
// no parameters, so we have nothing to compute!
@@ -53,7 +53,7 @@ func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, erro
5353
return nil, xerrors.Errorf("get project parameters: %w", err)
5454
}
5555
for _, projectVersionParameter := range projectVersionParameters {
56-
compute.projectVersionParametersByName[projectVersionParameter.Name] = projectVersionParameter
56+
compute.parameterSchemasByName[projectVersionParameter.Name] = projectVersionParameter
5757
}
5858

5959
// Organization parameters come first!
@@ -127,7 +127,7 @@ func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, erro
127127
}
128128
}
129129

130-
for _, projectVersionParameter := range compute.projectVersionParametersByName {
130+
for _, projectVersionParameter := range compute.parameterSchemasByName {
131131
if _, ok := compute.computedParameterByName[projectVersionParameter.Name]; ok {
132132
continue
133133
}
@@ -145,9 +145,9 @@ func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, erro
145145
}
146146

147147
type compute struct {
148-
db database.Store
149-
computedParameterByName map[string]Value
150-
projectVersionParametersByName map[string]database.ProjectVersionParameter
148+
db database.Store
149+
computedParameterByName map[string]Value
150+
parameterSchemasByName map[string]database.ParameterSchema
151151
}
152152

153153
// Validates and computes the value for parameters; setting the value on "parameterByName".
@@ -161,7 +161,7 @@ func (c *compute) inject(ctx context.Context, scopeParams database.GetParameterV
161161
}
162162

163163
for _, scopedParameter := range scopedParameters {
164-
projectVersionParameter, hasProjectVersionParameter := c.projectVersionParametersByName[scopedParameter.Name]
164+
projectVersionParameter, hasProjectVersionParameter := c.parameterSchemasByName[scopedParameter.Name]
165165
if !hasProjectVersionParameter {
166166
// Don't inject parameters that aren't defined by the project.
167167
continue

‎coderd/projectparameter/projectparameter_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ func TestCompute(t *testing.T) {
1919
t.Parallel()
2020
generateScope := func() projectparameter.Scope {
2121
return projectparameter.Scope{
22-
OrganizationID: uuid.New().String(),
23-
ProjectID: uuid.New(),
24-
ProjectVersionID: uuid.New(),
22+
OrganizationID: uuid.New().String(),
23+
ProjectID: uuid.New(),
24+
ImportJobID: uuid.New(),
2525
WorkspaceID: uuid.NullUUID{
2626
UUID: uuid.New(),
2727
Valid: true,
@@ -36,9 +36,9 @@ func TestCompute(t *testing.T) {
3636
AllowOverrideSource bool
3737
AllowOverrideDestination bool
3838
DefaultDestinationScheme database.ParameterDestinationScheme
39-
ProjectVersionID uuid.UUID
39+
ImportJobID uuid.UUID
4040
}
41-
generateProjectParameter := func(t *testing.T, db database.Store, opts projectParameterOptions) database.ProjectVersionParameter {
41+
generateProjectParameter := func(t *testing.T, db database.Store, opts projectParameterOptions) database.ParameterSchema {
4242
if opts.DefaultDestinationScheme == "" {
4343
opts.DefaultDestinationScheme = database.ParameterDestinationSchemeEnvironmentVariable
4444
}
@@ -48,10 +48,10 @@ func TestCompute(t *testing.T) {
4848
require.NoError(t, err)
4949
destinationValue, err := cryptorand.String(8)
5050
require.NoError(t, err)
51-
param, err := db.InsertProjectVersionParameter(context.Background(), database.InsertProjectVersionParameterParams{
51+
param, err := db.InsertParameterSchema(context.Background(), database.InsertParameterSchemaParams{
5252
ID: uuid.New(),
5353
Name: name,
54-
ProjectVersionID: opts.ProjectVersionID,
54+
JobID: opts.ImportJobID,
5555
DefaultSourceScheme: database.ParameterSourceSchemeData,
5656
DefaultSourceValue: sql.NullString{
5757
String: sourceValue,
@@ -73,10 +73,10 @@ func TestCompute(t *testing.T) {
7373
t.Parallel()
7474
db := databasefake.New()
7575
scope := generateScope()
76-
parameter, err := db.InsertProjectVersionParameter(context.Background(), database.InsertProjectVersionParameterParams{
77-
ID: uuid.New(),
78-
ProjectVersionID: scope.ProjectVersionID,
79-
Name: "hey",
76+
parameter, err := db.InsertParameterSchema(context.Background(), database.InsertParameterSchemaParams{
77+
ID: uuid.New(),
78+
JobID: scope.ImportJobID,
79+
Name: "hey",
8080
})
8181
require.NoError(t, err)
8282

@@ -92,7 +92,7 @@ func TestCompute(t *testing.T) {
9292
db := databasefake.New()
9393
scope := generateScope()
9494
parameter := generateProjectParameter(t, db, projectParameterOptions{
95-
ProjectVersionID: scope.ProjectVersionID,
95+
ImportJobID: scope.ImportJobID,
9696
DefaultDestinationScheme: database.ParameterDestinationSchemeProvisionerVariable,
9797
})
9898
values, err := projectparameter.Compute(context.Background(), db, scope)
@@ -112,7 +112,7 @@ func TestCompute(t *testing.T) {
112112
db := databasefake.New()
113113
scope := generateScope()
114114
parameter := generateProjectParameter(t, db, projectParameterOptions{
115-
ProjectVersionID: scope.ProjectVersionID,
115+
ImportJobID: scope.ImportJobID,
116116
})
117117
_, err := db.InsertParameterValue(context.Background(), database.InsertParameterValueParams{
118118
ID: uuid.New(),
@@ -138,7 +138,7 @@ func TestCompute(t *testing.T) {
138138
db := databasefake.New()
139139
scope := generateScope()
140140
parameter := generateProjectParameter(t, db, projectParameterOptions{
141-
ProjectVersionID: scope.ProjectVersionID,
141+
ImportJobID: scope.ImportJobID,
142142
})
143143
value, err := db.InsertParameterValue(context.Background(), database.InsertParameterValueParams{
144144
ID: uuid.New(),
@@ -164,7 +164,7 @@ func TestCompute(t *testing.T) {
164164
db := databasefake.New()
165165
scope := generateScope()
166166
parameter := generateProjectParameter(t, db, projectParameterOptions{
167-
ProjectVersionID: scope.ProjectVersionID,
167+
ImportJobID: scope.ImportJobID,
168168
})
169169
_, err := db.InsertParameterValue(context.Background(), database.InsertParameterValueParams{
170170
ID: uuid.New(),
@@ -190,7 +190,7 @@ func TestCompute(t *testing.T) {
190190
scope := generateScope()
191191
parameter := generateProjectParameter(t, db, projectParameterOptions{
192192
AllowOverrideSource: true,
193-
ProjectVersionID: scope.ProjectVersionID,
193+
ImportJobID: scope.ImportJobID,
194194
})
195195
_, err := db.InsertParameterValue(context.Background(), database.InsertParameterValueParams{
196196
ID: uuid.New(),

‎coderd/provisionerdaemons.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
207207

208208
// Compute parameters for the workspace to consume.
209209
parameters, err := projectparameter.Compute(ctx, server.Database, projectparameter.Scope{
210-
OrganizationID: organization.ID,
211-
ProjectID: project.ID,
212-
ProjectVersionID: projectVersion.ID,
210+
OrganizationID: organization.ID,
211+
ProjectID: project.ID,
212+
ImportJobID: projectVersion.ImportJobID,
213213
UserID: sql.NullString{
214214
String: user.ID,
215215
Valid: true,

0 commit comments

Comments
 (0)