Merge pull request #8634 from hashicorp/revert-8590-b-template-floats
Revert "providers/template: template_file supports floating point math"
This commit is contained in:
commit
e991ea5741
|
@ -6,7 +6,6 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/hashicorp/hil"
|
"github.com/hashicorp/hil"
|
||||||
|
@ -117,20 +116,9 @@ func execute(s string, vars map[string]interface{}) (string, error) {
|
||||||
if !ok {
|
if !ok {
|
||||||
return "", fmt.Errorf("unexpected type for variable %q: %T", k, v)
|
return "", fmt.Errorf("unexpected type for variable %q: %T", k, v)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Store the defaults (string and value)
|
|
||||||
var val interface{} = s
|
|
||||||
typ := ast.TypeString
|
|
||||||
|
|
||||||
// If we can parse a float, then use that
|
|
||||||
if v, err := strconv.ParseFloat(s, 64); err == nil {
|
|
||||||
val = v
|
|
||||||
typ = ast.TypeFloat
|
|
||||||
}
|
|
||||||
|
|
||||||
varmap[k] = ast.Variable{
|
varmap[k] = ast.Variable{
|
||||||
Value: val,
|
Value: s,
|
||||||
Type: typ,
|
Type: ast.TypeString,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,6 @@ func TestTemplateRendering(t *testing.T) {
|
||||||
{`{a="foo"}`, `$${a}`, `foo`},
|
{`{a="foo"}`, `$${a}`, `foo`},
|
||||||
{`{a="hello"}`, `$${replace(a, "ello", "i")}`, `hi`},
|
{`{a="hello"}`, `$${replace(a, "ello", "i")}`, `hi`},
|
||||||
{`{}`, `${1+2+3}`, `6`},
|
{`{}`, `${1+2+3}`, `6`},
|
||||||
{`{a=1, b=2}`, `$${a+b}`, `3`},
|
|
||||||
{`{a=0.1, b=0.2}`, `$${0+((a+b)*10)}`, `3`},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range cases {
|
for _, tt := range cases {
|
||||||
|
|
Loading…
Reference in New Issue