8000 chore: push proto changes to `v1.6` (#17874) · coder/coder@cf98268 · GitHub
[go: up one dir, main page]

Skip to content

Commit cf98268

Browse files
authored
chore: push proto changes to v1.6 (#17874)
`v1.5` is going out with release `v2.22` I had to reorder `module_files` and `resource_replacements` because of this. --------- Signed-off-by: Danny Kopping <dannykopping@gmail.com>
1 parent c7917ea commit cf98268

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

cli/testdata/coder_provisioner_list_--output_json.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"last_seen_at": "====[timestamp]=====",
88
"name": "test",
99
"version": "v0.0.0-devel",
10-
"api_version": "1.5",
10+
"api_version": "1.6",
1111
"provisioners": [
1212
"echo"
1313
],

provisionerd/proto/version.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ import "github.com/coder/coder/v2/apiversion"
1515
//
1616
// API v1.5:
1717
// - Add new field named `prebuilt_workspace_build_stage` enum in the Metadata message.
18-
// - Add `plan` and `module_files` fields to `CompletedJob.TemplateImport`.
19-
// - Add previous parameter values to 'WorkspaceBuild' jobs. Provisioner passes
20-
// the previous values for the `terraform apply` to enforce monotonicity
21-
// in the terraform provider.
2218
// - Add new field named `running_agent_auth_tokens` to provisioner job metadata
2319
// - Add new field named `resource_replacements` in PlanComplete & CompletedJob.WorkspaceBuild.
2420
// - Add new field named `api_key_scope` to WorkspaceAgent to support running without user data access.
21+
// - Add `plan` field to `CompletedJob.TemplateImport`.
22+
//
23+
// API v1.6:
24+
// - Add `module_files` field to `CompletedJob.TemplateImport`.
25+
// - Add previous parameter values to 'WorkspaceBuild' jobs. Provisioner passes
26+
// the previous values for the `terraform apply` to enforce monotonicity
27+
// in the terraform provider.
2528
const (
2629
CurrentMajor = 1
27-
CurrentMinor = 5
30+
CurrentMinor = 6
2831
)
2932

3033
// CurrentVersion is the current provisionerd API version.

provisionersdk/proto/provisioner.pb.go

Lines changed: 14 additions & 14 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
@@ -354,8 +354,8 @@ message PlanComplete {
354354
repeated Module modules = 7;
355355
repeated Preset presets = 8;
356356
bytes plan = 9;
357-
bytes module_files = 10;
358-
repeated ResourceReplacement resource_replacements = 11;
357+
repeated ResourceReplacement resource_replacements = 10;
358+
bytes module_files = 11;
359359
}
360360

361361
// 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)
0