Skip to content

Commit 64f78a2

Browse files
committed
fix: renaming type
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
1 parent ca46d08 commit 64f78a2

File tree

7 files changed

+644
-644
lines changed

7 files changed

+644
-644
lines changed

coderd/provisionerdserver/provisionerdserver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@ func (s *server) notifyWorkspaceDeleted(ctx context.Context, workspace database.
18401840
}
18411841
}
18421842

1843-
func (s *server) notifyPrebuiltWorkspaceResourceReplacement(ctx context.Context, workspace database.Workspace, build database.WorkspaceBuild, claimantID uuid.UUID, replacements []*sdkproto.ResourceReplacements) {
1843+
func (s *server) notifyPrebuiltWorkspaceResourceReplacement(ctx context.Context, workspace database.Workspace, build database.WorkspaceBuild, claimantID uuid.UUID, replacements []*sdkproto.ResourceReplacement) {
18441844
if claimantID == uuid.Nil {
18451845
// This is not a prebuild claim.
18461846
return

provisioner/terraform/executor.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -308,17 +308,17 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
308308
// the point of prebuilding if the expensive resource is replaced once claimed!
309309
var (
310310
isPrebuildClaimAttempt = !destroy && metadata.GetPrebuildClaimForUserId() != ""
311-
reps []*proto.ResourceReplacements
311+
reps []*proto.ResourceReplacement
312312
)
313313
if count := len(replacements); count > 0 && isPrebuildClaimAttempt {
314314
// TODO(dannyk): we should log drift always (not just during prebuild claim attempts); we're validating that this output
315315
// will not be overwhelming for end-users, but it'll certainly be super valuable for template admins
316316
// to diagnose this resource replacement issue, at least.
317317
e.logDrift(ctx, killCtx, planfilePath, logr)
318318

319-
reps = make([]*proto.ResourceReplacements, 0, len(replacements))
319+
reps = make([]*proto.ResourceReplacement, 0, len(replacements))
320320
for n, p := range replacements {
321-
reps = append(reps, &proto.ResourceReplacements{
321+
reps = append(reps, &proto.ResourceReplacement{
322322
Resource: n,
323323
Paths: p,
324324
})

provisionerd/proto/provisionerd.pb.go

+149-149
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisionerd/proto/provisionerd.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ message CompletedJob {
7575
repeated provisioner.Resource resources = 2;
7676
repeated provisioner.Timing timings = 3;
7777
repeated provisioner.Module modules = 4;
78-
repeated provisioner.ResourceReplacements resourceReplacements = 5;
78+
repeated provisioner.ResourceReplacement resourceReplacements = 5;
7979
}
8080
message TemplateImport {
8181
repeated provisioner.Resource start_resources = 1;

provisionersdk/proto/provisioner.pb.go

+483-483
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisionersdk/proto/provisioner.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ message PresetParameter {
7373
string value = 2;
7474
}
7575

76-
message ResourceReplacements {
76+
message ResourceReplacement {
7777
string resource = 1;
7878
repeated string paths = 2;
7979
}
@@ -342,7 +342,7 @@ message PlanComplete {
342342
repeated Module modules = 7;
343343
repeated Preset presets = 8;
344344
bytes plan = 9;
345-
repeated ResourceReplacements resourceReplacements = 10;
345+
repeated ResourceReplacement resourceReplacements = 10;
346346
}
347347

348348
// ApplyRequest asks the provisioner to apply the changes. Apply MUST be preceded by a successful plan request/response

site/e2e/provisionerGenerated.ts

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)