ctr: Sync code with containerd v1.6.23 ctr

stefanberger · stefanberger · commit 9e8e1c1df366 · 2023-08-15T10:28:46.000-04:00
Signed-off-by: Stefan Berger &lt;stefanb@linux.ibm.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -17,6 +17,9 @@ run:
     - cmd/ctr/commands/images
     - cmd\\ctr\\commands\\run
     - cmd\\ctr\\commands\\images
+  skip-files:
+    - cmd/ctr/commands/commands.go
+    - cmd\\ctr\\commands\\commands.go
 
 linters-settings:
   depguard:
diff --git a/cmd/ctr/commands/commands.go b/cmd/ctr/commands/commands.go
@@ -24,6 +24,8 @@ import (
 	"strings"
 
 	"github.com/containerd/containerd/defaults"
+	"github.com/containerd/containerd/pkg/atomicfile"
+
 	"github.com/urfave/cli"
 )
 
@@ -275,15 +277,14 @@ func WritePidFile(path string, pid int) error {
 	if err != nil {
 		return err
 	}
-	tempPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".%s", filepath.Base(path)))
-	f, err := os.OpenFile(tempPath, os.O_RDWR|os.O_CREATE|os.O_EXCL|os.O_SYNC, 0666)
+	f, err := atomicfile.New(path, 0o666)
 	if err != nil {
 		return err
 	}
 	_, err = fmt.Fprintf(f, "%d", pid)
-	f.Close()
 	if err != nil {
+		f.Cancel()
 		return err
 	}
-	return os.Rename(tempPath, path)
+	return f.Close()
 }
diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go
@@ -130,7 +130,7 @@ var Command = cli.Command{
 		},
 	}, append(platformRunFlags,
 		append(append(append(commands.SnapshotterFlags, []cli.Flag{commands.SnapshotterLabels}...),
-			commands.ContainerFlags...),flags.ImageDecryptionFlags...)...)...),
+			commands.ContainerFlags...), flags.ImageDecryptionFlags...)...)...),
 	Action: func(context *cli.Context) error {
 		var (
 			err error

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`
`26`	`26`	`"github.com/containerd/containerd/defaults"`
	`27`	`+ "github.com/containerd/containerd/pkg/atomicfile"`
	`28`	`+`
`27`	`29`	`"github.com/urfave/cli"`
`28`	`30`	`)`
`29`	`31`
`@@ -275,15 +277,14 @@ func WritePidFile(path string, pid int) error {`
`275`	`277`	`if err != nil {`
`276`	`278`	`return err`
`277`	`279`	`}`
`278`		`- tempPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".%s", filepath.Base(path)))`
`279`		`- f, err := os.OpenFile(tempPath, os.O_RDWR\|os.O_CREATE\|os.O_EXCL\|os.O_SYNC, 0666)`
	`280`	`+ f, err := atomicfile.New(path, 0o666)`
`280`	`281`	`if err != nil {`
`281`	`282`	`return err`
`282`	`283`	`}`
`283`	`284`	`_, err = fmt.Fprintf(f, "%d", pid)`
`284`		`- f.Close()`
`285`	`285`	`if err != nil {`
	`286`	`+ f.Cancel()`
`286`	`287`	`return err`
`287`	`288`	`}`
`288`		`- return os.Rename(tempPath, path)`
	`289`	`+ return f.Close()`
`289`	`290`	`}`