Fix path in LogFile creator

mxpv · mxpv · commit fbf96d302aff · 2019-06-19T16:53:33.000-07:00
Signed-off-by: Maksym Pavlenko &lt;makpav@amazon.com&gt;
diff --git a/cio/io.go b/cio/io.go
@@ -258,10 +258,11 @@ func BinaryIO(binary string, args map[string]string) Creator {
 			q.Set(k, v)
 		}
 		uri.RawQuery = q.Encode()
+		res := uri.String()
 		return &logURI{
 			config: Config{
-				Stdout: uri.String(),
-				Stderr: uri.String(),
+				Stdout: res,
+				Stderr: res,
 			},
 		}, nil
 	}
@@ -271,14 +272,19 @@ func BinaryIO(binary string, args map[string]string) Creator {
 // If the log file already exists, the logs will be appended to the file.
 func LogFile(path string) Creator {
 	return func(_ string) (IO, error) {
+		path = filepath.Clean(path)
+		if !strings.HasPrefix(path, "/") {
+			return nil, errors.New("absolute path needed")
+		}
 		uri := &url.URL{
 			Scheme: "file",
-			Host:   path,
+			Path:   path,
 		}
+		res := uri.String()
 		return &logURI{
 			config: Config{
-				Stdout: uri.String(),
-				Stderr: uri.String(),
+				Stdout: res,
+				Stderr: res,
 			},
 		}, nil
 	}
diff --git a/cio/io_test.go b/cio/io_test.go
@@ -177,3 +177,21 @@ func TestBinaryIOFailOnRelativePath(t *testing.T) {
 	_, err := BinaryIO("./bin", nil)("!")
 	assert.Error(t, err, "absolute path needed")
 }
+
+func TestLogFileAbsolutePath(t *testing.T) {
+	res, err := LogFile("/full/path/file.txt")("!")
+	assert.NilError(t, err)
+	assert.Equal(t, "file:///full/path/file.txt", res.Config().Stdout)
+	assert.Equal(t, "file:///full/path/file.txt", res.Config().Stderr)
+
+	// Test parse back
+	parsed, err := url.Parse(res.Config().Stdout)
+	assert.NilError(t, err)
+	assert.Equal(t, "file", parsed.Scheme)
+	assert.Equal(t, "/full/path/file.txt", parsed.Path)
+}
+
+func TestLogFileFailOnRelativePath(t *testing.T) {
+	_, err := LogFile("./file.txt")("!")
+	assert.Error(t, err, "absolute path needed")
+}
diff --git a/runtime/v1/linux/proc/io.go b/runtime/v1/linux/proc/io.go
@@ -103,11 +103,11 @@ func createIO(ctx context.Context, id string, ioUID, ioGID int, stdio proc.Stdio
 	case "binary":
 		pio.io, err = NewBinaryIO(ctx, id, u)
 	case "file":
-		if err := os.MkdirAll(filepath.Dir(u.Host), 0755); err != nil {
+		if err := os.MkdirAll(filepath.Dir(u.Path), 0755); err != nil {
 			return nil, err
 		}
 		var f *os.File
-		f, err = os.OpenFile(u.Host, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		f, err = os.OpenFile(u.Path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
 		if err != nil {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -103,11 +103,11 @@ func createIO(ctx context.Context, id string, ioUID, ioGID int, stdio proc.Stdio`
`103`	`103`	`case "binary":`
`104`	`104`	`pio.io, err = NewBinaryIO(ctx, id, u)`
`105`	`105`	`case "file":`
`106`		`- if err := os.MkdirAll(filepath.Dir(u.Host), 0755); err != nil {`
	`106`	`+ if err := os.MkdirAll(filepath.Dir(u.Path), 0755); err != nil {`
`107`	`107`	`return nil, err`
`108`	`108`	`}`
`109`	`109`	`var f *os.File`
`110`		`- f, err = os.OpenFile(u.Host, os.O_APPEND\|os.O_CREATE\|os.O_WRONLY, 0644)`
	`110`	`+ f, err = os.OpenFile(u.Path, os.O_APPEND\|os.O_CREATE\|os.O_WRONLY, 0644)`
`111`	`111`	`if err != nil {`
`112`	`112`	`return nil, err`
`113`	`113`	`}`