github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-01 15:08:33 +00:00
Code Issues Projects Releases Wiki Activity

metadata: Allow simple string keys

Browse Source 
If a file is a simple string (as opposed to a map) then write it with the
default perms. This makes for slightly terser metadata when creating a simple
datafile.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell
2017-05-09 23:52:04 +01:00
parent 8fd1a3cbdb
commit 800badea42
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/metadata/main.go
View File

@@ -167,25 +167,31 @@ func processUserData(data []byte) error {
continue
}
for f, i := range files {
fi, ok := i.(map[string]interface{})
if !ok {
p := uint64(0644)
var c string
switch fi := i.(type) {
case map[string]interface{}:
if _, ok := fi["perm"]; !ok {
log.Printf("No permission provided %s:%s", f, fi)
continue
}
if _, ok := fi["content"]; !ok {
log.Printf("No content provided %s:%s", f, fi)
continue
}
c = fi["content"].(string)
if p, err = strconv.ParseUint(fi["perm"].(string), 8, 32); err != nil {
log.Printf("Failed to parse permission %s: %s", fi, err)
continue
}
case string:
c = fi
default:
log.Printf("Couldn't convert JSON for items: %s", i)
continue
}
if _, ok := fi["perm"]; !ok {
log.Printf("No permission provided %s:%s", f, fi)
continue
}
if _, ok := fi["content"]; !ok {
log.Printf("No content provided %s:%s", f, fi)
continue
}
c := fi["content"].(string)
p, err := strconv.ParseUint(fi["perm"].(string), 8, 32)
if err != nil {
log.Printf("Failed to parse permission %s: %s", fi, err)
continue
}
if err := ioutil.WriteFile(path.Join(dir, f), []byte(c), os.FileMode(p)); err != nil {
log.Printf("Failed to write %s/%s: %s", dir, f, err)
continue