ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
terraform/configs/configupgrade/testdata/valid/heredoc-sameline/want/heredoc.tf

13 lines
206 B
Terraform
Raw Normal View History

configs/configupgrade: do not panic on HEREDOCs. (#20281) Previously, configupgrade would panic if it encountered a HEREDOC. For the time being, we will simply print out the HEREDOC as-is. Unfortunately, we discovered that terraform 0.11's version of HCL allowed for HEREDOCs with the termination delimiter inline (instead of on a newline, which is technically correct). Since 0.12configupgrade needs to be bug-compatible with terraform 0.11, we must roll back to the same version of HCL used in terraform 0.11.
2019-02-09 00:51:53 +01:00
locals {
cert_options = <<EOF
--cert-file=/etc/ssl/etcd/server.crt \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
configs/configupgrade: upgrade expressions inside heredocs HEREDOC tokens are a little more fussy than normal string sequences because we need to preserve the whitespace within them along with the start and end markers while we upgrade any interpolated expressions inside. We need to do some work locally here because the HCL heredoc processing "does too much" and throws away information we need to do a faithful upgrade. We also need to contend with the fact that Terraform <=0.11 had an older version of HCL that accidentally permitted a degenerate form of heredoc where the marker was at the end of the final line, like this: degenerate = <<EOT this should never have workedEOT When we migrate this, we'll introduce the additional newline that is now required, which will unfortunately slightly change the result string to include a newline when parsed by 0.12, and so we'll need to call this out as a caveat in the upgrade guide.
2019-02-20 20:53:56 +01:00
--peer-client-cert-auth=true
EOF
configs/configupgrade: do not panic on HEREDOCs. (#20281) Previously, configupgrade would panic if it encountered a HEREDOC. For the time being, we will simply print out the HEREDOC as-is. Unfortunately, we discovered that terraform 0.11's version of HCL allowed for HEREDOCs with the termination delimiter inline (instead of on a newline, which is technically correct). Since 0.12configupgrade needs to be bug-compatible with terraform 0.11, we must roll back to the same version of HCL used in terraform 0.11.
2019-02-09 00:51:53 +01:00
}
output "local" {
vendor: go get github.com/hashicorp/hcl2@master This includes two upstream fixes: - Handle explicit JSON "null" consistently during decode of JSON syntax. - Properly detect the end of a "heredoc" when formatting to avoid messing up indentation of other lines following the heredoc.
2019-03-15 21:29:25 +01:00
value = local.cert_options
configs/configupgrade: do not panic on HEREDOCs. (#20281) Previously, configupgrade would panic if it encountered a HEREDOC. For the time being, we will simply print out the HEREDOC as-is. Unfortunately, we discovered that terraform 0.11's version of HCL allowed for HEREDOCs with the termination delimiter inline (instead of on a newline, which is technically correct). Since 0.12configupgrade needs to be bug-compatible with terraform 0.11, we must roll back to the same version of HCL used in terraform 0.11.
2019-02-09 00:51:53 +01:00
}