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

Merge pull request #379 from endocode/kayrus/trim_fix

Browse Source 
cloudinit: trim trailing whitespaces in #cloud-config header
This commit is contained in:
Alex Crawford 2015-09-07 10:09:42 -07:00
commit 5f688a0a21
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/config.go
View File

@ -19,6 +19,7 @@ import (
"reflect" "reflect"
"regexp" "regexp"
"strings" "strings"
"unicode"
"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/yaml" "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/yaml"
) )
@ -49,10 +50,8 @@ type CoreOS struct {
func IsCloudConfig(userdata string) bool { func IsCloudConfig(userdata string) bool {
header := strings.SplitN(userdata, "\n", 2)[0] header := strings.SplitN(userdata, "\n", 2)[0]
// Explicitly trim the header so we can handle user-data from // Trim trailing whitespaces
// non-unix operating systems. The rest of the file is parsed header = strings.TrimRightFunc(header, unicode.IsSpace)
// by yaml, which correctly handles CRLF.
header = strings.TrimSuffix(header, "\r")
return (header == "#cloud-config") return (header == "#cloud-config")
} }

2
initialize/user_data_test.go
View File

@ -47,7 +47,7 @@ func TestParseHeaderCRLF(t *testing.T) {
} }
func TestParseConfigCRLF(t *testing.T) { func TestParseConfigCRLF(t *testing.T) {
contents := "#cloud-config\r\nhostname: foo\r\nssh_authorized_keys:\r\n - foobar\r\n" contents := "#cloud-config \r\nhostname: foo\r\nssh_authorized_keys:\r\n - foobar\r\n"
ud, err := ParseUserData(contents) ud, err := ParseUserData(contents)
if err != nil { if err != nil {
t.Fatalf("Failed parsing config: %v", err) t.Fatalf("Failed parsing config: %v", err)