Skip to content

Commit 0567391

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

File tree

7 files changed

+644
-644
lines changed

7 files changed

+644
-644
lines changed

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 1 addition & 1 deletion
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

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

323-
reps = make([]*proto.ResourceReplacements, 0, len(replacements))
323+
reps = make([]*proto.ResourceReplacement, 0, len(replacements))
324324
for n, p := range replacements {
325-
reps = append(reps, &proto.ResourceReplacements{
325+
reps = append(reps, &proto.ResourceReplacement{
326326
Resource: n,
327327
Paths: p,
328328
})

provisionerd/proto/provisionerd.pb.go

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

provisionerd/proto/provisionerd.proto

Lines changed: 1 addition & 1 deletion
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

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

provisionersdk/proto/provisioner.proto

Lines changed: 2 additions & 2 deletions
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

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy