Merge pull request #3 from terraform-providers/vendor-tf-0.10

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / hashicorp / terraform / terraform / interpolate.go

diff --git a/vendor/github.com/hashicorp/terraform/terraform/interpolate.go b/vendor/github.com/hashicorp/terraform/terraform/interpolate.go
index 0def295fa94002361aca709b9d0a8316d5ab9a29..22ddce6c836b50518532d2646f9428b458b89a8f 100644 (file)
--- a/vendor/github.com/hashicorp/terraform/terraform/interpolate.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/interpolate.go
@@ -317,9 +317,13 @@ func (i *Interpolater) valueTerraformVar(
        n string,
        v *config.TerraformVariable,
        result map[string]ast.Variable) error {
-       if v.Field != "env" {
+
+       // "env" is supported for backward compatibility, but it's deprecated and
+       // so we won't advertise it as being allowed in the error message. It will
+       // be removed in a future version of Terraform.
+       if v.Field != "workspace" && v.Field != "env" {
                return fmt.Errorf(
-                       "%s: only supported key for 'terraform.X' interpolations is 'env'", n)
+                       "%s: only supported key for 'terraform.X' interpolations is 'workspace'", n)
        }
 
        if i.Meta == nil {