coder · kylecarbs · Feb 8, 2022 · Feb 6, 2022 · Feb 7, 2022 · Feb 7, 2022
diff --git a/coderd/coderdtest/coderdtest_test.go b/coderd/coderdtest/coderdtest_test.go
@@ -28,7 +28,7 @@ func TestNew(t *testing.T) {
 	workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 	history, err := client.CreateWorkspaceHistory(context.Background(), "me", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 		ProjectVersionID: version.ID,
-		Transition:       database.WorkspaceTransitionCreate,
+		Transition:       database.WorkspaceTransitionStart,
 	})
 	require.NoError(t, err)
 	coderdtest.AwaitWorkspaceHistoryProvisioned(t, client, "me", workspace.Name, history.Name)

diff --git a/coderd/projectparameter/projectparameter.go b/coderd/projectparameter/projectparameter.go
@@ -15,12 +15,11 @@ import (
 
 // Scope targets identifiers to pull parameters from.
 type Scope struct {
-	OrganizationID     string
-	ProjectID          uuid.UUID
-	ProjectVersionID   uuid.UUID
-	UserID             string
-	WorkspaceID        uuid.UUID
-	WorkspaceHistoryID uuid.UUID
+	OrganizationID   string
+	ProjectID        uuid.UUID
+	ProjectVersionID uuid.UUID
+	UserID           sql.NullString
+	WorkspaceID      uuid.NullUUID
 }
 
 // Value represents a computed parameter.
@@ -40,11 +39,11 @@ func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, erro
 	compute := &compute{
 		db:                             db,
 		computedParameterByName:        map[string]Value{},
-		projectVersionParametersByName: map[string]database.ProjectParameter{},
+		projectVersionParametersByName: map[string]database.ProjectVersionParameter{},
 	}
 
 	// All parameters for the project version!
-	projectVersionParameters, err := db.GetProjectParametersByVersionID(ctx, scope.ProjectVersionID)
+	projectVersionParameters, err := db.GetProjectVersionParametersByVersionID(ctx, scope.ProjectVersionID)
 	if errors.Is(err, sql.ErrNoRows) {
 		// This occurs when the project version has defined
 		// no parameters, so we have nothing to compute!
@@ -106,22 +105,26 @@ func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, erro
 		return nil, err
 	}
 
-	// User parameters come fourth!
-	err = compute.inject(ctx, database.GetParameterValuesByScopeParams{
-		Scope:   database.ParameterScopeUser,
-		ScopeID: scope.UserID,
-	})
-	if err != nil {
-		return nil, err
+	if scope.UserID.Valid {
+		// User parameters come fourth!
+		err = compute.inject(ctx, database.GetParameterValuesByScopeParams{
+			Scope:   database.ParameterScopeUser,
+			ScopeID: scope.UserID.String,
+		})
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	// Workspace parameters come last!
-	err = compute.inject(ctx, database.GetParameterValuesByScopeParams{
-		Scope:   database.ParameterScopeWorkspace,
-		ScopeID: scope.WorkspaceID.String(),
-	})
-	if err != nil {
-		return nil, err
+	if scope.WorkspaceID.Valid {
+		// Workspace parameters come last!
+		err = compute.inject(ctx, database.GetParameterValuesByScopeParams{
+			Scope:   database.ParameterScopeWorkspace,
+			ScopeID: scope.WorkspaceID.UUID.String(),
+		})
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	for _, projectVersionParameter := range compute.projectVersionParametersByName {
@@ -144,7 +147,7 @@ func Compute(ctx context.Context, db database.Store, scope Scope) ([]Value, erro
 type compute struct {
 	db                             database.Store
 	computedParameterByName        map[string]Value
-	projectVersionParametersByName map[string]database.ProjectParameter
+	projectVersionParametersByName map[string]database.ProjectVersionParameter
 }
 
 // Validates and computes the value for parameters; setting the value on "parameterByName".

diff --git a/coderd/projectparameter/projectparameter_test.go b/coderd/projectparameter/projectparameter_test.go
@@ -22,7 +22,14 @@ func TestCompute(t *testing.T) {
 			OrganizationID:   uuid.New().String(),
 			ProjectID:        uuid.New(),
 			ProjectVersionID: uuid.New(),
-			UserID:           uuid.NewString(),
+			WorkspaceID: uuid.NullUUID{
+				UUID:  uuid.New(),
+				Valid: true,
+			},
+			UserID: sql.NullString{
+				String: uuid.NewString(),
+				Valid:  true,
+			},
 		}
 	}
 	type projectParameterOptions struct {
@@ -31,7 +38,7 @@ func TestCompute(t *testing.T) {
 		DefaultDestinationScheme database.ParameterDestinationScheme
 		ProjectVersionID         uuid.UUID
 	}
-	generateProjectParameter := func(t *testing.T, db database.Store, opts projectParameterOptions) database.ProjectParameter {
+	generateProjectParameter := func(t *testing.T, db database.Store, opts projectParameterOptions) database.ProjectVersionParameter {
 		if opts.DefaultDestinationScheme == "" {
 			opts.DefaultDestinationScheme = database.ParameterDestinationSchemeEnvironmentVariable
 		}
@@ -41,7 +48,7 @@ func TestCompute(t *testing.T) {
 		require.NoError(t, err)
 		destinationValue, err := cryptorand.String(8)
 		require.NoError(t, err)
-		param, err := db.InsertProjectParameter(context.Background(), database.InsertProjectParameterParams{
+		param, err := db.InsertProjectVersionParameter(context.Background(), database.InsertProjectVersionParameterParams{
 			ID:                  uuid.New(),
 			Name:                name,
 			ProjectVersionID:    opts.ProjectVersionID,
@@ -66,7 +73,7 @@ func TestCompute(t *testing.T) {
 		t.Parallel()
 		db := databasefake.New()
 		scope := generateScope()
-		parameter, err := db.InsertProjectParameter(context.Background(), database.InsertProjectParameterParams{
+		parameter, err := db.InsertProjectVersionParameter(context.Background(), database.InsertProjectVersionParameterParams{
 			ID:               uuid.New(),
 			ProjectVersionID: scope.ProjectVersionID,
 			Name:             "hey",
@@ -163,7 +170,7 @@ func TestCompute(t *testing.T) {
 			ID:                uuid.New(),
 			Name:              parameter.Name,
 			Scope:             database.ParameterScopeWorkspace,
-			ScopeID:           scope.WorkspaceID.String(),
+			ScopeID:           scope.WorkspaceID.UUID.String(),
 			SourceScheme:      database.ParameterSourceSchemeData,
 			SourceValue:       "nop",
 			DestinationScheme: database.ParameterDestinationSchemeEnvironmentVariable,
@@ -189,7 +196,7 @@ func TestCompute(t *testing.T) {
 			ID:                uuid.New(),
 			Name:              parameter.Name,
 			Scope:             database.ParameterScopeWorkspace,
-			ScopeID:           scope.WorkspaceID.String(),
+			ScopeID:           scope.WorkspaceID.UUID.String(),
 			SourceScheme:      database.ParameterSourceSchemeData,
 			SourceValue:       "nop",
 			DestinationScheme: database.ParameterDestinationSchemeEnvironmentVariable,

diff --git a/coderd/projectversion.go b/coderd/projectversion.go
@@ -31,8 +31,8 @@ type ProjectVersion struct {
 	Import        ProvisionerJob                `json:"import"`
 }
 
-// ProjectParameter represents a parameter parsed from project version source on creation.
-type ProjectParameter struct {
+// ProjectVersionParameter represents a parameter parsed from project version source on creation.
+type ProjectVersionParameter struct {
 	ID                       uuid.UUID                           `json:"id"`
 	CreatedAt                time.Time                           `json:"created_at"`
 	ProjectVersionID         uuid.UUID                           `json:"project_version_id"`
@@ -62,7 +62,7 @@ type CreateProjectVersionRequest struct {
 func (api *api) projectVersionsByOrganization(rw http.ResponseWriter, r *http.Request) {
 	project := httpmw.ProjectParam(r)
 
-	version, err := api.Database.GetProjectVersionByProjectID(r.Context(), project.ID)
+	version, err := api.Database.GetProjectVersionsByProjectID(r.Context(), project.ID)
 	if errors.Is(err, sql.ErrNoRows) {
 		err = nil
 	}
@@ -196,10 +196,10 @@ func (api *api) projectVersionParametersByOrganizationAndName(rw http.ResponseWr
 		return
 	}
 
-	parameters, err := api.Database.GetProjectParametersByVersionID(r.Context(), projectVersion.ID)
+	parameters, err := api.Database.GetProjectVersionParametersByVersionID(r.Context(), projectVersion.ID)
 	if errors.Is(err, sql.ErrNoRows) {
 		err = nil
-		parameters = []database.ProjectParameter{}
+		parameters = []database.ProjectVersionParameter{}
 	}
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
@@ -208,7 +208,7 @@ func (api *api) projectVersionParametersByOrganizationAndName(rw http.ResponseWr
 		return
 	}
 
-	apiParameters := make([]ProjectParameter, 0, len(parameters))
+	apiParameters := make([]ProjectVersionParameter, 0, len(parameters))
 	for _, parameter := range parameters {
 		apiParameters = append(apiParameters, convertProjectParameter(parameter))
 	}
@@ -229,8 +229,8 @@ func convertProjectVersion(version database.ProjectVersion, job database.Provisi
 	}
 }
 
-func convertProjectParameter(parameter database.ProjectParameter) ProjectParameter {
-	return ProjectParameter{
+func convertProjectParameter(parameter database.ProjectVersionParameter) ProjectVersionParameter {
+	return ProjectVersionParameter{
 		ID:                       parameter.ID,
 		CreatedAt:                parameter.CreatedAt,
 		ProjectVersionID:         parameter.ProjectVersionID,

diff --git a/coderd/projectversion_test.go b/coderd/projectversion_test.go
@@ -120,6 +120,7 @@ func TestProjectVersionParametersByOrganizationAndName(t *testing.T) {
 					},
 				},
 			}},
+			Provision: echo.ProvisionComplete,
 		})
 		coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
 		params, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, version.Name)

diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -209,12 +209,17 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
 
 		// Compute parameters for the workspace to consume.
 		parameters, err := projectparameter.Compute(ctx, server.Database, projectparameter.Scope{
-			OrganizationID:     organization.ID,
-			ProjectID:          project.ID,
-			ProjectVersionID:   projectVersion.ID,
-			UserID:             user.ID,
-			WorkspaceID:        workspace.ID,
-			WorkspaceHistoryID: workspaceHistory.ID,
+			OrganizationID:   organization.ID,
+			ProjectID:        project.ID,
+			ProjectVersionID: projectVersion.ID,
+			UserID: sql.NullString{
+				String: user.ID,
+				Valid:  true,
+			},
+			WorkspaceID: uuid.NullUUID{
+				UUID:  workspace.ID,
+				Valid: true,
+			},
 		})
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("compute parameters: %s", err))
@@ -422,14 +427,14 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr
 
 		// Validate that all parameters send from the provisioner daemon
 		// follow the protocol.
-		projectParameters := make([]database.InsertProjectParameterParams, 0, len(jobType.ProjectImport.ParameterSchemas))
+		projectVersionParameters := make([]database.InsertProjectVersionParameterParams, 0, len(jobType.ProjectImport.ParameterSchemas))
 		for _, protoParameter := range jobType.ProjectImport.ParameterSchemas {
 			validationTypeSystem, err := convertValidationTypeSystem(protoParameter.ValidationTypeSystem)
 			if err != nil {
 				return nil, xerrors.Errorf("convert validation type system for %q: %w", protoParameter.Name, err)
 			}
 
-			projectParameter := database.InsertProjectParameterParams{
+			projectParameter := database.InsertProjectVersionParameterParams{
 				ID:                   uuid.New(),
 				CreatedAt:            database.Now(),
 				ProjectVersionID:     input.ProjectVersionID,
@@ -474,7 +479,7 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr
 				}
 			}
 
-			projectParameters = append(projectParameters, projectParameter)
+			projectVersionParameters = append(projectVersionParameters, projectParameter)
 		}
 
 		// This must occur in a transaction in case of failure.
@@ -492,8 +497,8 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr
 			}
 			// This could be a bulk-insert operation to improve performance.
 			// See the "InsertWorkspaceHistoryLogs" query.
-			for _, projectParameter := range projectParameters {
-				_, err = db.InsertProjectParameter(ctx, projectParameter)
+			for _, projectParameter := range projectVersionParameters {
+				_, err = db.InsertProjectVersionParameter(ctx, projectParameter)
 				if err != nil {
 					return xerrors.Errorf("insert project parameter %q: %w", projectParameter.Name, err)
 				}

diff --git a/coderd/workspacehistory_test.go b/coderd/workspacehistory_test.go
@@ -26,7 +26,7 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		_, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: uuid.New(),
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.Error(t, err)
 		var apiErr *codersdk.Error
@@ -47,7 +47,7 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		_, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.Error(t, err)
 		var apiErr *codersdk.Error
@@ -66,12 +66,12 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		_, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		_, err = client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.Error(t, err)
 		var apiErr *codersdk.Error
@@ -90,13 +90,13 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		firstHistory, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		coderdtest.AwaitWorkspaceHistoryProvisioned(t, client, "me", workspace.Name, firstHistory.Name)
 		secondHistory, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		require.Equal(t, firstHistory.ID.String(), secondHistory.BeforeID.String())
@@ -133,7 +133,7 @@ func TestWorkspaceHistoryByUser(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		_, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		history, err := client.ListWorkspaceHistory(context.Background(), "me", workspace.Name)
@@ -154,7 +154,7 @@ func TestWorkspaceHistoryByName(t *testing.T) {
 	workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 	history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 		ProjectVersionID: version.ID,
-		Transition:       database.WorkspaceTransitionCreate,
+		Transition:       database.WorkspaceTransitionStart,
 	})
 	require.NoError(t, err)
 	_, err = client.WorkspaceHistory(context.Background(), "me", workspace.Name, history.Name)

diff --git a/coderd/workspacehistorylogs_test.go b/coderd/workspacehistorylogs_test.go
@@ -41,7 +41,7 @@ func TestWorkspaceHistoryLogsByName(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 
@@ -86,7 +86,7 @@ func TestWorkspaceHistoryLogsByName(t *testing.T) {
 		before := time.Now().UTC()
 		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		coderdtest.AwaitWorkspaceHistoryProvisioned(t, client, "", workspace.Name, history.Name)
@@ -125,7 +125,7 @@ func TestWorkspaceHistoryLogsByName(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
 		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 

diff --git a/codersdk/projects.go b/codersdk/projects.go
@@ -100,7 +100,7 @@ func (c *Client) CreateProjectVersion(ctx context.Context, organization, project
 }
 
 // ProjectVersionParameters returns project parameters for a version by name.
-func (c *Client) ProjectVersionParameters(ctx context.Context, organization, project, version string) ([]coderd.ProjectParameter, error) {
+func (c *Client) ProjectVersionParameters(ctx context.Context, organization, project, version string) ([]coderd.ProjectVersionParameter, error) {
 	res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projects/%s/%s/versions/%s/parameters", organization, project, version), nil)
 	if err != nil {
 		return nil, err
@@ -109,7 +109,7 @@ func (c *Client) ProjectVersionParameters(ctx context.Context, organization, pro
 	if res.StatusCode != http.StatusOK {
 		return nil, readBodyAsError(res)
 	}
-	var params []coderd.ProjectParameter
+	var params []coderd.ProjectVersionParameter
 	return params, json.NewDecoder(res.Body).Decode(&params)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     					},
     				},
     			}},
+    			Provision: echo.ProvisionComplete,
     		})
     		coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
     		params, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, version.Name)
@@ Expand Down @@