Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

providers/template: disallow file paths in template #10297

Merged
merged 1 commit into from
Nov 23, 2016
Merged

providers/template: disallow file paths in template #10297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions builtin/providers/template/datasource_template_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ func dataSourceFile() *schema.Resource {
Optional: true,
Description: "Contents of the template",
ConflictsWith: []string{"filename"},
ValidateFunc: validateTemplateAttribute,
},
"filename": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -82,13 +81,14 @@ func renderFile(d *schema.ResourceData) (string, error) {
filename := d.Get("filename").(string)
vars := d.Get("vars").(map[string]interface{})

contents := template
if template == "" && filename != "" {
template = filename
}
data, _, err := pathorcontents.Read(filename)
if err != nil {
return "", err
}

contents, _, err := pathorcontents.Read(template)
if err != nil {
return "", err
contents = data
}

rendered, err := execute(contents, vars)
Expand Down Expand Up @@ -145,20 +145,6 @@ func hash(s string) string {
return hex.EncodeToString(sha[:])
}

func validateTemplateAttribute(v interface{}, key string) (ws []string, es []error) {
_, wasPath, err := pathorcontents.Read(v.(string))
if err != nil {
es = append(es, err)
return
}

if wasPath {
ws = append(ws, fmt.Sprintf("%s: looks like you specified a path instead of file contents. Use `file()` to load this path. Specifying a path directly is deprecated and will be removed in a future version.", key))
}

return
}

func validateVarsAttribute(v interface{}, key string) (ws []string, es []error) {
// vars can only be primitives right now
var badVars []string
Expand Down
27 changes: 1 addition & 26 deletions builtin/providers/template/datasource_template_file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package template

import (
"fmt"
"io/ioutil"
"os"
"strings"
"sync"
"testing"
Expand All @@ -26,6 +24,7 @@ func TestTemplateRendering(t *testing.T) {
{`{a="foo"}`, `$${a}`, `foo`},
{`{a="hello"}`, `$${replace(a, "ello", "i")}`, `hi`},
{`{}`, `${1+2+3}`, `6`},
{`{}`, `/`, `/`},
}

for _, tt := range cases {
Expand All @@ -47,30 +46,6 @@ func TestTemplateRendering(t *testing.T) {
}
}

func TestValidateTemplateAttribute(t *testing.T) {
file, err := ioutil.TempFile("", "testtemplate")
if err != nil {
t.Fatal(err)
}
file.WriteString("Hello world.")
file.Close()
defer os.Remove(file.Name())

ws, es := validateTemplateAttribute(file.Name(), "test")

if len(es) != 0 {
t.Fatalf("Unexpected errors: %#v", es)
}

if len(ws) != 1 {
t.Fatalf("Expected 1 warning, got %d", len(ws))
}

if !strings.Contains(ws[0], "Specifying a path directly is deprecated") {
t.Fatalf("Expected warning about path, got: %s", ws[0])
}
}

func TestValidateVarsAttribute(t *testing.T) {
cases := map[string]struct {
Vars map[string]interface{}
Expand Down