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

Commite354956

Browse files
committed
review notes. mostly rename isPrebuild to prebuild
1 parent5065ad6 commite354956

File tree

13 files changed

+194
-199
lines changed

13 files changed

+194
-199
lines changed

‎cli/testdata/coder_list_--output_json.golden

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@
6767
"count": 0,
6868
"available": 0,
6969
"most_recently_seen": null
70-
},
71-
"template_version_preset_id": null
70+
}
7271
},
7372
"outdated": false,
7473
"name": "test-workspace",

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
636636
WorkspaceBuildId:workspaceBuild.ID.String(),
637637
WorkspaceOwnerLoginType:string(owner.LoginType),
638638
WorkspaceOwnerRbacRoles:ownerRbacRoles,
639-
IsPrebuild:input.IsPrebuild,
639+
Prebuild:input.Prebuild,
640640
},
641641
LogLevel:input.LogLevel,
642642
},
@@ -2451,7 +2451,7 @@ type TemplateVersionImportJob struct {
24512451
typeWorkspaceProvisionJobstruct {
24522452
WorkspaceBuildID uuid.UUID`json:"workspace_build_id"`
24532453
DryRunbool`json:"dry_run"`
2454-
IsPrebuildbool`json:"is_prebuild,omitempty"`
2454+
Prebuildbool`json:"prebuild,omitempty"`
24552455
LogLevelstring`json:"log_level,omitempty"`
24562456
}
24572457

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ func TestAcquireJob(t *testing.T) {
563563
Type:database.ProvisionerJobTypeWorkspaceBuild,
564564
Input:must(json.Marshal(provisionerdserver.WorkspaceProvisionJob{
565565
WorkspaceBuildID:build.ID,
566-
IsPrebuild:true,
566+
Prebuild:true,
567567
})),
568568
})
569569

@@ -651,7 +651,7 @@ func TestAcquireJob(t *testing.T) {
651651
WorkspaceBuildId:build.ID.String(),
652652
WorkspaceOwnerLoginType:string(user.LoginType),
653653
WorkspaceOwnerRbacRoles: []*sdkproto.Role{{Name:"member",OrgId:pd.OrganizationID.String()}},
654-
IsPrebuild:true,
654+
Prebuild:true,
655655
},
656656
},
657657
})

‎coderd/wsbuilder/wsbuilder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (b Builder) RichParameterValues(p []codersdk.WorkspaceBuildParameter) Build
171171
returnb
172172
}
173173

174-
func (bBuilder)MarkPrebuild()Builder {
174+
func (bBuilder)Prebuild()Builder {
175175
// nolint: revive
176176
b.prebuild=true
177177
returnb
@@ -310,7 +310,7 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
310310
input,err:=json.Marshal(provisionerdserver.WorkspaceProvisionJob{
311311
WorkspaceBuildID:workspaceBuildID,
312312
LogLevel:b.logLevel,
313-
IsPrebuild:b.prebuild,
313+
Prebuild:b.prebuild,
314314
})
315315
iferr!=nil {
316316
returnnil,nil,nil,BuildError{

‎codersdk/workspacebuilds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ type WorkspaceBuild struct {
7373
StatusWorkspaceStatus`json:"status" enums:"pending,starting,running,stopping,stopped,failed,canceling,canceled,deleting,deleted"`
7474
DailyCostint32`json:"daily_cost"`
7575
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"`
7777
}
7878

7979
// WorkspaceResource describes resources used to create a workspace, for instance:

‎provisioner/terraform/provision.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func provisionEnv(
268268
"CODER_WORKSPACE_TEMPLATE_VERSION="+metadata.GetTemplateVersion(),
269269
"CODER_WORKSPACE_BUILD_ID="+metadata.GetWorkspaceBuildId(),
270270
)
271-
ifmetadata.GetIsPrebuild() {
271+
ifmetadata.GetPrebuild() {
272272
env=append(env,provider.IsPrebuildEnvironmentVariable()+"=true")
273273
}
274274

‎provisioner/terraform/provision_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ func TestProvision(t *testing.T) {
822822
},
823823
Request:&proto.PlanRequest{
824824
Metadata:&proto.Metadata{
825-
IsPrebuild:true,
825+
Prebuild:true,
826826
},
827827
},
828828
Response:&proto.PlanComplete{

‎provisionerd/provisionerd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) {
367367
slog.F("workspace_build_id",build.WorkspaceBuildId),
368368
slog.F("workspace_id",build.Metadata.WorkspaceId),
369369
slog.F("workspace_name",build.WorkspaceName),
370-
slog.F("is_prebuild",build.Metadata.IsPrebuild),
370+
slog.F("prebuild",build.Metadata.Prebuild),
371371
)
372372

373373
span.SetAttributes(
@@ -377,7 +377,7 @@ func (p *Server) acquireAndRunOne(client proto.DRPCProvisionerDaemonClient) {
377377
attribute.String("workspace_owner_id",build.Metadata.WorkspaceOwnerId),
378378
attribute.String("workspace_owner",build.Metadata.WorkspaceOwner),
379379
attribute.String("workspace_transition",build.Metadata.WorkspaceTransition.String()),
380-
attribute.Bool("is_prebuild",build.Metadata.IsPrebuild),
380+
attribute.Bool("prebuild",build.Metadata.Prebuild),
381381
)
382382
}
383383

‎provisionersdk/proto/provisioner.pb.go

Lines changed: 177 additions & 177 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisionersdk/proto/provisioner.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ message Metadata {
288288
stringworkspace_build_id=17;
289289
stringworkspace_owner_login_type=18;
290290
repeatedRoleworkspace_owner_rbac_roles=19;
291-
boolis_prebuild=20;
291+
boolprebuild=20;
292292
}
293293

294294
// Config represents execution configuration shared by all subsequent requests in the Session

‎site/e2e/provisionerGenerated.ts

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

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎site/src/testHelpers/entities.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,6 @@ export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
12511251
count:1,
12521252
available:1,
12531253
},
1254-
template_version_preset_id:null,
12551254
};
12561255

12571256
exportconstMockWorkspaceBuildAutostart:TypesGen.WorkspaceBuild={
@@ -1275,7 +1274,6 @@ export const MockWorkspaceBuildAutostart: TypesGen.WorkspaceBuild = {
12751274
resources:[MockWorkspaceResource],
12761275
status:"running",
12771276
daily_cost:20,
1278-
template_version_preset_id:null,
12791277
};
12801278

12811279
exportconstMockWorkspaceBuildAutostop:TypesGen.WorkspaceBuild={
@@ -1299,7 +1297,6 @@ export const MockWorkspaceBuildAutostop: TypesGen.WorkspaceBuild = {
12991297
resources:[MockWorkspaceResource],
13001298
status:"running",
13011299
daily_cost:20,
1302-
template_version_preset_id:null,
13031300
};
13041301

13051302
exportconstMockFailedWorkspaceBuild=(
@@ -1325,7 +1322,6 @@ export const MockFailedWorkspaceBuild = (
13251322
resources:[],
13261323
status:"failed",
13271324
daily_cost:20,
1328-
template_version_preset_id:null,
13291325
});
13301326

13311327
exportconstMockWorkspaceBuildStop:TypesGen.WorkspaceBuild={

0 commit comments

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