unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #320 from ibuildthecloud/typo-contents

Browse Source 
Fix typo, "contents" should be "content"
This commit is contained in:
Alex Crawford 2015-02-23 10:41:55 -08:00
commit 41832ab19e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/validate/rules.go
View File

@ -57,9 +57,9 @@ func checkEncoding(cfg node, report *Report) {
continue continue
} }
c := f.Child("contents") c := f.Child("content")
if _, err := config.DecodeContent(c.String(), e.String()); err != nil { if _, err := config.DecodeContent(c.String(), e.String()); err != nil {
report.Error(c.line, fmt.Sprintf("contents cannot be decoded as %q", e.String())) report.Error(c.line, fmt.Sprintf("content cannot be decoded as %q", e.String()))
} }
} }
} }

18
config/validate/rules_test.go
View File

@ -60,27 +60,27 @@ func TestCheckEncoding(t *testing.T) {
}{ }{
{}, {},
{ {
config: "write_files:\n - encoding: base64\n contents: aGVsbG8K", config: "write_files:\n - encoding: base64\n content: aGVsbG8K",
}, },
{ {
config: "write_files:\n - contents: !!binary aGVsbG8K", config: "write_files:\n - content: !!binary aGVsbG8K",
}, },
{ {
config: "write_files:\n - encoding: base64\n contents: !!binary aGVsbG8K", config: "write_files:\n - encoding: base64\n content: !!binary aGVsbG8K",
entries: []Entry{{entryError, `contents cannot be decoded as "base64"`, 3}}, entries: []Entry{{entryError, `content cannot be decoded as "base64"`, 3}},
}, },
{ {
config: "write_files:\n - encoding: base64\n contents: !!binary YUdWc2JHOEsK", config: "write_files:\n - encoding: base64\n content: !!binary YUdWc2JHOEsK",
}, },
{ {
config: "write_files:\n - encoding: gzip\n contents: !!binary H4sIAOC3tVQAA8tIzcnJ5wIAIDA6NgYAAAA=", config: "write_files:\n - encoding: gzip\n content: !!binary H4sIAOC3tVQAA8tIzcnJ5wIAIDA6NgYAAAA=",
}, },
{ {
config: "write_files:\n - encoding: gzip+base64\n contents: H4sIAOC3tVQAA8tIzcnJ5wIAIDA6NgYAAAA=", config: "write_files:\n - encoding: gzip+base64\n content: H4sIAOC3tVQAA8tIzcnJ5wIAIDA6NgYAAAA=",
}, },
{ {
config: "write_files:\n - encoding: custom\n contents: hello", config: "write_files:\n - encoding: custom\n content: hello",
entries: []Entry{{entryError, `contents cannot be decoded as "custom"`, 3}}, entries: []Entry{{entryError, `content cannot be decoded as "custom"`, 3}},
}, },
} }