json-output: Release format version 1.0

hashicorp · Oct 6, 2021 · b9f3dab · b9f3dab
1 parent bea7e3e
commit b9f3dab
Show file tree

Hide file tree

Showing 42 changed files with 103 additions and 63 deletions.
diff --git a/internal/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go
@@ -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.

diff --git a/internal/command/jsonprovider/provider.go b/internal/command/jsonprovider/provider.go
@@ -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 {

diff --git a/internal/command/jsonstate/state.go b/internal/command/jsonstate/state.go
@@ -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.

diff --git a/internal/command/testdata/providers-schema/basic/output.json b/internal/command/testdata/providers-schema/basic/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "provider_schemas": {
         "registry.terraform.io/hashicorp/test": {
             "provider": {

diff --git a/internal/command/testdata/providers-schema/empty/output.json b/internal/command/testdata/providers-schema/empty/output.json
@@ -1,3 +1,3 @@
 {
-    "format_version": "0.2"
-}
+    "format_version": "1.0"
+}
diff --git a/internal/command/testdata/providers-schema/required/output.json b/internal/command/testdata/providers-schema/required/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "provider_schemas": {
         "registry.terraform.io/hashicorp/test": {
             "provider": {

diff --git a/internal/command/testdata/show-json-sensitive/output.json b/internal/command/testdata/show-json-sensitive/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "bar"
@@ -66,7 +66,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json-state/basic/output.json b/internal/command/testdata/show-json-state/basic/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "terraform_version": "0.12.0",
     "values": {
         "root_module": {

diff --git a/internal/command/testdata/show-json-state/empty/output.json b/internal/command/testdata/show-json-state/empty/output.json
@@ -1,3 +1,3 @@
 {
-    "format_version": "0.2"
-}
+    "format_version": "1.0"
+}
diff --git a/internal/command/testdata/show-json-state/modules/output.json b/internal/command/testdata/show-json-state/modules/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "terraform_version": "0.12.0",
     "values": {
         "outputs": {

diff --git a/internal/command/testdata/show-json-state/sensitive-variables/output.json b/internal/command/testdata/show-json-state/sensitive-variables/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "terraform_version": "0.14.0",
     "values": {
         "root_module": {

diff --git a/internal/command/testdata/show-json/basic-create/output.json b/internal/command/testdata/show-json/basic-create/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "bar"
@@ -57,7 +57,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/basic-delete/output.json b/internal/command/testdata/show-json/basic-delete/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "bar"
@@ -89,7 +89,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/basic-update/output.json b/internal/command/testdata/show-json/basic-update/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "bar"
@@ -68,7 +68,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/drift/output.json b/internal/command/testdata/show-json/drift/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "planned_values": {
         "root_module": {
             "resources": [
@@ -106,7 +106,7 @@
         }
     ],
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "root_module": {
                 "resources": [

diff --git a/internal/command/testdata/show-json/module-depends-on/output.json b/internal/command/testdata/show-json/module-depends-on/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "terraform_version": "0.13.1-dev",
     "planned_values": {
         "root_module": {

diff --git a/internal/command/testdata/show-json/modules/output.json b/internal/command/testdata/show-json/modules/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "planned_values": {
         "outputs": {
             "test": {
@@ -74,7 +74,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/moved-drift/output.json b/internal/command/testdata/show-json/moved-drift/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "planned_values": {
         "root_module": {
             "resources": [
@@ -108,7 +108,7 @@
         }
     ],
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "root_module": {
                 "resources": [

diff --git a/internal/command/testdata/show-json/moved/output.json b/internal/command/testdata/show-json/moved/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "planned_values": {
         "root_module": {
             "resources": [
@@ -46,7 +46,7 @@
         }
     ],
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "root_module": {
                 "resources": [

diff --git a/internal/command/testdata/show-json/multi-resource-update/output.json b/internal/command/testdata/show-json/multi-resource-update/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "terraform_version": "0.13.0",
     "variables": {
         "test_var": {
@@ -107,7 +107,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "terraform_version": "0.13.0",
         "values": {
             "outputs": {

diff --git a/internal/command/testdata/show-json/nested-modules/output.json b/internal/command/testdata/show-json/nested-modules/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.2",
+  "format_version": "1.0",
   "planned_values": {
     "root_module": {
       "child_modules": [

diff --git a/internal/command/testdata/show-json/provider-version-no-config/output.json b/internal/command/testdata/show-json/provider-version-no-config/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "bar"
@@ -57,7 +57,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/provider-version/output.json b/internal/command/testdata/show-json/provider-version/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "bar"
@@ -57,7 +57,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/requires-replace/output.json b/internal/command/testdata/show-json/requires-replace/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "planned_values": {
         "root_module": {
             "resources": [
@@ -48,7 +48,7 @@
         }
     ],
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "root_module": {
                 "resources": [

diff --git a/internal/command/testdata/show-json/sensitive-values/output.json b/internal/command/testdata/show-json/sensitive-values/output.json
@@ -1,5 +1,5 @@
 {
-    "format_version": "0.2",
+    "format_version": "1.0",
     "variables": {
         "test_var": {
             "value": "boop"
@@ -69,7 +69,7 @@
         }
     },
     "prior_state": {
-        "format_version": "0.2",
+        "format_version": "1.0",
         "values": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/validate-invalid/incorrectmodulename/output.json b/internal/command/testdata/validate-invalid/incorrectmodulename/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 4,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/interpolation/output.json b/internal/command/testdata/validate-invalid/interpolation/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 2,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/missing_defined_var/output.json b/internal/command/testdata/validate-invalid/missing_defined_var/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": true,
   "error_count": 0,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/missing_quote/output.json b/internal/command/testdata/validate-invalid/missing_quote/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 1,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/missing_var/output.json b/internal/command/testdata/validate-invalid/missing_var/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 1,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/multiple_modules/output.json b/internal/command/testdata/validate-invalid/multiple_modules/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 1,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/multiple_providers/output.json b/internal/command/testdata/validate-invalid/multiple_providers/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 1,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/multiple_resources/output.json b/internal/command/testdata/validate-invalid/multiple_resources/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 1,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/output.json b/internal/command/testdata/validate-invalid/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 1,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-invalid/outputs/output.json b/internal/command/testdata/validate-invalid/outputs/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": false,
   "error_count": 2,
   "warning_count": 0,

diff --git a/internal/command/testdata/validate-valid/output.json b/internal/command/testdata/validate-valid/output.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "0.1",
+  "format_version": "1.0",
   "valid": true,
   "error_count": 0,
   "warning_count": 0,

diff --git a/internal/command/views/json_view.go b/internal/command/views/json_view.go
@@ -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{

diff --git a/internal/command/views/validate.go b/internal/command/views/validate.go
@@ -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"`