Merge pull request #25725 from FGtatsuro/diff_heredoc_hyphen
Use valid heredoc begin symbol in diff output.
This commit is contained in:
commit
eb873f5021
|
@ -885,7 +885,7 @@ func (p *blockBodyDiffPrinter) writeValueDiff(old, new cty.Value, indent int, pa
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
p.buf.WriteString("<<~EOT")
|
p.buf.WriteString("<<-EOT")
|
||||||
if p.pathForcesNewResource(path) {
|
if p.pathForcesNewResource(path) {
|
||||||
p.buf.WriteString(p.color.Color(forcesNewResourceCaption))
|
p.buf.WriteString(p.color.Color(forcesNewResourceCaption))
|
||||||
}
|
}
|
||||||
|
|
|
@ -232,7 +232,7 @@ field
|
||||||
ExpectedOutput: ` # test_instance.example will be updated in-place
|
ExpectedOutput: ` # test_instance.example will be updated in-place
|
||||||
~ resource "test_instance" "example" {
|
~ resource "test_instance" "example" {
|
||||||
~ id = "i-02ae66f368e8518a9" -> (known after apply)
|
~ id = "i-02ae66f368e8518a9" -> (known after apply)
|
||||||
~ more_lines = <<~EOT
|
~ more_lines = <<-EOT
|
||||||
original
|
original
|
||||||
- long
|
- long
|
||||||
+ extremely long
|
+ extremely long
|
||||||
|
@ -267,7 +267,7 @@ new line
|
||||||
ExpectedOutput: ` # test_instance.example will be updated in-place
|
ExpectedOutput: ` # test_instance.example will be updated in-place
|
||||||
~ resource "test_instance" "example" {
|
~ resource "test_instance" "example" {
|
||||||
~ id = "i-02ae66f368e8518a9" -> (known after apply)
|
~ id = "i-02ae66f368e8518a9" -> (known after apply)
|
||||||
+ more_lines = <<~EOT
|
+ more_lines = <<-EOT
|
||||||
original
|
original
|
||||||
new line
|
new line
|
||||||
EOT
|
EOT
|
||||||
|
@ -301,7 +301,7 @@ new line
|
||||||
ExpectedOutput: ` # test_instance.example must be replaced
|
ExpectedOutput: ` # test_instance.example must be replaced
|
||||||
-/+ resource "test_instance" "example" {
|
-/+ resource "test_instance" "example" {
|
||||||
~ id = "i-02ae66f368e8518a9" -> (known after apply)
|
~ id = "i-02ae66f368e8518a9" -> (known after apply)
|
||||||
~ more_lines = <<~EOT # forces replacement
|
~ more_lines = <<-EOT # forces replacement
|
||||||
original
|
original
|
||||||
+ new line
|
+ new line
|
||||||
EOT
|
EOT
|
||||||
|
|
Loading…
Reference in New Issue