Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

json-output: Release format version 1.0 #29550

Merged
merged 1 commit into from
Oct 6, 2021
Merged

json-output: Release format version 1.0 #29550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/command/jsonplan/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
// FormatVersion represents the version of the json format and will be
// incremented for any change to this format that requires changes to a
// consuming parser.
const FormatVersion = "0.2"
const FormatVersion = "1.0"

// Plan is the top-level representation of the json format of a plan. It includes
// the complete config and current state.
Expand Down
2 changes: 1 addition & 1 deletion internal/command/jsonprovider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
// FormatVersion represents the version of the json format and will be
// incremented for any change to this format that requires changes to a
// consuming parser.
const FormatVersion = "0.2"
const FormatVersion = "1.0"

// providers is the top-level object returned when exporting provider schemas
type providers struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/jsonstate/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
// FormatVersion represents the version of the json format and will be
// incremented for any change to this format that requires changes to a
// consuming parser.
const FormatVersion = "0.2"
const FormatVersion = "1.0"

// state is the top-level representation of the json format of a terraform
// state.
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/providers-schema/basic/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"provider_schemas": {
"registry.terraform.io/hashicorp/test": {
"provider": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/providers-schema/empty/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"format_version": "0.2"
}
"format_version": "1.0"
}
2 changes: 1 addition & 1 deletion internal/command/testdata/providers-schema/required/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"provider_schemas": {
"registry.terraform.io/hashicorp/test": {
"provider": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json-sensitive/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "bar"
Expand Down Expand Up @@ -66,7 +66,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/show-json-state/basic/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"terraform_version": "0.12.0",
"values": {
"root_module": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json-state/empty/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"format_version": "0.2"
}
"format_version": "1.0"
}
2 changes: 1 addition & 1 deletion internal/command/testdata/show-json-state/modules/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"terraform_version": "0.12.0",
"values": {
"outputs": {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/show-json-state/sensitive-variables/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"terraform_version": "0.14.0",
"values": {
"root_module": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/basic-create/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "bar"
Expand Down Expand Up @@ -57,7 +57,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/basic-delete/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "bar"
Expand Down Expand Up @@ -89,7 +89,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/basic-update/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "bar"
Expand Down Expand Up @@ -68,7 +68,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/drift/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"planned_values": {
"root_module": {
"resources": [
Expand Down Expand Up @@ -106,7 +106,7 @@
}
],
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"root_module": {
"resources": [
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/show-json/module-depends-on/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"terraform_version": "0.13.1-dev",
"planned_values": {
"root_module": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/modules/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"planned_values": {
"outputs": {
"test": {
Expand Down Expand Up @@ -74,7 +74,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/moved-drift/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"planned_values": {
"root_module": {
"resources": [
Expand Down Expand Up @@ -108,7 +108,7 @@
}
],
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"root_module": {
"resources": [
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/moved/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"planned_values": {
"root_module": {
"resources": [
Expand Down Expand Up @@ -46,7 +46,7 @@
}
],
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"root_module": {
"resources": [
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/multi-resource-update/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"terraform_version": "0.13.0",
"variables": {
"test_var": {
Expand Down Expand Up @@ -107,7 +107,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"terraform_version": "0.13.0",
"values": {
"outputs": {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/show-json/nested-modules/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"planned_values": {
"root_module": {
"child_modules": [
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/provider-version-no-config/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "bar"
Expand Down Expand Up @@ -57,7 +57,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/provider-version/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "bar"
Expand Down Expand Up @@ -57,7 +57,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/requires-replace/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"planned_values": {
"root_module": {
"resources": [
Expand Down Expand Up @@ -48,7 +48,7 @@
}
],
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"root_module": {
"resources": [
Expand Down
4 changes: 2 additions & 2 deletions internal/command/testdata/show-json/sensitive-values/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.2",
"format_version": "1.0",
"variables": {
"test_var": {
"value": "boop"
Expand Down Expand Up @@ -69,7 +69,7 @@
}
},
"prior_state": {
"format_version": "0.2",
"format_version": "1.0",
"values": {
"outputs": {
"test": {
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/incorrectmodulename/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 4,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/interpolation/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 2,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/missing_defined_var/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": true,
"error_count": 0,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/missing_quote/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 1,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/missing_var/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 1,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/multiple_modules/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 1,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/multiple_providers/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 1,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/multiple_resources/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 1,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 1,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-invalid/outputs/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": false,
"error_count": 2,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/testdata/validate-valid/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "0.1",
"format_version": "1.0",
"valid": true,
"error_count": 0,
"warning_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion internal/command/views/json_view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
// This version describes the schema of JSON UI messages. This version must be
// updated after making any changes to this view, the jsonHook, or any of the
// command/views/json package.
const JSON_UI_VERSION = "0.1.0"
const JSON_UI_VERSION = "1.0"

func NewJSONView(view *View) *JSONView {
log := hclog.New(&hclog.LoggerOptions{
Expand Down
2 changes: 1 addition & 1 deletion internal/command/views/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (v *ValidateJSON) Results(diags tfdiags.Diagnostics) int {
// FormatVersion represents the version of the json format and will be
// incremented for any change to this format that requires changes to a
// consuming parser.
const FormatVersion = "0.1"
const FormatVersion = "1.0"

type Output struct {
FormatVersion string `json:"format_version"`
Expand Down
Loading