Fix Windows path check in 'LogURIGenerator'

    Signed-off-by: Christine Murimi <[email protected]>

Author: TinaMor

cmd/nerdctl/container/container_run_linux_test.go

@@ -498,3 +498,24 @@ func TestRunWithDetachKeys(t *testing.T) {
 	container := base.InspectContainer(containerName)
 	assert.Equal(base.T, container.State.Running, true)
 }
+
+func TestRunWithTtyAndDetached(t *testing.T) {
+	base := testutil.NewBase(t)
+	imageName := testutil.CommonImage
+	withoutTtyContainerName := "without-terminal-" + testutil.Identifier(t)
+	withTtyContainerName := "with-terminal-" + testutil.Identifier(t)
+
+	// without -t, fail
+	base.Cmd("run", "-d", "--name", withoutTtyContainerName, imageName, "stty").AssertOK()
+	defer base.Cmd("container", "rm", "-f", withoutTtyContainerName).AssertOK()
+	base.Cmd("logs", withoutTtyContainerName).AssertCombinedOutContains("stty: standard input: Not a tty")
+	withoutTtyContainer := base.InspectContainer(withoutTtyContainerName)
+	assert.Equal(base.T, 1, withoutTtyContainer.State.ExitCode)
+
+	// with -t, success
+	base.Cmd("run", "-d", "-t", "--name", withTtyContainerName, imageName, "stty").AssertOK()
+	defer base.Cmd("container", "rm", "-f", withTtyContainerName).AssertOK()
+	base.Cmd("logs", withTtyContainerName).AssertCombinedOutContains("speed 38400 baud; line = 0;")
+	withTtyContainer := base.InspectContainer(withTtyContainerName)
+	assert.Equal(base.T, 0, withTtyContainer.State.ExitCode)
+}

cmd/nerdctl/container/container_run_test.go

@@ -459,30 +459,6 @@ COPY --from=builder /go/src/logger/logger /
 	assert.Check(t, strings.Contains(log, "bar"))
 }
 
-func TestRunWithTtyAndDetached(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("json-file log driver is not yet implemented on Windows")
-	}
-	base := testutil.NewBase(t)
-	imageName := testutil.CommonImage
-	withoutTtyContainerName := "without-terminal-" + testutil.Identifier(t)
-	withTtyContainerName := "with-terminal-" + testutil.Identifier(t)
-
-	// without -t, fail
-	base.Cmd("run", "-d", "--name", withoutTtyContainerName, imageName, "stty").AssertOK()
-	defer base.Cmd("container", "rm", "-f", withoutTtyContainerName).AssertOK()
-	base.Cmd("logs", withoutTtyContainerName).AssertCombinedOutContains("stty: standard input: Not a tty")
-	withoutTtyContainer := base.InspectContainer(withoutTtyContainerName)
-	assert.Equal(base.T, 1, withoutTtyContainer.State.ExitCode)
-
-	// with -t, success
-	base.Cmd("run", "-d", "-t", "--name", withTtyContainerName, imageName, "stty").AssertOK()
-	defer base.Cmd("container", "rm", "-f", withTtyContainerName).AssertOK()
-	base.Cmd("logs", withTtyContainerName).AssertCombinedOutContains("speed 38400 baud; line = 0;")
-	withTtyContainer := base.InspectContainer(withTtyContainerName)
-	assert.Equal(base.T, 0, withTtyContainer.State.ExitCode)
-}
-
 // history: There was a bug that the --add-host items disappear when the another container created.
 // This case ensures that it's doesn't happen.
 // (https://github.com/containerd/nerdctl/issues/2560)

cmd/nerdctl/container/container_run_windows_test.go

@@ -117,3 +117,18 @@ func TestRunProcessContainerWithDevice(t *testing.T) {
 		"cmd", "/S", "/C", "dir C:\\Windows\\System32\\HostDriverStore",
 	).AssertOutContains("FileRepository")
 }
+
+func TestRunWithTtyAndDetached(t *testing.T) {
+	base := testutil.NewBase(t)
+	imageName := testutil.CommonImage
+	withTtyContainerName := "with-terminal-" + testutil.Identifier(t)
+
+	// with -t, success, the container should run with tty support.
+	base.Cmd("run", "-d", "-t", "--name", withTtyContainerName, imageName, "cmd", "/c", "echo", "Hello, World with TTY!").AssertOK()
+	defer base.Cmd("container", "rm", "-f", withTtyContainerName).AssertOK()
+
+	// Check logs for successful command execution (with TTY specific behavior if any)
+	base.Cmd("logs", withTtyContainerName).AssertOutContains("Hello, World with TTY!")
+	withTtyContainer := base.InspectContainer(withTtyContainerName)
+	assert.Equal(base.T, 0, withTtyContainer.State.ExitCode)
+}

pkg/taskutil/taskutil.go

@@ -96,11 +96,15 @@ func NewTask(ctx context.Context, client *containerd.Client, container container
 		if len(args) != 2 {
 			return nil, errors.New("parse logging path error")
 		}
-		ioCreator = cio.TerminalBinaryIO(u.Path, map[string]string{
+		parsedPath := u.Path
+		// For Windows, remove the leading slash
+		if (runtime.GOOS == "windows") && (strings.HasPrefix(parsedPath, "/")) {
+			parsedPath = strings.TrimLeft(parsedPath, "/")
+		}
+		ioCreator = cio.TerminalBinaryIO(parsedPath, map[string]string{
 			args[0]: args[1],
 		})
 	} else if flagT && !flagD {
-
 		if con == nil {
 			return nil, errors.New("got nil con with flagT=true")
 		}