From 52653b5107c24bfafce9dcf29842e13a876acaab Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Fri, 17 Jul 2020 13:13:50 -0400 Subject: [PATCH] fix: Render special chars in variables' default value properly (#284) * Fix: No longer crashes when there are special chars in a variable default * Do not escape chars everywhere * Cleanup go.mod --- docs/FORMATS_GUIDE.md | 2 +- docs/formats/asciidoc-document.md | 10 ++++++- docs/formats/asciidoc-table.md | 8 +++++- docs/formats/asciidoc.md | 2 +- docs/formats/json.md | 9 ++++++- docs/formats/markdown-document.md | 10 ++++++- docs/formats/markdown-table.md | 3 ++- docs/formats/markdown.md | 2 +- docs/formats/pretty.md | 5 +++- docs/formats/tfvars-hcl.md | 3 ++- docs/formats/tfvars-json.md | 3 ++- docs/formats/tfvars.md | 2 +- docs/formats/toml.md | 9 ++++++- docs/formats/xml.md | 9 ++++++- docs/formats/yaml.md | 7 ++++- examples/variables.tf | 10 ++++--- .../document-HeaderFromADOCFile.golden | 8 ++++++ .../asciidoc/document-HeaderFromMDFile.golden | 8 ++++++ .../asciidoc/document-HeaderFromTFFile.golden | 8 ++++++ .../document-HeaderFromTXTFile.golden | 8 ++++++ .../document-IndentationAboveAllowed.golden | 8 ++++++ .../document-IndentationBelowAllowed.golden | 8 ++++++ .../document-IndentationOfFour.golden | 8 ++++++ .../asciidoc/document-NoHeader.golden | 8 ++++++ .../asciidoc/document-NoOutputs.golden | 8 ++++++ .../asciidoc/document-NoProviders.golden | 8 ++++++ .../asciidoc/document-NoRequirements.golden | 8 ++++++ .../asciidoc/document-OnlyInputs.golden | 8 ++++++ .../asciidoc/document-OutputValues.golden | 8 ++++++ .../document-OutputValuesNoSensitivity.golden | 8 ++++++ .../asciidoc/document-SortByName.golden | 8 ++++++ .../asciidoc/document-SortByRequired.golden | 8 ++++++ .../asciidoc/document-SortByType.golden | 8 ++++++ .../asciidoc/document-WithRequired.golden | 8 ++++++ .../format/testdata/asciidoc/document.golden | 8 ++++++ .../asciidoc/table-HeaderFromADOCFile.golden | 5 ++++ .../asciidoc/table-HeaderFromMDFile.golden | 5 ++++ .../asciidoc/table-HeaderFromTFFile.golden | 5 ++++ .../asciidoc/table-HeaderFromTXTFile.golden | 5 ++++ .../table-IndentationAboveAllowed.golden | 5 ++++ .../table-IndentationBelowAllowed.golden | 5 ++++ .../asciidoc/table-IndentationOfFour.golden | 5 ++++ .../testdata/asciidoc/table-NoHeader.golden | 5 ++++ .../testdata/asciidoc/table-NoOutputs.golden | 5 ++++ .../asciidoc/table-NoProviders.golden | 5 ++++ .../asciidoc/table-NoRequirements.golden | 5 ++++ .../testdata/asciidoc/table-OnlyInputs.golden | 5 ++++ .../asciidoc/table-OutputValues.golden | 5 ++++ .../table-OutputValuesNoSensitivity.golden | 5 ++++ .../testdata/asciidoc/table-SortByName.golden | 5 ++++ .../asciidoc/table-SortByRequired.golden | 5 ++++ .../testdata/asciidoc/table-SortByType.golden | 5 ++++ .../asciidoc/table-WithRequired.golden | 6 +++++ .../format/testdata/asciidoc/table.golden | 5 ++++ .../json/json-EscapeCharacters.golden | 7 +++++ .../json/json-HeaderFromADOCFile.golden | 7 +++++ .../json/json-HeaderFromMDFile.golden | 7 +++++ .../json/json-HeaderFromTFFile.golden | 7 +++++ .../json/json-HeaderFromTXTFile.golden | 7 +++++ .../format/testdata/json/json-NoHeader.golden | 7 +++++ .../testdata/json/json-NoOutputs.golden | 7 +++++ .../testdata/json/json-NoProviders.golden | 7 +++++ .../testdata/json/json-NoRequirements.golden | 7 +++++ .../testdata/json/json-OnlyInputs.golden | 7 +++++ .../testdata/json/json-OutputValues.golden | 7 +++++ .../testdata/json/json-SortByName.golden | 7 +++++ .../testdata/json/json-SortByRequired.golden | 7 +++++ .../testdata/json/json-SortByType.golden | 7 +++++ internal/format/testdata/json/json.golden | 7 +++++ .../markdown/document-EscapeCharacters.golden | 8 ++++++ .../document-HeaderFromADOCFile.golden | 8 ++++++ .../markdown/document-HeaderFromMDFile.golden | 8 ++++++ .../markdown/document-HeaderFromTFFile.golden | 8 ++++++ .../document-HeaderFromTXTFile.golden | 8 ++++++ .../document-IndentationAboveAllowed.golden | 8 ++++++ .../document-IndentationBelowAllowed.golden | 8 ++++++ .../document-IndentationOfFour.golden | 8 ++++++ .../markdown/document-NoHeader.golden | 8 ++++++ .../markdown/document-NoOutputs.golden | 8 ++++++ .../markdown/document-NoProviders.golden | 8 ++++++ .../markdown/document-NoRequirements.golden | 8 ++++++ .../markdown/document-OnlyInputs.golden | 8 ++++++ .../markdown/document-OutputValues.golden | 8 ++++++ .../document-OutputValuesNoSensitivity.golden | 8 ++++++ .../markdown/document-SortByName.golden | 8 ++++++ .../markdown/document-SortByRequired.golden | 8 ++++++ .../markdown/document-SortByType.golden | 8 ++++++ .../markdown/document-WithRequired.golden | 8 ++++++ .../format/testdata/markdown/document.golden | 8 ++++++ .../markdown/table-EscapeCharacters.golden | 1 + .../markdown/table-HeaderFromADOCFile.golden | 1 + .../markdown/table-HeaderFromMDFile.golden | 1 + .../markdown/table-HeaderFromTFFile.golden | 1 + .../markdown/table-HeaderFromTXTFile.golden | 1 + .../table-IndentationAboveAllowed.golden | 1 + .../table-IndentationBelowAllowed.golden | 1 + .../markdown/table-IndentationOfFour.golden | 1 + .../testdata/markdown/table-NoHeader.golden | 1 + .../testdata/markdown/table-NoOutputs.golden | 1 + .../markdown/table-NoProviders.golden | 1 + .../markdown/table-NoRequirements.golden | 1 + .../testdata/markdown/table-OnlyInputs.golden | 1 + .../markdown/table-OutputValues.golden | 1 + .../table-OutputValuesNoSensitivity.golden | 1 + .../testdata/markdown/table-SortByName.golden | 1 + .../markdown/table-SortByRequired.golden | 1 + .../testdata/markdown/table-SortByType.golden | 1 + .../markdown/table-WithRequired.golden | 1 + .../format/testdata/markdown/table.golden | 1 + .../pretty/pretty-HeaderFromADOCFile.golden | 3 +++ .../pretty/pretty-HeaderFromMDFile.golden | 3 +++ .../pretty/pretty-HeaderFromTFFile.golden | 3 +++ .../pretty/pretty-HeaderFromTXTFile.golden | 3 +++ .../testdata/pretty/pretty-NoColor.golden | 3 +++ .../testdata/pretty/pretty-NoHeader.golden | 3 +++ .../testdata/pretty/pretty-NoOutputs.golden | 3 +++ .../testdata/pretty/pretty-NoProviders.golden | 3 +++ .../pretty/pretty-NoRequirements.golden | 3 +++ .../testdata/pretty/pretty-OnlyInputs.golden | 3 +++ .../pretty/pretty-OutputValues.golden | 3 +++ .../testdata/pretty/pretty-SortByName.golden | 3 +++ .../pretty/pretty-SortByRequired.golden | 3 +++ .../testdata/pretty/pretty-SortByType.golden | 3 +++ internal/format/testdata/pretty/pretty.golden | 3 +++ .../tfvars/hcl-EscapeCharacters.golden | 27 ++++++++++--------- .../testdata/tfvars/hcl-NoInputs.golden | 27 ++++++++++--------- .../testdata/tfvars/hcl-SortByName.golden | 1 + .../testdata/tfvars/hcl-SortByRequired.golden | 1 + .../testdata/tfvars/hcl-SortByType.golden | 1 + internal/format/testdata/tfvars/hcl.golden | 27 ++++++++++--------- .../tfvars/json-EscapeCharacters.golden | 1 + .../testdata/tfvars/json-NoInputs.golden | 1 + .../testdata/tfvars/json-SortByName.golden | 1 + .../tfvars/json-SortByRequired.golden | 1 + .../testdata/tfvars/json-SortByType.golden | 1 + internal/format/testdata/tfvars/json.golden | 1 + .../testdata/toml/toml-HeaderFromFile.golden | 7 +++++ .../format/testdata/toml/toml-NoHeader.golden | 7 +++++ .../testdata/toml/toml-NoOutputs.golden | 7 +++++ .../testdata/toml/toml-NoProviders.golden | 7 +++++ .../testdata/toml/toml-NoRequirements.golden | 7 +++++ .../testdata/toml/toml-OnlyInputs.golden | 7 +++++ .../testdata/toml/toml-OutputValues.golden | 7 +++++ .../testdata/toml/toml-SortByName.golden | 7 +++++ .../testdata/toml/toml-SortByRequired.golden | 7 +++++ .../testdata/toml/toml-SortByType.golden | 7 +++++ internal/format/testdata/toml/toml.golden | 7 +++++ .../xml/xml-HeaderFromADOCFile.golden | 7 +++++ .../testdata/xml/xml-HeaderFromMDFile.golden | 7 +++++ .../testdata/xml/xml-HeaderFromTFFile.golden | 7 +++++ .../testdata/xml/xml-HeaderFromTXTFile.golden | 7 +++++ .../format/testdata/xml/xml-NoHeader.golden | 7 +++++ .../format/testdata/xml/xml-NoOutputs.golden | 7 +++++ .../testdata/xml/xml-NoProviders.golden | 7 +++++ .../testdata/xml/xml-NoRequirements.golden | 7 +++++ .../format/testdata/xml/xml-OnlyInputs.golden | 7 +++++ .../testdata/xml/xml-OutputValues.golden | 7 +++++ .../format/testdata/xml/xml-SortByName.golden | 7 +++++ .../testdata/xml/xml-SortByRequired.golden | 7 +++++ .../format/testdata/xml/xml-SortByType.golden | 7 +++++ internal/format/testdata/xml/xml.golden | 7 +++++ .../yaml/yaml-HeaderFromADOCFile.golden | 5 ++++ .../yaml/yaml-HeaderFromMDFile.golden | 5 ++++ .../yaml/yaml-HeaderFromTFFile.golden | 5 ++++ .../yaml/yaml-HeaderFromTXTFile.golden | 5 ++++ .../format/testdata/yaml/yaml-NoHeader.golden | 5 ++++ .../testdata/yaml/yaml-NoOutputs.golden | 5 ++++ .../testdata/yaml/yaml-NoProviders.golden | 5 ++++ .../testdata/yaml/yaml-NoRequirements.golden | 5 ++++ .../testdata/yaml/yaml-OnlyInputs.golden | 5 ++++ .../testdata/yaml/yaml-OutputValues.golden | 5 ++++ .../testdata/yaml/yaml-SortByName.golden | 5 ++++ .../testdata/yaml/yaml-SortByRequired.golden | 5 ++++ .../testdata/yaml/yaml-SortByType.golden | 5 ++++ internal/format/testdata/yaml/yaml.golden | 5 ++++ .../complex-variables.out.json | 19 +++++++++++++ .../complex-variables.out.md | 6 +++++ .../testdata/complex-variables/complex.tf | 3 +++ internal/types/string_test.go | 5 ++++ internal/types/types.go | 12 +++++---- pkg/tfconf/input.go | 10 +++++-- 181 files changed, 998 insertions(+), 64 deletions(-) create mode 100644 internal/tfconfig/testdata/complex-variables/complex-variables.out.json create mode 100644 internal/tfconfig/testdata/complex-variables/complex-variables.out.md create mode 100644 internal/tfconfig/testdata/complex-variables/complex.tf diff --git a/docs/FORMATS_GUIDE.md b/docs/FORMATS_GUIDE.md index 52e0fb8..3c8e617 100644 --- a/docs/FORMATS_GUIDE.md +++ b/docs/FORMATS_GUIDE.md @@ -44,4 +44,4 @@ terraform-docs [PATH] [flags] * [terraform-docs xml](/docs/formats/xml.md) - Generate XML of inputs and outputs * [terraform-docs yaml](/docs/formats/yaml.md) - Generate YAML of inputs and outputs -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/asciidoc-document.md b/docs/formats/asciidoc-document.md index 3b3520e..76eb35e 100644 --- a/docs/formats/asciidoc-document.md +++ b/docs/formats/asciidoc-document.md @@ -374,6 +374,14 @@ generates the following output: Default: `""` + === string-special-chars + + Description: n/a + + Type: `string` + + Default: `"\\.<>[]{}_-"` + === string_default_empty Description: n/a @@ -420,4 +428,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/asciidoc-table.md b/docs/formats/asciidoc-table.md index a121367..365aba6 100644 --- a/docs/formats/asciidoc-table.md +++ b/docs/formats/asciidoc-table.md @@ -331,6 +331,12 @@ generates the following output: |`""` |no + |string-special-chars + |n/a + |`string` + |`"\\.<>[]{}_-"` + |no + |string_default_empty |n/a |`string` @@ -376,4 +382,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/asciidoc.md b/docs/formats/asciidoc.md index c2bf483..4c21635 100644 --- a/docs/formats/asciidoc.md +++ b/docs/formats/asciidoc.md @@ -40,4 +40,4 @@ terraform-docs asciidoc [PATH] [flags] * [terraform-docs asciidoc document](/docs/formats/asciidoc-document.md) - Generate AsciiDoc document of inputs and outputs * [terraform-docs asciidoc table](/docs/formats/asciidoc-table.md) - Generate AsciiDoc tables of inputs and outputs -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/json.md b/docs/formats/json.md index 1786c69..f44d0b7 100644 --- a/docs/formats/json.md +++ b/docs/formats/json.md @@ -246,6 +246,13 @@ generates the following output: "default": "", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.\u003c\u003e[]{}_-", + "required": false + }, { "name": "string_default_empty", "type": "string", @@ -339,4 +346,4 @@ generates the following output: } -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/markdown-document.md b/docs/formats/markdown-document.md index 1bd6fa8..84861b7 100644 --- a/docs/formats/markdown-document.md +++ b/docs/formats/markdown-document.md @@ -375,6 +375,14 @@ generates the following output: Default: `""` + ### string-special-chars + + Description: n/a + + Type: `string` + + Default: `"\\.<>[]{}_-"` + ### string\_default\_empty Description: n/a @@ -421,4 +429,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/markdown-table.md b/docs/formats/markdown-table.md index 5b0619e..444e4bc 100644 --- a/docs/formats/markdown-table.md +++ b/docs/formats/markdown-table.md @@ -130,6 +130,7 @@ generates the following output: | string-1 | It's string number one. | `string` | `"bar"` | no | | string-2 | It's string number two. | `string` | n/a | yes | | string-3 | n/a | `string` | `""` | no | + | string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | no | | string\_default\_empty | n/a | `string` | `""` | no | | string\_default\_null | n/a | `string` | `null` | no | | string\_no\_default | n/a | `string` | n/a | yes | @@ -147,4 +148,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/markdown.md b/docs/formats/markdown.md index 0e11819..30a5ee8 100644 --- a/docs/formats/markdown.md +++ b/docs/formats/markdown.md @@ -41,4 +41,4 @@ terraform-docs markdown [PATH] [flags] * [terraform-docs markdown document](/docs/formats/markdown-document.md) - Generate Markdown document of inputs and outputs * [terraform-docs markdown table](/docs/formats/markdown-table.md) - Generate Markdown tables of inputs and outputs -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/pretty.md b/docs/formats/pretty.md index 04178c4..cdf5aba 100644 --- a/docs/formats/pretty.md +++ b/docs/formats/pretty.md @@ -211,6 +211,9 @@ generates the following output: input.string-3 ("") n/a + input.string-special-chars ("\\.<>[]{}_-") + n/a + input.string_default_empty ("") n/a @@ -243,4 +246,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/tfvars-hcl.md b/docs/formats/tfvars-hcl.md index b607a4f..f5bc48c 100644 --- a/docs/formats/tfvars-hcl.md +++ b/docs/formats/tfvars-hcl.md @@ -92,6 +92,7 @@ generates the following output: string-1 = "bar" string-2 = "" string-3 = "" + string-special-chars = "\\.<>[]{}_-" string_default_empty = "" string_default_null = "" string_no_default = "" @@ -99,4 +100,4 @@ generates the following output: with-url = "" -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/tfvars-json.md b/docs/formats/tfvars-json.md index 169e036..4bdaa97 100644 --- a/docs/formats/tfvars-json.md +++ b/docs/formats/tfvars-json.md @@ -93,6 +93,7 @@ generates the following output: "string-1": "bar", "string-2": null, "string-3": "", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "string_default_empty": "", "string_default_null": null, "string_no_default": null, @@ -101,4 +102,4 @@ generates the following output: } -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/tfvars.md b/docs/formats/tfvars.md index 76e683e..c453ce3 100644 --- a/docs/formats/tfvars.md +++ b/docs/formats/tfvars.md @@ -33,4 +33,4 @@ Generate terraform.tfvars of inputs * [terraform-docs tfvars hcl](/docs/formats/tfvars-hcl.md) - Generate HCL format of terraform.tfvars of inputs * [terraform-docs tfvars json](/docs/formats/tfvars-json.md) - Generate JSON format of terraform.tfvars of inputs -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/toml.md b/docs/formats/toml.md index 7138319..44d56df 100644 --- a/docs/formats/toml.md +++ b/docs/formats/toml.md @@ -231,6 +231,13 @@ generates the following output: default = "" required = false + [[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "string_default_empty" type = "string" @@ -316,4 +323,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/xml.md b/docs/formats/xml.md index 334240d..8f2bf18 100644 --- a/docs/formats/xml.md +++ b/docs/formats/xml.md @@ -245,6 +245,13 @@ generates the following output: false + + string-special-chars + string + + \.<>[]{}_- + false + string_default_empty string @@ -338,4 +345,4 @@ generates the following output: -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/docs/formats/yaml.md b/docs/formats/yaml.md index aacc8cd..bfafb70 100644 --- a/docs/formats/yaml.md +++ b/docs/formats/yaml.md @@ -234,6 +234,11 @@ generates the following output: description: null default: "" required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: string_default_empty type: string description: null @@ -290,4 +295,4 @@ generates the following output: version: '>= 2.2.0' -###### Auto generated by spf13/cobra on 13-Jul-2020 +###### Auto generated by spf13/cobra on 15-Jul-2020 diff --git a/examples/variables.tf b/examples/variables.tf index af5ff16..b58e27c 100644 --- a/examples/variables.tf +++ b/examples/variables.tf @@ -6,7 +6,7 @@ variable "bool-3" { variable "bool-2" { description = "It's bool number two." - default = false + default = false } // It's bool number one. @@ -28,6 +28,10 @@ variable "string-1" { default = "bar" } +variable "string-special-chars" { + default = "\\.<>[]{}_-" +} + variable "number-3" { type = number default = "19" @@ -102,7 +106,7 @@ default = [ ] ``` EOD - default = [ + default = [ "name rack:location" ] } @@ -156,7 +160,7 @@ variable "string_default_null" { } variable "string_no_default" { - type = string + type = string } variable "number_default_zero" { diff --git a/internal/format/testdata/asciidoc/document-HeaderFromADOCFile.golden b/internal/format/testdata/asciidoc/document-HeaderFromADOCFile.golden index 7205eeb..01546af 100644 --- a/internal/format/testdata/asciidoc/document-HeaderFromADOCFile.golden +++ b/internal/format/testdata/asciidoc/document-HeaderFromADOCFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-HeaderFromMDFile.golden b/internal/format/testdata/asciidoc/document-HeaderFromMDFile.golden index 9ed7143..fc877f1 100644 --- a/internal/format/testdata/asciidoc/document-HeaderFromMDFile.golden +++ b/internal/format/testdata/asciidoc/document-HeaderFromMDFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-HeaderFromTFFile.golden b/internal/format/testdata/asciidoc/document-HeaderFromTFFile.golden index 0fc7f8b..02d056f 100644 --- a/internal/format/testdata/asciidoc/document-HeaderFromTFFile.golden +++ b/internal/format/testdata/asciidoc/document-HeaderFromTFFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-HeaderFromTXTFile.golden b/internal/format/testdata/asciidoc/document-HeaderFromTXTFile.golden index 377bd6f..065a42f 100644 --- a/internal/format/testdata/asciidoc/document-HeaderFromTXTFile.golden +++ b/internal/format/testdata/asciidoc/document-HeaderFromTXTFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-IndentationAboveAllowed.golden b/internal/format/testdata/asciidoc/document-IndentationAboveAllowed.golden index ed5fae5..f7893cc 100644 --- a/internal/format/testdata/asciidoc/document-IndentationAboveAllowed.golden +++ b/internal/format/testdata/asciidoc/document-IndentationAboveAllowed.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-IndentationBelowAllowed.golden b/internal/format/testdata/asciidoc/document-IndentationBelowAllowed.golden index ed5fae5..f7893cc 100644 --- a/internal/format/testdata/asciidoc/document-IndentationBelowAllowed.golden +++ b/internal/format/testdata/asciidoc/document-IndentationBelowAllowed.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-IndentationOfFour.golden b/internal/format/testdata/asciidoc/document-IndentationOfFour.golden index 30df264..15e0da9 100644 --- a/internal/format/testdata/asciidoc/document-IndentationOfFour.golden +++ b/internal/format/testdata/asciidoc/document-IndentationOfFour.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +===== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ===== number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-NoHeader.golden b/internal/format/testdata/asciidoc/document-NoHeader.golden index a915b94..9f77673 100644 --- a/internal/format/testdata/asciidoc/document-NoHeader.golden +++ b/internal/format/testdata/asciidoc/document-NoHeader.golden @@ -80,6 +80,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-NoOutputs.golden b/internal/format/testdata/asciidoc/document-NoOutputs.golden index 40cc3a8..2bd6f35 100644 --- a/internal/format/testdata/asciidoc/document-NoOutputs.golden +++ b/internal/format/testdata/asciidoc/document-NoOutputs.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-NoProviders.golden b/internal/format/testdata/asciidoc/document-NoProviders.golden index d451a0e..f2dcfb7 100644 --- a/internal/format/testdata/asciidoc/document-NoProviders.golden +++ b/internal/format/testdata/asciidoc/document-NoProviders.golden @@ -106,6 +106,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-NoRequirements.golden b/internal/format/testdata/asciidoc/document-NoRequirements.golden index 9150c74..e9a3cf3 100644 --- a/internal/format/testdata/asciidoc/document-NoRequirements.golden +++ b/internal/format/testdata/asciidoc/document-NoRequirements.golden @@ -108,6 +108,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-OnlyInputs.golden b/internal/format/testdata/asciidoc/document-OnlyInputs.golden index bd10b70..f7878f1 100644 --- a/internal/format/testdata/asciidoc/document-OnlyInputs.golden +++ b/internal/format/testdata/asciidoc/document-OnlyInputs.golden @@ -58,6 +58,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-OutputValues.golden b/internal/format/testdata/asciidoc/document-OutputValues.golden index 9cda97d..c3f342b 100644 --- a/internal/format/testdata/asciidoc/document-OutputValues.golden +++ b/internal/format/testdata/asciidoc/document-OutputValues.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-OutputValuesNoSensitivity.golden b/internal/format/testdata/asciidoc/document-OutputValuesNoSensitivity.golden index 449090c..4e99859 100644 --- a/internal/format/testdata/asciidoc/document-OutputValuesNoSensitivity.golden +++ b/internal/format/testdata/asciidoc/document-OutputValuesNoSensitivity.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document-SortByName.golden b/internal/format/testdata/asciidoc/document-SortByName.golden index 634735c..1bb6522 100644 --- a/internal/format/testdata/asciidoc/document-SortByName.golden +++ b/internal/format/testdata/asciidoc/document-SortByName.golden @@ -321,6 +321,14 @@ Type: `string` Default: `""` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === string_default_empty Description: n/a diff --git a/internal/format/testdata/asciidoc/document-SortByRequired.golden b/internal/format/testdata/asciidoc/document-SortByRequired.golden index 357fc84..126a686 100644 --- a/internal/format/testdata/asciidoc/document-SortByRequired.golden +++ b/internal/format/testdata/asciidoc/document-SortByRequired.golden @@ -337,6 +337,14 @@ Type: `string` Default: `""` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === string_default_empty Description: n/a diff --git a/internal/format/testdata/asciidoc/document-SortByType.golden b/internal/format/testdata/asciidoc/document-SortByType.golden index 02833e7..b86b6f1 100644 --- a/internal/format/testdata/asciidoc/document-SortByType.golden +++ b/internal/format/testdata/asciidoc/document-SortByType.golden @@ -329,6 +329,14 @@ Type: `string` Default: `""` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === string_default_empty Description: n/a diff --git a/internal/format/testdata/asciidoc/document-WithRequired.golden b/internal/format/testdata/asciidoc/document-WithRequired.golden index 98e453e..88511f3 100644 --- a/internal/format/testdata/asciidoc/document-WithRequired.golden +++ b/internal/format/testdata/asciidoc/document-WithRequired.golden @@ -148,6 +148,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/document.golden b/internal/format/testdata/asciidoc/document.golden index ed5fae5..f7893cc 100644 --- a/internal/format/testdata/asciidoc/document.golden +++ b/internal/format/testdata/asciidoc/document.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +=== string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + === number-3 Description: n/a diff --git a/internal/format/testdata/asciidoc/table-HeaderFromADOCFile.golden b/internal/format/testdata/asciidoc/table-HeaderFromADOCFile.golden index ffd4ad0..c11fe2f 100644 --- a/internal/format/testdata/asciidoc/table-HeaderFromADOCFile.golden +++ b/internal/format/testdata/asciidoc/table-HeaderFromADOCFile.golden @@ -68,6 +68,11 @@ esse cillum dolore eu fugiat nulla pariatur. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-HeaderFromMDFile.golden b/internal/format/testdata/asciidoc/table-HeaderFromMDFile.golden index 4b0bc0f..9c6cf4a 100644 --- a/internal/format/testdata/asciidoc/table-HeaderFromMDFile.golden +++ b/internal/format/testdata/asciidoc/table-HeaderFromMDFile.golden @@ -68,6 +68,11 @@ esse cillum dolore eu fugiat nulla pariatur. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-HeaderFromTFFile.golden b/internal/format/testdata/asciidoc/table-HeaderFromTFFile.golden index 6765471..d4f60f4 100644 --- a/internal/format/testdata/asciidoc/table-HeaderFromTFFile.golden +++ b/internal/format/testdata/asciidoc/table-HeaderFromTFFile.golden @@ -68,6 +68,11 @@ esse cillum dolore eu fugiat nulla pariatur. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-HeaderFromTXTFile.golden b/internal/format/testdata/asciidoc/table-HeaderFromTXTFile.golden index f77e84a..a76a0b0 100644 --- a/internal/format/testdata/asciidoc/table-HeaderFromTXTFile.golden +++ b/internal/format/testdata/asciidoc/table-HeaderFromTXTFile.golden @@ -68,6 +68,11 @@ esse cillum dolore eu fugiat nulla pariatur. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-IndentationAboveAllowed.golden b/internal/format/testdata/asciidoc/table-IndentationAboveAllowed.golden index db7ce9e..32450dd 100644 --- a/internal/format/testdata/asciidoc/table-IndentationAboveAllowed.golden +++ b/internal/format/testdata/asciidoc/table-IndentationAboveAllowed.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-IndentationBelowAllowed.golden b/internal/format/testdata/asciidoc/table-IndentationBelowAllowed.golden index db7ce9e..32450dd 100644 --- a/internal/format/testdata/asciidoc/table-IndentationBelowAllowed.golden +++ b/internal/format/testdata/asciidoc/table-IndentationBelowAllowed.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-IndentationOfFour.golden b/internal/format/testdata/asciidoc/table-IndentationOfFour.golden index b9e8b2b..db80832 100644 --- a/internal/format/testdata/asciidoc/table-IndentationOfFour.golden +++ b/internal/format/testdata/asciidoc/table-IndentationOfFour.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-NoHeader.golden b/internal/format/testdata/asciidoc/table-NoHeader.golden index 88dfba4..652cfec 100644 --- a/internal/format/testdata/asciidoc/table-NoHeader.golden +++ b/internal/format/testdata/asciidoc/table-NoHeader.golden @@ -59,6 +59,11 @@ |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-NoOutputs.golden b/internal/format/testdata/asciidoc/table-NoOutputs.golden index adeb9b4..9eb7fa9 100644 --- a/internal/format/testdata/asciidoc/table-NoOutputs.golden +++ b/internal/format/testdata/asciidoc/table-NoOutputs.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-NoProviders.golden b/internal/format/testdata/asciidoc/table-NoProviders.golden index 6b9f5cd..3c190f6 100644 --- a/internal/format/testdata/asciidoc/table-NoProviders.golden +++ b/internal/format/testdata/asciidoc/table-NoProviders.golden @@ -86,6 +86,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-NoRequirements.golden b/internal/format/testdata/asciidoc/table-NoRequirements.golden index 0df70b3..24db79c 100644 --- a/internal/format/testdata/asciidoc/table-NoRequirements.golden +++ b/internal/format/testdata/asciidoc/table-NoRequirements.golden @@ -87,6 +87,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-OnlyInputs.golden b/internal/format/testdata/asciidoc/table-OnlyInputs.golden index 8956f74..0caa601 100644 --- a/internal/format/testdata/asciidoc/table-OnlyInputs.golden +++ b/internal/format/testdata/asciidoc/table-OnlyInputs.golden @@ -38,6 +38,11 @@ |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-OutputValues.golden b/internal/format/testdata/asciidoc/table-OutputValues.golden index 1e3a079..83021a8 100644 --- a/internal/format/testdata/asciidoc/table-OutputValues.golden +++ b/internal/format/testdata/asciidoc/table-OutputValues.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-OutputValuesNoSensitivity.golden b/internal/format/testdata/asciidoc/table-OutputValuesNoSensitivity.golden index 61c9ba4..18535aa 100644 --- a/internal/format/testdata/asciidoc/table-OutputValuesNoSensitivity.golden +++ b/internal/format/testdata/asciidoc/table-OutputValuesNoSensitivity.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table-SortByName.golden b/internal/format/testdata/asciidoc/table-SortByName.golden index 5bba7dd..b0dcb9b 100644 --- a/internal/format/testdata/asciidoc/table-SortByName.golden +++ b/internal/format/testdata/asciidoc/table-SortByName.golden @@ -255,6 +255,11 @@ object({ |`string` |`""` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |string_default_empty |n/a |`string` diff --git a/internal/format/testdata/asciidoc/table-SortByRequired.golden b/internal/format/testdata/asciidoc/table-SortByRequired.golden index 12ce5ef..b35f55c 100644 --- a/internal/format/testdata/asciidoc/table-SortByRequired.golden +++ b/internal/format/testdata/asciidoc/table-SortByRequired.golden @@ -265,6 +265,11 @@ object({ |`string` |`""` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |string_default_empty |n/a |`string` diff --git a/internal/format/testdata/asciidoc/table-SortByType.golden b/internal/format/testdata/asciidoc/table-SortByType.golden index ff358a4..56e7472 100644 --- a/internal/format/testdata/asciidoc/table-SortByType.golden +++ b/internal/format/testdata/asciidoc/table-SortByType.golden @@ -260,6 +260,11 @@ object({ |`string` |`""` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |string_default_empty |n/a |`string` diff --git a/internal/format/testdata/asciidoc/table-WithRequired.golden b/internal/format/testdata/asciidoc/table-WithRequired.golden index 2f52477..c7ce6bc 100644 --- a/internal/format/testdata/asciidoc/table-WithRequired.golden +++ b/internal/format/testdata/asciidoc/table-WithRequired.golden @@ -104,6 +104,12 @@ followed by another line of text. |`"bar"` |no +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` +|no + |number-3 |n/a |`number` diff --git a/internal/format/testdata/asciidoc/table.golden b/internal/format/testdata/asciidoc/table.golden index db7ce9e..32450dd 100644 --- a/internal/format/testdata/asciidoc/table.golden +++ b/internal/format/testdata/asciidoc/table.golden @@ -97,6 +97,11 @@ followed by another line of text. |`string` |`"bar"` +|string-special-chars +|n/a +|`string` +|`"\\.<>[]{}_-"` + |number-3 |n/a |`number` diff --git a/internal/format/testdata/json/json-EscapeCharacters.golden b/internal/format/testdata/json/json-EscapeCharacters.golden index f3c91f3..cc4495d 100644 --- a/internal/format/testdata/json/json-EscapeCharacters.golden +++ b/internal/format/testdata/json/json-EscapeCharacters.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.\u003c\u003e[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-HeaderFromADOCFile.golden b/internal/format/testdata/json/json-HeaderFromADOCFile.golden index 3922a45..b8bedbd 100644 --- a/internal/format/testdata/json/json-HeaderFromADOCFile.golden +++ b/internal/format/testdata/json/json-HeaderFromADOCFile.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-HeaderFromMDFile.golden b/internal/format/testdata/json/json-HeaderFromMDFile.golden index 98379f7..a22eccd 100644 --- a/internal/format/testdata/json/json-HeaderFromMDFile.golden +++ b/internal/format/testdata/json/json-HeaderFromMDFile.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-HeaderFromTFFile.golden b/internal/format/testdata/json/json-HeaderFromTFFile.golden index 370f432..6d654ad 100644 --- a/internal/format/testdata/json/json-HeaderFromTFFile.golden +++ b/internal/format/testdata/json/json-HeaderFromTFFile.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-HeaderFromTXTFile.golden b/internal/format/testdata/json/json-HeaderFromTXTFile.golden index f988eea..d7b451f 100644 --- a/internal/format/testdata/json/json-HeaderFromTXTFile.golden +++ b/internal/format/testdata/json/json-HeaderFromTXTFile.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-NoHeader.golden b/internal/format/testdata/json/json-NoHeader.golden index 2995469..23f7a38 100644 --- a/internal/format/testdata/json/json-NoHeader.golden +++ b/internal/format/testdata/json/json-NoHeader.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-NoOutputs.golden b/internal/format/testdata/json/json-NoOutputs.golden index d4e8751..343f795 100644 --- a/internal/format/testdata/json/json-NoOutputs.golden +++ b/internal/format/testdata/json/json-NoOutputs.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-NoProviders.golden b/internal/format/testdata/json/json-NoProviders.golden index fa3049d..19be875 100644 --- a/internal/format/testdata/json/json-NoProviders.golden +++ b/internal/format/testdata/json/json-NoProviders.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-NoRequirements.golden b/internal/format/testdata/json/json-NoRequirements.golden index 02ae0cc..9942630 100644 --- a/internal/format/testdata/json/json-NoRequirements.golden +++ b/internal/format/testdata/json/json-NoRequirements.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-OnlyInputs.golden b/internal/format/testdata/json/json-OnlyInputs.golden index da70cd0..7925338 100644 --- a/internal/format/testdata/json/json-OnlyInputs.golden +++ b/internal/format/testdata/json/json-OnlyInputs.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-OutputValues.golden b/internal/format/testdata/json/json-OutputValues.golden index 087a864..df3d898 100644 --- a/internal/format/testdata/json/json-OutputValues.golden +++ b/internal/format/testdata/json/json-OutputValues.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/json/json-SortByName.golden b/internal/format/testdata/json/json-SortByName.golden index 38fe46e..edf1bec 100644 --- a/internal/format/testdata/json/json-SortByName.golden +++ b/internal/format/testdata/json/json-SortByName.golden @@ -201,6 +201,13 @@ "default": "", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "string_default_empty", "type": "string", diff --git a/internal/format/testdata/json/json-SortByRequired.golden b/internal/format/testdata/json/json-SortByRequired.golden index 006597d..c825504 100644 --- a/internal/format/testdata/json/json-SortByRequired.golden +++ b/internal/format/testdata/json/json-SortByRequired.golden @@ -215,6 +215,13 @@ "default": "", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "string_default_empty", "type": "string", diff --git a/internal/format/testdata/json/json-SortByType.golden b/internal/format/testdata/json/json-SortByType.golden index ab6a22a..8c412c2 100644 --- a/internal/format/testdata/json/json-SortByType.golden +++ b/internal/format/testdata/json/json-SortByType.golden @@ -208,6 +208,13 @@ "default": "", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "string_default_empty", "type": "string", diff --git a/internal/format/testdata/json/json.golden b/internal/format/testdata/json/json.golden index f1af7c9..ee4caab 100644 --- a/internal/format/testdata/json/json.golden +++ b/internal/format/testdata/json/json.golden @@ -50,6 +50,13 @@ "default": "bar", "required": false }, + { + "name": "string-special-chars", + "type": "string", + "description": null, + "default": "\\.<>[]{}_-", + "required": false + }, { "name": "number-3", "type": "number", diff --git a/internal/format/testdata/markdown/document-EscapeCharacters.golden b/internal/format/testdata/markdown/document-EscapeCharacters.golden index 9640d24..dc2fdf3 100644 --- a/internal/format/testdata/markdown/document-EscapeCharacters.golden +++ b/internal/format/testdata/markdown/document-EscapeCharacters.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-HeaderFromADOCFile.golden b/internal/format/testdata/markdown/document-HeaderFromADOCFile.golden index bd04807..8cc8fb6 100644 --- a/internal/format/testdata/markdown/document-HeaderFromADOCFile.golden +++ b/internal/format/testdata/markdown/document-HeaderFromADOCFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-HeaderFromMDFile.golden b/internal/format/testdata/markdown/document-HeaderFromMDFile.golden index 22935be..de4346c 100644 --- a/internal/format/testdata/markdown/document-HeaderFromMDFile.golden +++ b/internal/format/testdata/markdown/document-HeaderFromMDFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-HeaderFromTFFile.golden b/internal/format/testdata/markdown/document-HeaderFromTFFile.golden index 61a22cd..e8bf7ac 100644 --- a/internal/format/testdata/markdown/document-HeaderFromTFFile.golden +++ b/internal/format/testdata/markdown/document-HeaderFromTFFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-HeaderFromTXTFile.golden b/internal/format/testdata/markdown/document-HeaderFromTXTFile.golden index 414a2f2..4b65428 100644 --- a/internal/format/testdata/markdown/document-HeaderFromTXTFile.golden +++ b/internal/format/testdata/markdown/document-HeaderFromTXTFile.golden @@ -89,6 +89,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-IndentationAboveAllowed.golden b/internal/format/testdata/markdown/document-IndentationAboveAllowed.golden index 8ab6e90..e4e9ce6 100644 --- a/internal/format/testdata/markdown/document-IndentationAboveAllowed.golden +++ b/internal/format/testdata/markdown/document-IndentationAboveAllowed.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-IndentationBelowAllowed.golden b/internal/format/testdata/markdown/document-IndentationBelowAllowed.golden index 8ab6e90..e4e9ce6 100644 --- a/internal/format/testdata/markdown/document-IndentationBelowAllowed.golden +++ b/internal/format/testdata/markdown/document-IndentationBelowAllowed.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-IndentationOfFour.golden b/internal/format/testdata/markdown/document-IndentationOfFour.golden index 7fa452f..cdf193f 100644 --- a/internal/format/testdata/markdown/document-IndentationOfFour.golden +++ b/internal/format/testdata/markdown/document-IndentationOfFour.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +##### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ##### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-NoHeader.golden b/internal/format/testdata/markdown/document-NoHeader.golden index a095134..d518b4e 100644 --- a/internal/format/testdata/markdown/document-NoHeader.golden +++ b/internal/format/testdata/markdown/document-NoHeader.golden @@ -80,6 +80,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-NoOutputs.golden b/internal/format/testdata/markdown/document-NoOutputs.golden index 46fcf37..2070a22 100644 --- a/internal/format/testdata/markdown/document-NoOutputs.golden +++ b/internal/format/testdata/markdown/document-NoOutputs.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-NoProviders.golden b/internal/format/testdata/markdown/document-NoProviders.golden index e76185c..30fe9b4 100644 --- a/internal/format/testdata/markdown/document-NoProviders.golden +++ b/internal/format/testdata/markdown/document-NoProviders.golden @@ -106,6 +106,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-NoRequirements.golden b/internal/format/testdata/markdown/document-NoRequirements.golden index 132842f..9bf1a1a 100644 --- a/internal/format/testdata/markdown/document-NoRequirements.golden +++ b/internal/format/testdata/markdown/document-NoRequirements.golden @@ -108,6 +108,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-OnlyInputs.golden b/internal/format/testdata/markdown/document-OnlyInputs.golden index 9946224..89c7e4a 100644 --- a/internal/format/testdata/markdown/document-OnlyInputs.golden +++ b/internal/format/testdata/markdown/document-OnlyInputs.golden @@ -58,6 +58,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-OutputValues.golden b/internal/format/testdata/markdown/document-OutputValues.golden index 9185493..1bc0f35 100644 --- a/internal/format/testdata/markdown/document-OutputValues.golden +++ b/internal/format/testdata/markdown/document-OutputValues.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-OutputValuesNoSensitivity.golden b/internal/format/testdata/markdown/document-OutputValuesNoSensitivity.golden index 96c80f0..0c597d7 100644 --- a/internal/format/testdata/markdown/document-OutputValuesNoSensitivity.golden +++ b/internal/format/testdata/markdown/document-OutputValuesNoSensitivity.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document-SortByName.golden b/internal/format/testdata/markdown/document-SortByName.golden index 2bc8fc1..938af26 100644 --- a/internal/format/testdata/markdown/document-SortByName.golden +++ b/internal/format/testdata/markdown/document-SortByName.golden @@ -321,6 +321,14 @@ Type: `string` Default: `""` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### string_default_empty Description: n/a diff --git a/internal/format/testdata/markdown/document-SortByRequired.golden b/internal/format/testdata/markdown/document-SortByRequired.golden index 2f5ef5b..7cdd169 100644 --- a/internal/format/testdata/markdown/document-SortByRequired.golden +++ b/internal/format/testdata/markdown/document-SortByRequired.golden @@ -337,6 +337,14 @@ Type: `string` Default: `""` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### string_default_empty Description: n/a diff --git a/internal/format/testdata/markdown/document-SortByType.golden b/internal/format/testdata/markdown/document-SortByType.golden index 7aace01..f8c3bf4 100644 --- a/internal/format/testdata/markdown/document-SortByType.golden +++ b/internal/format/testdata/markdown/document-SortByType.golden @@ -329,6 +329,14 @@ Type: `string` Default: `""` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### string_default_empty Description: n/a diff --git a/internal/format/testdata/markdown/document-WithRequired.golden b/internal/format/testdata/markdown/document-WithRequired.golden index e03d04d..4042352 100644 --- a/internal/format/testdata/markdown/document-WithRequired.golden +++ b/internal/format/testdata/markdown/document-WithRequired.golden @@ -148,6 +148,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/document.golden b/internal/format/testdata/markdown/document.golden index 8ab6e90..e4e9ce6 100644 --- a/internal/format/testdata/markdown/document.golden +++ b/internal/format/testdata/markdown/document.golden @@ -118,6 +118,14 @@ Type: `string` Default: `"bar"` +### string-special-chars + +Description: n/a + +Type: `string` + +Default: `"\\.<>[]{}_-"` + ### number-3 Description: n/a diff --git a/internal/format/testdata/markdown/table-EscapeCharacters.golden b/internal/format/testdata/markdown/table-EscapeCharacters.golden index 435d053..8e441f1 100644 --- a/internal/format/testdata/markdown/table-EscapeCharacters.golden +++ b/internal/format/testdata/markdown/table-EscapeCharacters.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-HeaderFromADOCFile.golden b/internal/format/testdata/markdown/table-HeaderFromADOCFile.golden index db4f14d..5f8a8de 100644 --- a/internal/format/testdata/markdown/table-HeaderFromADOCFile.golden +++ b/internal/format/testdata/markdown/table-HeaderFromADOCFile.golden @@ -35,6 +35,7 @@ esse cillum dolore eu fugiat nulla pariatur. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-HeaderFromMDFile.golden b/internal/format/testdata/markdown/table-HeaderFromMDFile.golden index ee9fee9..f6179aa 100644 --- a/internal/format/testdata/markdown/table-HeaderFromMDFile.golden +++ b/internal/format/testdata/markdown/table-HeaderFromMDFile.golden @@ -35,6 +35,7 @@ esse cillum dolore eu fugiat nulla pariatur. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-HeaderFromTFFile.golden b/internal/format/testdata/markdown/table-HeaderFromTFFile.golden index 025bb2e..9218039 100644 --- a/internal/format/testdata/markdown/table-HeaderFromTFFile.golden +++ b/internal/format/testdata/markdown/table-HeaderFromTFFile.golden @@ -35,6 +35,7 @@ esse cillum dolore eu fugiat nulla pariatur. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-HeaderFromTXTFile.golden b/internal/format/testdata/markdown/table-HeaderFromTXTFile.golden index 9ac8cae..51d1bf2 100644 --- a/internal/format/testdata/markdown/table-HeaderFromTXTFile.golden +++ b/internal/format/testdata/markdown/table-HeaderFromTXTFile.golden @@ -35,6 +35,7 @@ esse cillum dolore eu fugiat nulla pariatur. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-IndentationAboveAllowed.golden b/internal/format/testdata/markdown/table-IndentationAboveAllowed.golden index b7591a3..722f405 100644 --- a/internal/format/testdata/markdown/table-IndentationAboveAllowed.golden +++ b/internal/format/testdata/markdown/table-IndentationAboveAllowed.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-IndentationBelowAllowed.golden b/internal/format/testdata/markdown/table-IndentationBelowAllowed.golden index b7591a3..722f405 100644 --- a/internal/format/testdata/markdown/table-IndentationBelowAllowed.golden +++ b/internal/format/testdata/markdown/table-IndentationBelowAllowed.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-IndentationOfFour.golden b/internal/format/testdata/markdown/table-IndentationOfFour.golden index d10dc83..99e3104 100644 --- a/internal/format/testdata/markdown/table-IndentationOfFour.golden +++ b/internal/format/testdata/markdown/table-IndentationOfFour.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-NoHeader.golden b/internal/format/testdata/markdown/table-NoHeader.golden index 771f355..b50612e 100644 --- a/internal/format/testdata/markdown/table-NoHeader.golden +++ b/internal/format/testdata/markdown/table-NoHeader.golden @@ -26,6 +26,7 @@ | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-NoOutputs.golden b/internal/format/testdata/markdown/table-NoOutputs.golden index 077aad7..b4723ed 100644 --- a/internal/format/testdata/markdown/table-NoOutputs.golden +++ b/internal/format/testdata/markdown/table-NoOutputs.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-NoProviders.golden b/internal/format/testdata/markdown/table-NoProviders.golden index a846d2e..183608c 100644 --- a/internal/format/testdata/markdown/table-NoProviders.golden +++ b/internal/format/testdata/markdown/table-NoProviders.golden @@ -55,6 +55,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-NoRequirements.golden b/internal/format/testdata/markdown/table-NoRequirements.golden index fdebbfd..65e42a1 100644 --- a/internal/format/testdata/markdown/table-NoRequirements.golden +++ b/internal/format/testdata/markdown/table-NoRequirements.golden @@ -56,6 +56,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-OnlyInputs.golden b/internal/format/testdata/markdown/table-OnlyInputs.golden index 8d597a5..3a4526b 100644 --- a/internal/format/testdata/markdown/table-OnlyInputs.golden +++ b/internal/format/testdata/markdown/table-OnlyInputs.golden @@ -9,6 +9,7 @@ | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-OutputValues.golden b/internal/format/testdata/markdown/table-OutputValues.golden index 77c1b4d..6633a19 100644 --- a/internal/format/testdata/markdown/table-OutputValues.golden +++ b/internal/format/testdata/markdown/table-OutputValues.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-OutputValuesNoSensitivity.golden b/internal/format/testdata/markdown/table-OutputValuesNoSensitivity.golden index df1f776..5509f0f 100644 --- a/internal/format/testdata/markdown/table-OutputValuesNoSensitivity.golden +++ b/internal/format/testdata/markdown/table-OutputValuesNoSensitivity.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/markdown/table-SortByName.golden b/internal/format/testdata/markdown/table-SortByName.golden index 2c7a36b..0e5eaac 100644 --- a/internal/format/testdata/markdown/table-SortByName.golden +++ b/internal/format/testdata/markdown/table-SortByName.golden @@ -82,6 +82,7 @@ followed by another line of text. | string-1 | It's string number one. | `string` | `"bar"` | | string-2 | It's string number two. | `string` | n/a | | string-3 | n/a | `string` | `""` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | string_default_empty | n/a | `string` | `""` | | string_default_null | n/a | `string` | `null` | | string_no_default | n/a | `string` | n/a | diff --git a/internal/format/testdata/markdown/table-SortByRequired.golden b/internal/format/testdata/markdown/table-SortByRequired.golden index 0331fbd..2e69dbc 100644 --- a/internal/format/testdata/markdown/table-SortByRequired.golden +++ b/internal/format/testdata/markdown/table-SortByRequired.golden @@ -84,6 +84,7 @@ followed by another line of text. | object_default_empty | n/a | `object({})` | `{}` | | string-1 | It's string number one. | `string` | `"bar"` | | string-3 | n/a | `string` | `""` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | string_default_empty | n/a | `string` | `""` | | string_default_null | n/a | `string` | `null` | | with-url | The description contains url. https://www.domain.com/foo/bar_baz.html | `string` | `""` | diff --git a/internal/format/testdata/markdown/table-SortByType.golden b/internal/format/testdata/markdown/table-SortByType.golden index 990a24e..7834df8 100644 --- a/internal/format/testdata/markdown/table-SortByType.golden +++ b/internal/format/testdata/markdown/table-SortByType.golden @@ -83,6 +83,7 @@ followed by another line of text. | string-1 | It's string number one. | `string` | `"bar"` | | string-2 | It's string number two. | `string` | n/a | | string-3 | n/a | `string` | `""` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | string_default_empty | n/a | `string` | `""` | | string_default_null | n/a | `string` | `null` | | string_no_default | n/a | `string` | n/a | diff --git a/internal/format/testdata/markdown/table-WithRequired.golden b/internal/format/testdata/markdown/table-WithRequired.golden index 3a9a0ae..eeddeb9 100644 --- a/internal/format/testdata/markdown/table-WithRequired.golden +++ b/internal/format/testdata/markdown/table-WithRequired.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | no | | string-2 | It's string number two. | `string` | n/a | yes | | string-1 | It's string number one. | `string` | `"bar"` | no | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | no | | number-3 | n/a | `number` | `"19"` | no | | number-4 | n/a | `number` | `15.75` | no | | number-2 | It's number number two. | `number` | n/a | yes | diff --git a/internal/format/testdata/markdown/table.golden b/internal/format/testdata/markdown/table.golden index b7591a3..722f405 100644 --- a/internal/format/testdata/markdown/table.golden +++ b/internal/format/testdata/markdown/table.golden @@ -64,6 +64,7 @@ followed by another line of text. | string-3 | n/a | `string` | `""` | | string-2 | It's string number two. | `string` | n/a | | string-1 | It's string number one. | `string` | `"bar"` | +| string-special-chars | n/a | `string` | `"\\.<>[]{}_-"` | | number-3 | n/a | `number` | `"19"` | | number-4 | n/a | `number` | `15.75` | | number-2 | It's number number two. | `number` | n/a | diff --git a/internal/format/testdata/pretty/pretty-HeaderFromADOCFile.golden b/internal/format/testdata/pretty/pretty-HeaderFromADOCFile.golden index 3ce0c1b..2e1964d 100644 --- a/internal/format/testdata/pretty/pretty-HeaderFromADOCFile.golden +++ b/internal/format/testdata/pretty/pretty-HeaderFromADOCFile.golden @@ -51,6 +51,9 @@ esse cillum dolore eu fugiat nulla pariatur. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-HeaderFromMDFile.golden b/internal/format/testdata/pretty/pretty-HeaderFromMDFile.golden index 37c27d3..1e074ef 100644 --- a/internal/format/testdata/pretty/pretty-HeaderFromMDFile.golden +++ b/internal/format/testdata/pretty/pretty-HeaderFromMDFile.golden @@ -51,6 +51,9 @@ esse cillum dolore eu fugiat nulla pariatur. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-HeaderFromTFFile.golden b/internal/format/testdata/pretty/pretty-HeaderFromTFFile.golden index e45f254..b60187b 100644 --- a/internal/format/testdata/pretty/pretty-HeaderFromTFFile.golden +++ b/internal/format/testdata/pretty/pretty-HeaderFromTFFile.golden @@ -50,6 +50,9 @@ esse cillum dolore eu fugiat nulla pariatur. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-HeaderFromTXTFile.golden b/internal/format/testdata/pretty/pretty-HeaderFromTXTFile.golden index 2ba53ee..de7429b 100644 --- a/internal/format/testdata/pretty/pretty-HeaderFromTXTFile.golden +++ b/internal/format/testdata/pretty/pretty-HeaderFromTXTFile.golden @@ -51,6 +51,9 @@ esse cillum dolore eu fugiat nulla pariatur. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-NoColor.golden b/internal/format/testdata/pretty/pretty-NoColor.golden index 2e44d7b..612e24a 100644 --- a/internal/format/testdata/pretty/pretty-NoColor.golden +++ b/internal/format/testdata/pretty/pretty-NoColor.golden @@ -79,6 +79,9 @@ It's string number two. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-NoHeader.golden b/internal/format/testdata/pretty/pretty-NoHeader.golden index d71e7c6..24f57f3 100644 --- a/internal/format/testdata/pretty/pretty-NoHeader.golden +++ b/internal/format/testdata/pretty/pretty-NoHeader.golden @@ -39,6 +39,9 @@ input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-NoOutputs.golden b/internal/format/testdata/pretty/pretty-NoOutputs.golden index d69aad6..45a2da5 100644 --- a/internal/format/testdata/pretty/pretty-NoOutputs.golden +++ b/internal/format/testdata/pretty/pretty-NoOutputs.golden @@ -79,6 +79,9 @@ followed by another line of text. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-NoProviders.golden b/internal/format/testdata/pretty/pretty-NoProviders.golden index eab2c8c..dcecb5e 100644 --- a/internal/format/testdata/pretty/pretty-NoProviders.golden +++ b/internal/format/testdata/pretty/pretty-NoProviders.golden @@ -69,6 +69,9 @@ followed by another line of text. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-NoRequirements.golden b/internal/format/testdata/pretty/pretty-NoRequirements.golden index 2d097a1..157f961 100644 --- a/internal/format/testdata/pretty/pretty-NoRequirements.golden +++ b/internal/format/testdata/pretty/pretty-NoRequirements.golden @@ -71,6 +71,9 @@ followed by another line of text. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-OnlyInputs.golden b/internal/format/testdata/pretty/pretty-OnlyInputs.golden index 466849b..3d0c5e7 100644 --- a/internal/format/testdata/pretty/pretty-OnlyInputs.golden +++ b/internal/format/testdata/pretty/pretty-OnlyInputs.golden @@ -21,6 +21,9 @@ input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-OutputValues.golden b/internal/format/testdata/pretty/pretty-OutputValues.golden index da2a4dd..49f9214 100644 --- a/internal/format/testdata/pretty/pretty-OutputValues.golden +++ b/internal/format/testdata/pretty/pretty-OutputValues.golden @@ -79,6 +79,9 @@ followed by another line of text. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/pretty/pretty-SortByName.golden b/internal/format/testdata/pretty/pretty-SortByName.golden index e786254..e34a422 100644 --- a/internal/format/testdata/pretty/pretty-SortByName.golden +++ b/internal/format/testdata/pretty/pretty-SortByName.golden @@ -166,6 +166,9 @@ It spans over multiple lines. input.string-3 ("") n/a +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.string_default_empty ("") n/a diff --git a/internal/format/testdata/pretty/pretty-SortByRequired.golden b/internal/format/testdata/pretty/pretty-SortByRequired.golden index 0b687b9..45b2754 100644 --- a/internal/format/testdata/pretty/pretty-SortByRequired.golden +++ b/internal/format/testdata/pretty/pretty-SortByRequired.golden @@ -172,6 +172,9 @@ It spans over multiple lines. input.string-3 ("") n/a +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.string_default_empty ("") n/a diff --git a/internal/format/testdata/pretty/pretty-SortByType.golden b/internal/format/testdata/pretty/pretty-SortByType.golden index be01675..200af90 100644 --- a/internal/format/testdata/pretty/pretty-SortByType.golden +++ b/internal/format/testdata/pretty/pretty-SortByType.golden @@ -169,6 +169,9 @@ It spans over multiple lines. input.string-3 ("") n/a +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.string_default_empty ("") n/a diff --git a/internal/format/testdata/pretty/pretty.golden b/internal/format/testdata/pretty/pretty.golden index d1b70cc..b2bea70 100644 --- a/internal/format/testdata/pretty/pretty.golden +++ b/internal/format/testdata/pretty/pretty.golden @@ -79,6 +79,9 @@ followed by another line of text. input.string-1 ("bar") It's string number one. +input.string-special-chars ("\\.<>[]{}_-") +n/a + input.number-3 ("19") n/a diff --git a/internal/format/testdata/tfvars/hcl-EscapeCharacters.golden b/internal/format/testdata/tfvars/hcl-EscapeCharacters.golden index 1e272d1..8976651 100644 --- a/internal/format/testdata/tfvars/hcl-EscapeCharacters.golden +++ b/internal/format/testdata/tfvars/hcl-EscapeCharacters.golden @@ -1,16 +1,17 @@ -unquoted = "" -bool-3 = true -bool-2 = false -bool-1 = true -string-3 = "" -string-2 = "" -string-1 = "bar" -number-3 = "19" -number-4 = 15.75 -number-2 = "" -number-1 = 42 -map-3 = {} -map-2 = "" +unquoted = "" +bool-3 = true +bool-2 = false +bool-1 = true +string-3 = "" +string-2 = "" +string-1 = "bar" +string-special-chars = "\\.<>[]{}_-" +number-3 = "19" +number-4 = 15.75 +number-2 = "" +number-1 = 42 +map-3 = {} +map-2 = "" map-1 = { "a": 1, "b": 2, diff --git a/internal/format/testdata/tfvars/hcl-NoInputs.golden b/internal/format/testdata/tfvars/hcl-NoInputs.golden index 1e272d1..8976651 100644 --- a/internal/format/testdata/tfvars/hcl-NoInputs.golden +++ b/internal/format/testdata/tfvars/hcl-NoInputs.golden @@ -1,16 +1,17 @@ -unquoted = "" -bool-3 = true -bool-2 = false -bool-1 = true -string-3 = "" -string-2 = "" -string-1 = "bar" -number-3 = "19" -number-4 = 15.75 -number-2 = "" -number-1 = 42 -map-3 = {} -map-2 = "" +unquoted = "" +bool-3 = true +bool-2 = false +bool-1 = true +string-3 = "" +string-2 = "" +string-1 = "bar" +string-special-chars = "\\.<>[]{}_-" +number-3 = "19" +number-4 = 15.75 +number-2 = "" +number-1 = 42 +map-3 = {} +map-2 = "" map-1 = { "a": 1, "b": 2, diff --git a/internal/format/testdata/tfvars/hcl-SortByName.golden b/internal/format/testdata/tfvars/hcl-SortByName.golden index cfd245d..39d90e4 100644 --- a/internal/format/testdata/tfvars/hcl-SortByName.golden +++ b/internal/format/testdata/tfvars/hcl-SortByName.golden @@ -48,6 +48,7 @@ object_default_empty = {} string-1 = "bar" string-2 = "" string-3 = "" +string-special-chars = "\\.<>[]{}_-" string_default_empty = "" string_default_null = "" string_no_default = "" diff --git a/internal/format/testdata/tfvars/hcl-SortByRequired.golden b/internal/format/testdata/tfvars/hcl-SortByRequired.golden index e42238f..2b7aacf 100644 --- a/internal/format/testdata/tfvars/hcl-SortByRequired.golden +++ b/internal/format/testdata/tfvars/hcl-SortByRequired.golden @@ -50,6 +50,7 @@ number_default_zero = 0 object_default_empty = {} string-1 = "bar" string-3 = "" +string-special-chars = "\\.<>[]{}_-" string_default_empty = "" string_default_null = "" with-url = "" \ No newline at end of file diff --git a/internal/format/testdata/tfvars/hcl-SortByType.golden b/internal/format/testdata/tfvars/hcl-SortByType.golden index 3e7273d..f95d7c5 100644 --- a/internal/format/testdata/tfvars/hcl-SortByType.golden +++ b/internal/format/testdata/tfvars/hcl-SortByType.golden @@ -49,6 +49,7 @@ no-escape-default-value = "VALUE_WITH_UNDERSCORE" string-1 = "bar" string-2 = "" string-3 = "" +string-special-chars = "\\.<>[]{}_-" string_default_empty = "" string_default_null = "" string_no_default = "" diff --git a/internal/format/testdata/tfvars/hcl.golden b/internal/format/testdata/tfvars/hcl.golden index 1e272d1..8976651 100644 --- a/internal/format/testdata/tfvars/hcl.golden +++ b/internal/format/testdata/tfvars/hcl.golden @@ -1,16 +1,17 @@ -unquoted = "" -bool-3 = true -bool-2 = false -bool-1 = true -string-3 = "" -string-2 = "" -string-1 = "bar" -number-3 = "19" -number-4 = 15.75 -number-2 = "" -number-1 = 42 -map-3 = {} -map-2 = "" +unquoted = "" +bool-3 = true +bool-2 = false +bool-1 = true +string-3 = "" +string-2 = "" +string-1 = "bar" +string-special-chars = "\\.<>[]{}_-" +number-3 = "19" +number-4 = 15.75 +number-2 = "" +number-1 = 42 +map-3 = {} +map-2 = "" map-1 = { "a": 1, "b": 2, diff --git a/internal/format/testdata/tfvars/json-EscapeCharacters.golden b/internal/format/testdata/tfvars/json-EscapeCharacters.golden index 1c93456..a2d59e9 100644 --- a/internal/format/testdata/tfvars/json-EscapeCharacters.golden +++ b/internal/format/testdata/tfvars/json-EscapeCharacters.golden @@ -6,6 +6,7 @@ "string-3": "", "string-2": null, "string-1": "bar", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "number-3": "19", "number-4": 15.75, "number-2": null, diff --git a/internal/format/testdata/tfvars/json-NoInputs.golden b/internal/format/testdata/tfvars/json-NoInputs.golden index 1c93456..a2d59e9 100644 --- a/internal/format/testdata/tfvars/json-NoInputs.golden +++ b/internal/format/testdata/tfvars/json-NoInputs.golden @@ -6,6 +6,7 @@ "string-3": "", "string-2": null, "string-1": "bar", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "number-3": "19", "number-4": 15.75, "number-2": null, diff --git a/internal/format/testdata/tfvars/json-SortByName.golden b/internal/format/testdata/tfvars/json-SortByName.golden index 45c6f26..3f03819 100644 --- a/internal/format/testdata/tfvars/json-SortByName.golden +++ b/internal/format/testdata/tfvars/json-SortByName.golden @@ -49,6 +49,7 @@ "string-1": "bar", "string-2": null, "string-3": "", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "string_default_empty": "", "string_default_null": null, "string_no_default": null, diff --git a/internal/format/testdata/tfvars/json-SortByRequired.golden b/internal/format/testdata/tfvars/json-SortByRequired.golden index 1121b7c..5529e1f 100644 --- a/internal/format/testdata/tfvars/json-SortByRequired.golden +++ b/internal/format/testdata/tfvars/json-SortByRequired.golden @@ -51,6 +51,7 @@ "object_default_empty": {}, "string-1": "bar", "string-3": "", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "string_default_empty": "", "string_default_null": null, "with-url": "" diff --git a/internal/format/testdata/tfvars/json-SortByType.golden b/internal/format/testdata/tfvars/json-SortByType.golden index 263b4c7..a3ef61f 100644 --- a/internal/format/testdata/tfvars/json-SortByType.golden +++ b/internal/format/testdata/tfvars/json-SortByType.golden @@ -50,6 +50,7 @@ "string-1": "bar", "string-2": null, "string-3": "", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "string_default_empty": "", "string_default_null": null, "string_no_default": null, diff --git a/internal/format/testdata/tfvars/json.golden b/internal/format/testdata/tfvars/json.golden index 1c93456..a2d59e9 100644 --- a/internal/format/testdata/tfvars/json.golden +++ b/internal/format/testdata/tfvars/json.golden @@ -6,6 +6,7 @@ "string-3": "", "string-2": null, "string-1": "bar", + "string-special-chars": "\\.\u003c\u003e[]{}_-", "number-3": "19", "number-4": 15.75, "number-2": null, diff --git a/internal/format/testdata/toml/toml-HeaderFromFile.golden b/internal/format/testdata/toml/toml-HeaderFromFile.golden index 5adba35..c21de3b 100644 --- a/internal/format/testdata/toml/toml-HeaderFromFile.golden +++ b/internal/format/testdata/toml/toml-HeaderFromFile.golden @@ -49,6 +49,13 @@ header = "This header comes from a custom file\n\nLorem ipsum dolor sit amet, co default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-NoHeader.golden b/internal/format/testdata/toml/toml-NoHeader.golden index e4bb941..5fe523b 100644 --- a/internal/format/testdata/toml/toml-NoHeader.golden +++ b/internal/format/testdata/toml/toml-NoHeader.golden @@ -49,6 +49,13 @@ header = "" default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-NoOutputs.golden b/internal/format/testdata/toml/toml-NoOutputs.golden index 75db73b..2d00c1e 100644 --- a/internal/format/testdata/toml/toml-NoOutputs.golden +++ b/internal/format/testdata/toml/toml-NoOutputs.golden @@ -50,6 +50,13 @@ outputs = [] default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-NoProviders.golden b/internal/format/testdata/toml/toml-NoProviders.golden index d2ee00b..508e0e6 100644 --- a/internal/format/testdata/toml/toml-NoProviders.golden +++ b/internal/format/testdata/toml/toml-NoProviders.golden @@ -50,6 +50,13 @@ providers = [] default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-NoRequirements.golden b/internal/format/testdata/toml/toml-NoRequirements.golden index 4c9b8af..650dac0 100644 --- a/internal/format/testdata/toml/toml-NoRequirements.golden +++ b/internal/format/testdata/toml/toml-NoRequirements.golden @@ -50,6 +50,13 @@ requirements = [] default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-OnlyInputs.golden b/internal/format/testdata/toml/toml-OnlyInputs.golden index d72fda6..2d9de50 100644 --- a/internal/format/testdata/toml/toml-OnlyInputs.golden +++ b/internal/format/testdata/toml/toml-OnlyInputs.golden @@ -52,6 +52,13 @@ requirements = [] default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-OutputValues.golden b/internal/format/testdata/toml/toml-OutputValues.golden index 942fb11..0d8e5d9 100644 --- a/internal/format/testdata/toml/toml-OutputValues.golden +++ b/internal/format/testdata/toml/toml-OutputValues.golden @@ -49,6 +49,13 @@ header = "Usage:\n\nExample of 'foo_bar' module in `foo_bar.tf`.\n\n- list item default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/toml/toml-SortByName.golden b/internal/format/testdata/toml/toml-SortByName.golden index 59343f7..bae0dee 100644 --- a/internal/format/testdata/toml/toml-SortByName.golden +++ b/internal/format/testdata/toml/toml-SortByName.golden @@ -187,6 +187,13 @@ header = "Usage:\n\nExample of 'foo_bar' module in `foo_bar.tf`.\n\n- list item default = "" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "string_default_empty" type = "string" diff --git a/internal/format/testdata/toml/toml-SortByRequired.golden b/internal/format/testdata/toml/toml-SortByRequired.golden index 1b4fc04..1666bbf 100644 --- a/internal/format/testdata/toml/toml-SortByRequired.golden +++ b/internal/format/testdata/toml/toml-SortByRequired.golden @@ -201,6 +201,13 @@ header = "Usage:\n\nExample of 'foo_bar' module in `foo_bar.tf`.\n\n- list item default = "" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "string_default_empty" type = "string" diff --git a/internal/format/testdata/toml/toml-SortByType.golden b/internal/format/testdata/toml/toml-SortByType.golden index 6e9ea14..67180d1 100644 --- a/internal/format/testdata/toml/toml-SortByType.golden +++ b/internal/format/testdata/toml/toml-SortByType.golden @@ -194,6 +194,13 @@ header = "Usage:\n\nExample of 'foo_bar' module in `foo_bar.tf`.\n\n- list item default = "" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "string_default_empty" type = "string" diff --git a/internal/format/testdata/toml/toml.golden b/internal/format/testdata/toml/toml.golden index 0c21dd7..f7e41b9 100644 --- a/internal/format/testdata/toml/toml.golden +++ b/internal/format/testdata/toml/toml.golden @@ -49,6 +49,13 @@ header = "Usage:\n\nExample of 'foo_bar' module in `foo_bar.tf`.\n\n- list item default = "bar" required = false +[[inputs]] + name = "string-special-chars" + type = "string" + description = "" + default = "\\.<>[]{}_-" + required = false + [[inputs]] name = "number-3" type = "number" diff --git a/internal/format/testdata/xml/xml-HeaderFromADOCFile.golden b/internal/format/testdata/xml/xml-HeaderFromADOCFile.golden index 6d48fbe..b834b5d 100644 --- a/internal/format/testdata/xml/xml-HeaderFromADOCFile.golden +++ b/internal/format/testdata/xml/xml-HeaderFromADOCFile.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-HeaderFromMDFile.golden b/internal/format/testdata/xml/xml-HeaderFromMDFile.golden index b7b3b44..2ad91a4 100644 --- a/internal/format/testdata/xml/xml-HeaderFromMDFile.golden +++ b/internal/format/testdata/xml/xml-HeaderFromMDFile.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-HeaderFromTFFile.golden b/internal/format/testdata/xml/xml-HeaderFromTFFile.golden index e1d0121..f472ddf 100644 --- a/internal/format/testdata/xml/xml-HeaderFromTFFile.golden +++ b/internal/format/testdata/xml/xml-HeaderFromTFFile.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-HeaderFromTXTFile.golden b/internal/format/testdata/xml/xml-HeaderFromTXTFile.golden index d45f894..7889c42 100644 --- a/internal/format/testdata/xml/xml-HeaderFromTXTFile.golden +++ b/internal/format/testdata/xml/xml-HeaderFromTXTFile.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-NoHeader.golden b/internal/format/testdata/xml/xml-NoHeader.golden index 7d73663..e72e971 100644 --- a/internal/format/testdata/xml/xml-NoHeader.golden +++ b/internal/format/testdata/xml/xml-NoHeader.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-NoOutputs.golden b/internal/format/testdata/xml/xml-NoOutputs.golden index d9d4287..6f181df 100644 --- a/internal/format/testdata/xml/xml-NoOutputs.golden +++ b/internal/format/testdata/xml/xml-NoOutputs.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-NoProviders.golden b/internal/format/testdata/xml/xml-NoProviders.golden index f9c7d3d..84d73f1 100644 --- a/internal/format/testdata/xml/xml-NoProviders.golden +++ b/internal/format/testdata/xml/xml-NoProviders.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-NoRequirements.golden b/internal/format/testdata/xml/xml-NoRequirements.golden index b59d436..2076a18 100644 --- a/internal/format/testdata/xml/xml-NoRequirements.golden +++ b/internal/format/testdata/xml/xml-NoRequirements.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-OnlyInputs.golden b/internal/format/testdata/xml/xml-OnlyInputs.golden index 74f25cb..4147b2d 100644 --- a/internal/format/testdata/xml/xml-OnlyInputs.golden +++ b/internal/format/testdata/xml/xml-OnlyInputs.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-OutputValues.golden b/internal/format/testdata/xml/xml-OutputValues.golden index 2dd6a7b..8fa7b55 100644 --- a/internal/format/testdata/xml/xml-OutputValues.golden +++ b/internal/format/testdata/xml/xml-OutputValues.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/xml/xml-SortByName.golden b/internal/format/testdata/xml/xml-SortByName.golden index 846ef31..843383f 100644 --- a/internal/format/testdata/xml/xml-SortByName.golden +++ b/internal/format/testdata/xml/xml-SortByName.golden @@ -201,6 +201,13 @@ false + + string-special-chars + string + + \.<>[]{}_- + false + string_default_empty string diff --git a/internal/format/testdata/xml/xml-SortByRequired.golden b/internal/format/testdata/xml/xml-SortByRequired.golden index 3462dee..e8c30f0 100644 --- a/internal/format/testdata/xml/xml-SortByRequired.golden +++ b/internal/format/testdata/xml/xml-SortByRequired.golden @@ -215,6 +215,13 @@ false + + string-special-chars + string + + \.<>[]{}_- + false + string_default_empty string diff --git a/internal/format/testdata/xml/xml-SortByType.golden b/internal/format/testdata/xml/xml-SortByType.golden index 7840baf..4b83b85 100644 --- a/internal/format/testdata/xml/xml-SortByType.golden +++ b/internal/format/testdata/xml/xml-SortByType.golden @@ -208,6 +208,13 @@ false + + string-special-chars + string + + \.<>[]{}_- + false + string_default_empty string diff --git a/internal/format/testdata/xml/xml.golden b/internal/format/testdata/xml/xml.golden index 6c92f30..26fac96 100644 --- a/internal/format/testdata/xml/xml.golden +++ b/internal/format/testdata/xml/xml.golden @@ -50,6 +50,13 @@ bar false + + string-special-chars + string + + \.<>[]{}_- + false + number-3 number diff --git a/internal/format/testdata/yaml/yaml-HeaderFromADOCFile.golden b/internal/format/testdata/yaml/yaml-HeaderFromADOCFile.golden index d5ce21a..9fcfcb0 100644 --- a/internal/format/testdata/yaml/yaml-HeaderFromADOCFile.golden +++ b/internal/format/testdata/yaml/yaml-HeaderFromADOCFile.golden @@ -43,6 +43,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-HeaderFromMDFile.golden b/internal/format/testdata/yaml/yaml-HeaderFromMDFile.golden index 06d4521..cdcf8f6 100644 --- a/internal/format/testdata/yaml/yaml-HeaderFromMDFile.golden +++ b/internal/format/testdata/yaml/yaml-HeaderFromMDFile.golden @@ -43,6 +43,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-HeaderFromTFFile.golden b/internal/format/testdata/yaml/yaml-HeaderFromTFFile.golden index affe8bb..e54dcbc 100644 --- a/internal/format/testdata/yaml/yaml-HeaderFromTFFile.golden +++ b/internal/format/testdata/yaml/yaml-HeaderFromTFFile.golden @@ -43,6 +43,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-HeaderFromTXTFile.golden b/internal/format/testdata/yaml/yaml-HeaderFromTXTFile.golden index d56dee1..3e0a2a1 100644 --- a/internal/format/testdata/yaml/yaml-HeaderFromTXTFile.golden +++ b/internal/format/testdata/yaml/yaml-HeaderFromTXTFile.golden @@ -43,6 +43,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-NoHeader.golden b/internal/format/testdata/yaml/yaml-NoHeader.golden index 2be0a12..e50bc72 100644 --- a/internal/format/testdata/yaml/yaml-NoHeader.golden +++ b/internal/format/testdata/yaml/yaml-NoHeader.golden @@ -35,6 +35,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-NoOutputs.golden b/internal/format/testdata/yaml/yaml-NoOutputs.golden index 4ed3371..ce81b76 100644 --- a/internal/format/testdata/yaml/yaml-NoOutputs.golden +++ b/internal/format/testdata/yaml/yaml-NoOutputs.golden @@ -72,6 +72,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-NoProviders.golden b/internal/format/testdata/yaml/yaml-NoProviders.golden index 9ee6558..0226b2a 100644 --- a/internal/format/testdata/yaml/yaml-NoProviders.golden +++ b/internal/format/testdata/yaml/yaml-NoProviders.golden @@ -72,6 +72,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-NoRequirements.golden b/internal/format/testdata/yaml/yaml-NoRequirements.golden index f0867de..95000e4 100644 --- a/internal/format/testdata/yaml/yaml-NoRequirements.golden +++ b/internal/format/testdata/yaml/yaml-NoRequirements.golden @@ -72,6 +72,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-OnlyInputs.golden b/internal/format/testdata/yaml/yaml-OnlyInputs.golden index da4bd84..faafc1b 100644 --- a/internal/format/testdata/yaml/yaml-OnlyInputs.golden +++ b/internal/format/testdata/yaml/yaml-OnlyInputs.golden @@ -35,6 +35,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-OutputValues.golden b/internal/format/testdata/yaml/yaml-OutputValues.golden index 2e64ab0..a6d2feb 100644 --- a/internal/format/testdata/yaml/yaml-OutputValues.golden +++ b/internal/format/testdata/yaml/yaml-OutputValues.golden @@ -72,6 +72,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/format/testdata/yaml/yaml-SortByName.golden b/internal/format/testdata/yaml/yaml-SortByName.golden index 388cac3..905ab32 100644 --- a/internal/format/testdata/yaml/yaml-SortByName.golden +++ b/internal/format/testdata/yaml/yaml-SortByName.golden @@ -190,6 +190,11 @@ inputs: description: null default: "" required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: string_default_empty type: string description: null diff --git a/internal/format/testdata/yaml/yaml-SortByRequired.golden b/internal/format/testdata/yaml/yaml-SortByRequired.golden index 533d9f5..35cf861 100644 --- a/internal/format/testdata/yaml/yaml-SortByRequired.golden +++ b/internal/format/testdata/yaml/yaml-SortByRequired.golden @@ -200,6 +200,11 @@ inputs: description: null default: "" required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: string_default_empty type: string description: null diff --git a/internal/format/testdata/yaml/yaml-SortByType.golden b/internal/format/testdata/yaml/yaml-SortByType.golden index 3a2ab32..f652114 100644 --- a/internal/format/testdata/yaml/yaml-SortByType.golden +++ b/internal/format/testdata/yaml/yaml-SortByType.golden @@ -195,6 +195,11 @@ inputs: description: null default: "" required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: string_default_empty type: string description: null diff --git a/internal/format/testdata/yaml/yaml.golden b/internal/format/testdata/yaml/yaml.golden index 2bdd9f1..dbc64a3 100644 --- a/internal/format/testdata/yaml/yaml.golden +++ b/internal/format/testdata/yaml/yaml.golden @@ -72,6 +72,11 @@ inputs: description: It's string number one. default: bar required: false + - name: string-special-chars + type: string + description: null + default: \.<>[]{}_- + required: false - name: number-3 type: number description: null diff --git a/internal/tfconfig/testdata/complex-variables/complex-variables.out.json b/internal/tfconfig/testdata/complex-variables/complex-variables.out.json new file mode 100644 index 0000000..0f75672 --- /dev/null +++ b/internal/tfconfig/testdata/complex-variables/complex-variables.out.json @@ -0,0 +1,19 @@ +{ + "path": "testdata/complex-variables", + "variables": { + "special_chars": { + "name": "special_chars", + "default": "\\.<>[]{}_-", + "required": false, + "pos": { + "filename": "testdata/complex-variables/complex.tf", + "line": 1 + } + } + }, + "outputs": {}, + "required_providers": {}, + "managed_resources": {}, + "data_resources": {}, + "module_calls": {} +} \ No newline at end of file diff --git a/internal/tfconfig/testdata/complex-variables/complex-variables.out.md b/internal/tfconfig/testdata/complex-variables/complex-variables.out.md new file mode 100644 index 0000000..29d76dd --- /dev/null +++ b/internal/tfconfig/testdata/complex-variables/complex-variables.out.md @@ -0,0 +1,6 @@ + +# Module `testdata/complex-variables` + +## Input Variables + +* `special_chars` (default `"\\.<>[]{}_-"`) diff --git a/internal/tfconfig/testdata/complex-variables/complex.tf b/internal/tfconfig/testdata/complex-variables/complex.tf new file mode 100644 index 0000000..2984450 --- /dev/null +++ b/internal/tfconfig/testdata/complex-variables/complex.tf @@ -0,0 +1,3 @@ +variable "special_chars" { + default = "\\.<>[]{}_-" +} \ No newline at end of file diff --git a/internal/types/string_test.go b/internal/types/string_test.go index 72639b4..ea08cef 100644 --- a/internal/types/string_test.go +++ b/internal/types/string_test.go @@ -125,6 +125,11 @@ func TestStringMarshalJSON(t *testing.T) { value: "lorem ipsum\ndolor", expected: "\"lorem ipsum\\ndolor\"", }, + { + name: "string marshal a regex", + value: "\\.<>[]{}_-", + expected: "\"\\\\.<>[]{}_-\"", + }, { name: "string marshal JSON", value: "", diff --git a/internal/types/types.go b/internal/types/types.go index 6c24853..856ca9c 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -2,11 +2,11 @@ package types import ( "bytes" + "encoding/json" "encoding/xml" "go/types" "reflect" "sort" - "strings" ) // Value is a default value of an input or output. @@ -129,10 +129,12 @@ func (s String) MarshalJSON() ([]byte, error) { if len(string(s)) == 0 { buf.WriteString(`null`) } else { - normalize := string(s) - normalize = strings.Replace(normalize, "\n", "\\n", -1) - normalize = strings.Replace(normalize, "\"", "\\\"", -1) - buf.WriteString(`"` + normalize + `"`) // add double quation mark as json format required + encoder := json.NewEncoder(&buf) + encoder.SetEscapeHTML(false) + if err := encoder.Encode(string(s)); err != nil { + return nil, err + } + buf.Truncate(buf.Len() - 1) // The json encoder adds a newline, this is not configurable } return buf.Bytes(), nil } diff --git a/pkg/tfconf/input.go b/pkg/tfconf/input.go index f493f7b..ee0e1d6 100644 --- a/pkg/tfconf/input.go +++ b/pkg/tfconf/input.go @@ -1,7 +1,9 @@ package tfconf import ( + "bytes" "encoding/json" + "strings" "github.com/terraform-docs/terraform-docs/internal/types" ) @@ -20,11 +22,15 @@ type Input struct { // If 'Default' is a primitive type, the primitive value of 'Default' will be returned // and not the JSON formatted of it. func (i *Input) GetValue() string { - marshaled, err := json.MarshalIndent(i.Default, "", " ") + var buf bytes.Buffer + encoder := json.NewEncoder(&buf) + encoder.SetIndent("", " ") + encoder.SetEscapeHTML(false) + err := encoder.Encode(i.Default) if err != nil { panic(err) } - value := string(marshaled) + value := strings.TrimSpace(buf.String()) if value == `null` { if i.Required { return ""