review notes. mostly rename isPrebuild to prebuild

SasSwart · SasSwart · commit e3549562745d · 2025-04-01T22:12:28.000Z
diff --git a/cli/testdata/coder_list_--output_json.golden b/cli/testdata/coder_list_--output_json.golden
@@ -67,8 +67,7 @@
         "count": 0,
         "available": 0,
         "most_recently_seen": null
-      },
-      "template_version_preset_id": null
+      }
     },
     "outdated": false,
     "name": "test-workspace",
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -636,7 +636,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 					WorkspaceBuildId:              workspaceBuild.ID.String(),
 					WorkspaceOwnerLoginType:       string(owner.LoginType),
 					WorkspaceOwnerRbacRoles:       ownerRbacRoles,
-					IsPrebuild:                    input.IsPrebuild,
+					Prebuild:                      input.Prebuild,
 				},
 				LogLevel: input.LogLevel,
 			},
@@ -2451,7 +2451,7 @@ type TemplateVersionImportJob struct {
 type WorkspaceProvisionJob struct {
 	WorkspaceBuildID uuid.UUID `json:"workspace_build_id"`
 	DryRun           bool      `json:"dry_run"`
-	IsPrebuild       bool      `json:"is_prebuild,omitempty"`
+	Prebuild         bool      `json:"prebuild,omitempty"`
 	LogLevel         string    `json:"log_level,omitempty"`
 }
 
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -563,7 +563,7 @@ func TestAcquireJob(t *testing.T) {
 				Type:           database.ProvisionerJobTypeWorkspaceBuild,
 				Input: must(json.Marshal(provisionerdserver.WorkspaceProvisionJob{
 					WorkspaceBuildID: build.ID,
-					IsPrebuild:       true,
+					Prebuild:         true,
 				})),
 			})
 
@@ -651,7 +651,7 @@ func TestAcquireJob(t *testing.T) {
 						WorkspaceBuildId:              build.ID.String(),
 						WorkspaceOwnerLoginType:       string(user.LoginType),
 						WorkspaceOwnerRbacRoles:       []*sdkproto.Role{{Name: "member", OrgId: pd.OrganizationID.String()}},
-						IsPrebuild:                    true,
+						Prebuild:                      true,
 					},
 				},
 			})
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
@@ -171,7 +171,7 @@ func (b Builder) RichParameterValues(p []codersdk.WorkspaceBuildParameter) Build
 	return b
 }
 
-func (b Builder) MarkPrebuild() Builder {
+func (b Builder) Prebuild() Builder {
 	// nolint: revive
 	b.prebuild = true
 	return b
@@ -310,7 +310,7 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
 	input, err := json.Marshal(provisionerdserver.WorkspaceProvisionJob{
 		WorkspaceBuildID: workspaceBuildID,
 		LogLevel:         b.logLevel,
-		IsPrebuild:       b.prebuild,
+		Prebuild:         b.prebuild,
 	})
 	if err != nil {
 		return nil, nil, nil, BuildError{
diff --git a/codersdk/workspacebuilds.go b/codersdk/workspacebuilds.go
@@ -73,7 +73,7 @@ type WorkspaceBuild struct {
 	Status                  WorkspaceStatus      `json:"status" enums:"pending,starting,running,stopping,stopped,failed,canceling,canceled,deleting,deleted"`
 	DailyCost               int32                `json:"daily_cost"`
 	MatchedProvisioners     *MatchedProvisioners `json:"matched_provisioners,omitempty"`
-	TemplateVersionPresetID *uuid.UUID           `json:"template_version_preset_id" format:"uuid"`
+	TemplateVersionPresetID *uuid.UUID           `json:"template_version_preset_id,omitempty" format:"uuid"`
 }
 
 // WorkspaceResource describes resources used to create a workspace, for instance:
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -268,7 +268,7 @@ func provisionEnv(
 		"CODER_WORKSPACE_TEMPLATE_VERSION="+metadata.GetTemplateVersion(),
 		"CODER_WORKSPACE_BUILD_ID="+metadata.GetWorkspaceBuildId(),
 	)
-	if metadata.GetIsPrebuild() {
+	if metadata.GetPrebuild() {
 		env = append(env, provider.IsPrebuildEnvironmentVariable()+"=true")
 	}
 
diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go
@@ -822,7 +822,7 @@ func TestProvision(t *testing.T) {
 			},
 			Request: &proto.PlanRequest{
 				Metadata: &proto.Metadata{
-					IsPrebuild: true,
+					Prebuild: true,
 				},
 			},
 			Response: &proto.PlanComplete{
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -367,7 +367,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) {
 			slog.F("workspace_build_id", build.WorkspaceBuildId),
 			slog.F("workspace_id", build.Metadata.WorkspaceId),
 			slog.F("workspace_name", build.WorkspaceName),
-			slog.F("is_prebuild", build.Metadata.IsPrebuild),
+			slog.F("prebuild", build.Metadata.Prebuild),
 		)
 
 		span.SetAttributes(
@@ -377,7 +377,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) {
 			attribute.String("workspace_owner_id", build.Metadata.WorkspaceOwnerId),
 			attribute.String("workspace_owner", build.Metadata.WorkspaceOwner),
 			attribute.String("workspace_transition", build.Metadata.WorkspaceTransition.String()),
-			attribute.Bool("is_prebuild", build.Metadata.IsPrebuild),
+			attribute.Bool("prebuild", build.Metadata.Prebuild),
 		)
 	}
 
diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go
diff --git a/provisionersdk/proto/provisioner.proto b/provisionersdk/proto/provisioner.proto
@@ -288,7 +288,7 @@ message Metadata {
     string workspace_build_id = 17;
     string workspace_owner_login_type =  18;
     repeated Role workspace_owner_rbac_roles = 19;
-    bool   is_prebuild = 20;
+    bool prebuild = 20;
 }
 
 // Config represents execution configuration shared by all subsequent requests in the Session
diff --git a/site/e2e/provisionerGenerated.ts b/site/e2e/provisionerGenerated.ts
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -1251,7 +1251,6 @@ export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
 		count: 1,
 		available: 1,
 	},
-	template_version_preset_id: null,
 };
 
 export const MockWorkspaceBuildAutostart: TypesGen.WorkspaceBuild = {
@@ -1275,7 +1274,6 @@ export const MockWorkspaceBuildAutostart: TypesGen.WorkspaceBuild = {
 	resources: [MockWorkspaceResource],
 	status: "running",
 	daily_cost: 20,
-	template_version_preset_id: null,
 };
 
 export const MockWorkspaceBuildAutostop: TypesGen.WorkspaceBuild = {
@@ -1299,7 +1297,6 @@ export const MockWorkspaceBuildAutostop: TypesGen.WorkspaceBuild = {
 	resources: [MockWorkspaceResource],
 	status: "running",
 	daily_cost: 20,
-	template_version_preset_id: null,
 };
 
 export const MockFailedWorkspaceBuild = (
@@ -1325,7 +1322,6 @@ export const MockFailedWorkspaceBuild = (
 	resources: [],
 	status: "failed",
 	daily_cost: 20,
-	template_version_preset_id: null,
 });
 
 export const MockWorkspaceBuildStop: TypesGen.WorkspaceBuild = {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ type WorkspaceBuild struct {`
`73`	`73`	Status WorkspaceStatus `json:"status" enums:"pending,starting,running,stopping,stopped,failed,canceling,canceled,deleting,deleted"`
`74`	`74`	DailyCost int32 `json:"daily_cost"`
`75`	`75`	MatchedProvisioners *MatchedProvisioners `json:"matched_provisioners,omitempty"`
`76`		- TemplateVersionPresetID *uuid.UUID `json:"template_version_preset_id" format:"uuid"`
	`76`	+ TemplateVersionPresetID *uuid.UUID `json:"template_version_preset_id,omitempty" format:"uuid"`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// WorkspaceResource describes resources used to create a workspace, for instance:`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ func provisionEnv(`
`268`	`268`	`"CODER_WORKSPACE_TEMPLATE_VERSION="+metadata.GetTemplateVersion(),`
`269`	`269`	`"CODER_WORKSPACE_BUILD_ID="+metadata.GetWorkspaceBuildId(),`
`270`	`270`	`)`
`271`		`- if metadata.GetIsPrebuild() {`
	`271`	`+ if metadata.GetPrebuild() {`
`272`	`272`	`env = append(env, provider.IsPrebuildEnvironmentVariable()+"=true")`
`273`	`273`	`}`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) {`
`367`	`367`	`slog.F("workspace_build_id", build.WorkspaceBuildId),`
`368`	`368`	`slog.F("workspace_id", build.Metadata.WorkspaceId),`
`369`	`369`	`slog.F("workspace_name", build.WorkspaceName),`
`370`		`- slog.F("is_prebuild", build.Metadata.IsPrebuild),`
	`370`	`+ slog.F("prebuild", build.Metadata.Prebuild),`
`371`	`371`	`)`
`372`	`372`
`373`	`373`	`span.SetAttributes(`
`@@ -377,7 +377,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) {`
`377`	`377`	`attribute.String("workspace_owner_id", build.Metadata.WorkspaceOwnerId),`
`378`	`378`	`attribute.String("workspace_owner", build.Metadata.WorkspaceOwner),`
`379`	`379`	`attribute.String("workspace_transition", build.Metadata.WorkspaceTransition.String()),`
`380`		`- attribute.Bool("is_prebuild", build.Metadata.IsPrebuild),`
	`380`	`+ attribute.Bool("prebuild", build.Metadata.Prebuild),`
`381`	`381`	`)`
`382`	`382`	`}`
`383`	`383`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ message Metadata {`
`288`	`288`	`string workspace_build_id = 17;`
`289`	`289`	`string workspace_owner_login_type = 18;`
`290`	`290`	`repeated Role workspace_owner_rbac_roles = 19;`
`291`		`- bool is_prebuild = 20;`
	`291`	`+ bool prebuild = 20;`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`// Config represents execution configuration shared by all subsequent requests in the Session`